[COMMIT] branch api-next updated. v1.10.1.0-67-g77a2721
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, api-next has been updated
via 77a27212b563299959fb2a609b86bb9117a8f918 (commit)
via ca7514cf4325838ca04c3a21a972cb963efd07a4 (commit)
via 9405b1770b78b774e7dbe6073f3f85d709541a26 (commit)
via 86939bf150967b4f2a9f0580aab9727388662496 (commit)
via 7f87f43fca88cac2cd36ed5fcffcea8ebee10694 (commit)
via 8b10c2fece805dd35b7396526ee0a09b8fee91c7 (commit)
via 43cad57aab56e07303514e6f8d2c85d773a3a2d4 (commit)
via fbe74cce0bbe02430de3439b594bf712e791419a (commit)
from 1e919d30be9ecf9683e30bba3f6109d9356b4638 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 77a27212b563299959fb2a609b86bb9117a8f918
Author: Barry Spinney <spinney(a)mellanox.com>
Date: Wed Jul 13 11:59:40 2016 -0500
api: tm: resolve todo
This todo just asks a question which is no longer important.
Signed-off-by: Barry Spinney <spinney(a)mellanox.com>
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h
index c9e6f8f..3473648 100644
--- a/include/odp/api/spec/traffic_mngr.h
+++ b/include/odp/api/spec/traffic_mngr.h
@@ -93,7 +93,6 @@ extern "C" {
* @def ODP_TM_MAX_TM_NODE_FANIN
* The largest number of fan-in "inputs" that can be simultaneously connected
* to a single tm_node.
- * @todo Does this need to be as large as ODP_TM_MAX_TM_QUEUES?
*/
/**
@@ -886,7 +885,7 @@ typedef struct {
/** In the case that sched_modes for a given strict priority level
* indicates the use of weighted scheduling, this field supplies the
* weighting factors. The weights - when defined - are used such that
- * the (adjusted) frame lengths are divided by these 8-bit weights
+ * the (adjusted) frame lengths are divided by these 8-bit weights
* (i.e. they are divisors and not multipliers). Consequently a
* weight of 0 (when sched_mode is ODP_TM_BYTE_BASED_WEIGHTS) is
* illegal. */
commit ca7514cf4325838ca04c3a21a972cb963efd07a4
Merge: 1e919d3 9405b17
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Thu Jul 14 12:53:48 2016 +0300
Merge branch 'master' into api-next
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
-----------------------------------------------------------------------
Summary of changes:
doc/images/abi_llvm.svg | 125 ++++++
doc/images/abi_traditional.svg | 89 +++++
doc/implementers-guide/implementers-guide.adoc | 430 ++++++++++++++-------
include/odp/api/spec/traffic_mngr.h | 3 +-
.../include/odp_traffic_mngr_internal.h | 3 +
platform/linux-generic/odp_name_table.c | 2 +-
platform/linux-generic/odp_traffic_mngr.c | 37 +-
test/performance/odp_l2fwd.c | 3 +
8 files changed, 532 insertions(+), 160 deletions(-)
create mode 100644 doc/images/abi_llvm.svg
create mode 100644 doc/images/abi_traditional.svg
hooks/post-receive
--
7 years, 9 months
- 1
- 0
[COMMIT] branch master updated. v1.10.1.0-47-g9405b17
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via 9405b1770b78b774e7dbe6073f3f85d709541a26 (commit)
via 86939bf150967b4f2a9f0580aab9727388662496 (commit)
from 7f87f43fca88cac2cd36ed5fcffcea8ebee10694 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9405b1770b78b774e7dbe6073f3f85d709541a26
Author: Barry Spinney <spinney(a)mellanox.com>
Date: Wed Jul 13 11:59:42 2016 -0500
linux-generic: tm: Add pthread_join call when destroying
Resolved a valgrind issue by adding pthread_join and pthread_attr_destroy
calls when destroying a tm_system.
Also resolve a todo by removing some code that was being #if'd out.
Signed-off-by: Barry Spinney <spinney(a)mellanox.com>
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp_traffic_mngr_internal.h b/platform/linux-generic/include/odp_traffic_mngr_internal.h
index 85a31e9..15451ac 100644
--- a/platform/linux-generic/include/odp_traffic_mngr_internal.h
+++ b/platform/linux-generic/include/odp_traffic_mngr_internal.h
@@ -19,6 +19,7 @@
extern "C" {
#endif
+#include <pthread.h>
#include <odp/api/traffic_mngr.h>
#include <odp/api/packet_io.h>
#include <odp_name_table_internal.h>
@@ -352,6 +353,8 @@ typedef struct {
odp_barrier_t tm_system_destroy_barrier;
odp_atomic_u64_t destroying;
_odp_int_name_t name_tbl_id;
+ pthread_t thread;
+ pthread_attr_t attr;
void *trace_buffer;
uint32_t next_queue_num;
diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c
index aa14b6b..7a8b647 100644
--- a/platform/linux-generic/odp_traffic_mngr.c
+++ b/platform/linux-generic/odp_traffic_mngr.c
@@ -2580,19 +2580,19 @@ static uint32_t tm_thread_cpu_select(void)
static int tm_thread_create(tm_system_t *tm_system)
{
- pthread_attr_t attr;
- pthread_t thread;
cpu_set_t cpu_set;
uint32_t cpu_num;
int rc;
- pthread_attr_init(&attr);
+ pthread_attr_init(&tm_system->attr);
cpu_num = tm_thread_cpu_select();
CPU_ZERO(&cpu_set);
CPU_SET(cpu_num, &cpu_set);
- pthread_attr_setaffinity_np(&attr, sizeof(cpu_set_t), &cpu_set);
+ pthread_attr_setaffinity_np(&tm_system->attr, sizeof(cpu_set_t),
+ &cpu_set);
- rc = pthread_create(&thread, &attr, tm_system_thread, tm_system);
+ rc = pthread_create(&tm_system->thread, &tm_system->attr,
+ tm_system_thread, tm_system);
if (rc != 0)
ODP_DBG("Failed to start thread on cpu num=%u\n", cpu_num);
@@ -2748,16 +2748,22 @@ int odp_tm_capability(odp_tm_t odp_tm, odp_tm_capabilities_t *capabilities)
int odp_tm_destroy(odp_tm_t odp_tm)
{
tm_system_t *tm_system;
+ int rc;
tm_system = GET_TM_SYSTEM(odp_tm);
- /* First mark the tm_system as being in the destroying state so that
- * all new pkts are prevented from coming in.
- */
+ /* First mark the tm_system as being in the destroying state so that
+ * all new pkts are prevented from coming in.
+ */
odp_barrier_init(&tm_system->tm_system_destroy_barrier, 2);
odp_atomic_inc_u64(&tm_system->destroying);
odp_barrier_wait(&tm_system->tm_system_destroy_barrier);
+ /* Next wait for the thread to exit. */
+ rc = pthread_join(tm_system->thread, NULL);
+ ODP_ASSERT(rc == 0);
+ pthread_attr_destroy(&tm_system->attr);
+
input_work_queue_destroy(tm_system->input_work_queue);
_odp_sorted_pool_destroy(tm_system->_odp_int_sorted_pool);
_odp_queue_pool_destroy(tm_system->_odp_int_queue_pool);
@@ -4104,21 +4110,6 @@ int odp_tm_enq_with_cnt(odp_tm_queue_t tm_queue, odp_packet_t pkt)
return pkt_cnt;
}
-#ifdef NOT_USED /* @todo use or delete */
-static uint32_t odp_tm_input_work_queue_fullness(odp_tm_t odp_tm ODP_UNUSED)
-{
- input_work_queue_t *input_work_queue;
- tm_system_t *tm_system;
- uint32_t queue_cnt, fullness;
-
- tm_system = GET_TM_SYSTEM(odp_tm);
- input_work_queue = tm_system->input_work_queue;
- queue_cnt = odp_atomic_load_u64(&input_work_queue->queue_cnt);
- fullness = (100 * queue_cnt) / INPUT_WORK_RING_SIZE;
- return fullness;
-}
-#endif
-
int odp_tm_node_info(odp_tm_node_t tm_node, odp_tm_node_info_t *info)
{
tm_queue_thresholds_t *threshold_params;
commit 86939bf150967b4f2a9f0580aab9727388662496
Author: Barry Spinney <spinney(a)mellanox.com>
Date: Wed Jul 13 11:59:41 2016 -0500
linux-generic: tm: resolve todo in odp_name_table.c
Resolved todo by just removing the comment.
Signed-off-by: Barry Spinney <spinney(a)mellanox.com>
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_name_table.c b/platform/linux-generic/odp_name_table.c
index 675d96d..b116904 100644
--- a/platform/linux-generic/odp_name_table.c
+++ b/platform/linux-generic/odp_name_table.c
@@ -956,7 +956,7 @@ uint64_t _odp_int_name_tbl_user_data(_odp_int_name_t odp_name)
name_tbl_entry = name_tbl_id_parse(odp_name, NULL);
if (!name_tbl_entry)
- return 0; /* @todo */
+ return 0;
else
return name_tbl_entry->user_data;
}
-----------------------------------------------------------------------
Summary of changes:
.../include/odp_traffic_mngr_internal.h | 3 ++
platform/linux-generic/odp_name_table.c | 2 +-
platform/linux-generic/odp_traffic_mngr.c | 37 ++++++++--------------
3 files changed, 18 insertions(+), 24 deletions(-)
hooks/post-receive
--
7 years, 9 months
- 1
- 0
[COMMIT] branch next updated. v1.10.1.0-47-gc53a2a7
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, next has been updated
discards 170534f9fb77847368621667d3453cdda45138ee (commit)
via c53a2a74017a8b61a7b37bf43f2e9663e9faf8a3 (commit)
via 35e5e2bc98dcf673f63016e10a374cdf18689d92 (commit)
via 7f87f43fca88cac2cd36ed5fcffcea8ebee10694 (commit)
via 8b10c2fece805dd35b7396526ee0a09b8fee91c7 (commit)
via 43cad57aab56e07303514e6f8d2c85d773a3a2d4 (commit)
via fbe74cce0bbe02430de3439b594bf712e791419a (commit)
via 3e9560480627196a26d702be045ff22191b9a6c1 (commit)
via a97db1b8b46b9656f964ccf09ce28941ae062507 (commit)
via d1d06aa241b97e2f1919ee990168a21319a66143 (commit)
via c2784fbafbf8a29b6daa48429133e25b777536cf (commit)
via 9f0f2b86309aa8021ec937e7c0ee1d6f48b0d769 (commit)
via c03685af2895b20a5e8a046ea910254a96ab15c4 (commit)
via c6bf23e2794ec2a54fa1724cd9d833d84aa39270 (commit)
via 15f3c174f5a104e9749ed83797acb00660d675ad (commit)
via f9baafc4a5644973410ef6c5a1d233671bec1d17 (commit)
via 1b1da0fe917cb916232fd9aad615b68941b8f490 (commit)
via e9545afb7d521b7be5b52f7ff599824fdde8113e (commit)
via e9d434fd193e501ef9ca69f530ce4e5f9448594d (commit)
via 50078445f1a944309fb88946582a2015fd098f6b (commit)
via 8e6e5e999ce3d9edb704e18bedf6bc0ebc6ecf79 (commit)
via 1a6766a3b0b2befb065336d54fff735db62aa96f (commit)
via f606e161748d68612b1a5668ae0184ac4909738d (commit)
via a85a684948248d5e127f109622026e3bbc4be53d (commit)
via b0401d8ed43c643905c84b9a576df925d4ad06e1 (commit)
via 08487413ead04cb5fef8e813af06e5bc29207334 (commit)
via b018868aa429fd25dae1137490419784e8e569f9 (commit)
via 8d020fe812be982564465c0812468ce6194a5025 (commit)
via cb9b43cc218eb4304c508f577293d401180da0ae (commit)
via 2b9f90dc54c5d699083970cbd359db4f137faa31 (commit)
via 072b5ca9ad3f17d70c20bb7d03020ec7a219f698 (commit)
via aa7a1822660eaeecd6f69c525abdc4a21d428716 (commit)
via 2fc98f7ba2fdcf7df0f04b171bc4bdd65b8cf980 (commit)
via 39738abf195e2d3af75133f4ec418614b86e770c (commit)
via c3f73eadd8eafb8e8167d5403d69527b896f9de6 (commit)
via 7da43047a614ce4c030878ee8bef31725c7b71ef (commit)
via bde29f1382ed76fa6b8450b67a249ab2c8c83323 (commit)
via 41ab23c89799de4db4de5c3910b70e80f3a7d8f9 (commit)
via 4cf18bb4f799e6601c20e54fafbdb58da538de89 (commit)
via 793c4b15275fd7e6c30bf348f236e778b9bfee02 (commit)
via 46684cc1f1cdc33b7b223687e063f458b6c7bf02 (commit)
via 8ab5804ea8bd430fd7cd0bd0edae316918b976d7 (commit)
via 33bd749de8128afbb6b5bcad5ef6bea5a2667178 (commit)
via 99b863c804fe38bd919d3b9c2f6dad5ddabf1aaa (commit)
via 8d10e64603e67620084cb92648707550110d7bbe (commit)
via 72634d86988e33ac38dd1ecda2cc4e8a156307ed (commit)
via 341d3029f797ebb2bcf0fa6089c3463eea73e1cc (commit)
via 69717806018f61af84645ff458e3dc69a13d747e (commit)
via b78d235b8fe23b423bf6e7a3c65abbfb7efa4af8 (commit)
via 193bbc8eafa14932f342476a44687237be512148 (commit)
via 165897bfd094d824e2dd83c968ad9fde28146ef9 (commit)
via 4e4ae44b527a9a0635a219eb19e1ffa425c2186a (commit)
via 72b2a7212b6afb2d011e537202611e5566584aea (commit)
via 5567e30f8eabcfe32497b0ed858a5f76f9d764a4 (commit)
via 50029e34c284559b942e6b6b8c56f230eca4f01f (commit)
via aded65c62d9ad5e65c6181588d90d1b99f5c8726 (commit)
via cea088594ea8f951d8716ab071c4052b018f2c19 (commit)
via 1d0d1a1e1b98ebbe2c6dbdb1aae23a704c1dac47 (commit)
via 28026f1ddee3f33da7935055a3f87bcc053035fb (commit)
via 4f621a5acb7e6657e8eb4d17a6fe664e30fda714 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (170534f9fb77847368621667d3453cdda45138ee)
\
N -- N -- N (c53a2a74017a8b61a7b37bf43f2e9663e9faf8a3)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c53a2a74017a8b61a7b37bf43f2e9663e9faf8a3
Author: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Date: Tue Jun 28 17:35:54 2016 +0530
api: traffic_mngr: Add pktio interface to odp_tm_egress_t struct
Replaces pktio interface as input to TM system instead of
odp_pktout_queue_t.This creates an 1 to 1 mapping between a TM system
and pktio interface.
Signed-off-by: Balasubramanian Manoharan <bala.manoharan(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/include/odp/api/spec/traffic_mngr.h b/include/odp/api/spec/traffic_mngr.h
index 83b89e7..c9e6f8f 100644
--- a/include/odp/api/spec/traffic_mngr.h
+++ b/include/odp/api/spec/traffic_mngr.h
@@ -270,6 +270,12 @@ typedef struct {
* have their fan_in only from tm_queues. */
uint8_t max_levels;
+ /** egress_fcn_supported indicates whether the tm system supports
+ * egress function. It is an optional feature used to receive the
+ * packet from the tm system and its performance might be limited.
+ */
+ odp_bool_t egress_fcn_supported;
+
/** tm_queue_shaper_supported indicates that the tm_queues support
* proper TM shaping. Note that TM Shaping is NOT the same thing as
* Ingress Metering/Policing as specified by RFC 2697 (A Single Rate
@@ -467,7 +473,7 @@ typedef struct {
odp_tm_egress_kind_t egress_kind; /**< Union discriminator */
union {
- odp_pktout_queue_t pktout;
+ odp_pktio_t pktio;
odp_tm_egress_fcn_t egress_fcn;
};
} odp_tm_egress_t;
diff --git a/platform/linux-generic/include/odp_traffic_mngr_internal.h b/platform/linux-generic/include/odp_traffic_mngr_internal.h
index 85a31e9..c50ac0f 100644
--- a/platform/linux-generic/include/odp_traffic_mngr_internal.h
+++ b/platform/linux-generic/include/odp_traffic_mngr_internal.h
@@ -377,7 +377,7 @@ typedef struct {
tm_queue_info_t priority_info[ODP_TM_MAX_PRIORITIES];
tm_random_data_t tm_random_data;
-
+ odp_pktout_queue_t pktout;
uint64_t current_time;
uint8_t tm_idx;
uint8_t first_enq;
diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c
index aa14b6b..87707d2 100644
--- a/platform/linux-generic/odp_traffic_mngr.c
+++ b/platform/linux-generic/odp_traffic_mngr.c
@@ -2108,7 +2108,7 @@ static void tm_send_pkt(tm_system_t *tm_system, uint32_t max_sends)
tm_system->egress_pkt_desc = EMPTY_PKT_DESC;
if (tm_system->egress.egress_kind == ODP_TM_EGRESS_PKT_IO)
- odp_pktout_send(tm_system->egress.pktout, &odp_pkt, 1);
+ odp_pktout_send(tm_system->pktout, &odp_pkt, 1);
else if (tm_system->egress.egress_kind == ODP_TM_EGRESS_FN)
tm_system->egress.egress_fcn(odp_pkt);
else
@@ -2426,6 +2426,7 @@ int odp_tm_capabilities(odp_tm_capabilities_t capabilities[] ODP_UNUSED,
cap_ptr->max_tm_queues = ODP_TM_MAX_TM_QUEUES;
cap_ptr->max_levels = ODP_TM_MAX_LEVELS;
cap_ptr->tm_queue_shaper_supported = true;
+ cap_ptr->egress_fcn_supported = true;
cap_ptr->tm_queue_wred_supported = true;
cap_ptr->tm_queue_dual_slope_supported = true;
cap_ptr->vlan_marking_supported = true;
@@ -2607,6 +2608,7 @@ odp_tm_t odp_tm_create(const char *name,
tm_system_t *tm_system;
odp_bool_t create_fail;
odp_tm_t odp_tm;
+ odp_pktout_queue_t pktout;
uint32_t malloc_len, max_num_queues, max_queued_pkts, max_timers;
uint32_t max_tm_queues, max_sorted_lists;
int rc;
@@ -2627,6 +2629,10 @@ odp_tm_t odp_tm_create(const char *name,
return ODP_TM_INVALID;
}
+ if (odp_pktout_queue(egress->pktio, &pktout, 1) != 1)
+ return ODP_TM_INVALID;
+
+ tm_system->pktout = pktout;
tm_system->name_tbl_id = name_tbl_id;
max_tm_queues = requirements->max_tm_queues;
memcpy(&tm_system->egress, egress, sizeof(odp_tm_egress_t));
diff --git a/test/validation/traffic_mngr/traffic_mngr.c b/test/validation/traffic_mngr/traffic_mngr.c
index 1c4e90b..b857800 100644
--- a/test/validation/traffic_mngr/traffic_mngr.c
+++ b/test/validation/traffic_mngr/traffic_mngr.c
@@ -323,7 +323,7 @@ static odp_pktio_t pktios[MAX_NUM_IFACES];
static odp_pktin_queue_t pktins[MAX_NUM_IFACES];
static odp_pktout_queue_t pktouts[MAX_NUM_IFACES];
static odp_pktin_queue_t rcv_pktin;
-static odp_pktout_queue_t xmt_pktout;
+static odp_pktio_t xmt_pktio;
static odph_ethaddr_t src_mac;
static odph_ethaddr_t dst_mac;
@@ -543,7 +543,7 @@ static int open_pktios(void)
}
if (2 <= num_ifaces) {
- xmt_pktout = pktouts[0];
+ xmt_pktio = pktios[0];
rcv_pktin = pktins[1];
ret = odp_pktio_start(pktios[1]);
if (ret != 0) {
@@ -551,7 +551,7 @@ static int open_pktios(void)
return -1;
}
} else {
- xmt_pktout = pktouts[0];
+ xmt_pktio = pktios[0];
rcv_pktin = pktins[0];
}
@@ -1627,7 +1627,7 @@ static int create_tm_system(void)
}
egress.egress_kind = ODP_TM_EGRESS_PKT_IO;
- egress.pktout = xmt_pktout;
+ egress.pktio = xmt_pktio;
snprintf(tm_name, sizeof(tm_name), "TM_system_%u", num_odp_tm_systems);
odp_tm = odp_tm_create(tm_name, &requirements, &egress);
commit 35e5e2bc98dcf673f63016e10a374cdf18689d92
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Tue May 10 18:34:37 2016 +0300
api: system: specify default huge page size
System can have different sizes for huge pages. Clarify that
this api returns default system huge page size, which is usually
2Mb on x86 reachable with:
grep Hugepagesize: /proc/meminfo
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com>
diff --git a/include/odp/api/spec/system_info.h b/include/odp/api/spec/system_info.h
index 6957731..c5a5fd0 100644
--- a/include/odp/api/spec/system_info.h
+++ b/include/odp/api/spec/system_info.h
@@ -24,9 +24,9 @@ extern "C" {
*/
/**
- * Huge page size in bytes
+ * Default system huge page size in bytes
*
- * @return Huge page size in bytes
+ * @return Default huge page size in bytes
*/
uint64_t odp_sys_huge_page_size(void);
-----------------------------------------------------------------------
Summary of changes:
CHANGELOG | 165 +++++
Makefile.am | 1 -
configure.ac | 14 +-
doc/{helper-guide/Doxyfile => Doxyfile_common} | 13 -
doc/Makefile.am | 8 +-
doc/application-api-guide/Doxyfile | 50 +-
doc/images/abi_llvm.svg | 125 ++++
doc/images/abi_traditional.svg | 89 +++
doc/implementers-guide/implementers-guide.adoc | 430 +++++++++----
doc/m4/configure.m4 | 1 +
.../.gitignore | 0
doc/platform-api-guide/Doxyfile | 19 +
.../Makefile.am | 1 -
doc/process-guide/.gitignore | 1 +
doc/process-guide/Makefile.am | 27 +-
doc/users-guide/Makefile.am | 3 +-
example/Makefile.am | 2 +-
example/classifier/odp_classifier.c | 1 +
example/generator/odp_generator.c | 1 +
{test/validation => example/hello}/.gitignore | 1 +
example/hello/Makefile.am | 11 +
example/hello/odp_hello.c | 107 ++++
example/ipsec/odp_ipsec.c | 1 +
example/m4/configure.m4 | 3 +-
example/packet/odp_pktio.c | 1 +
example/switch/odp_switch.c | 2 +
example/time/time_global_test.c | 1 +
example/timer/.gitignore | 3 +
example/timer/Makefile.am | 14 +-
example/timer/odp_timer_simple.c | 158 +++++
example/timer/odp_timer_test.c | 1 +
helper/Makefile.am | 2 +-
helper/chksum.c | 2 +
helper/include/odp/helper/chksum.h | 2 +-
helper/linux.c | 16 +-
helper/test/thread.c | 2 +-
include/odp/api/spec/traffic_mngr.h | 8 +-
include/odp/api/spec/version.h | 2 +-
platform/linux-generic/Makefile.am | 7 +-
platform/linux-generic/include/odp/api/cpumask.h | 4 -
.../include/odp/api/plat/byteorder_types.h | 33 +-
.../include/odp/api/plat/cpumask_types.h | 10 +-
.../include/odp/api/plat/timer_types.h | 2 +-
platform/linux-generic/include/odp/api/std_clib.h | 1 +
platform/linux-generic/include/odp/api/std_types.h | 10 +-
.../linux-generic/include/odp_atomic_internal.h | 1 +
.../linux-generic/include/odp_buffer_internal.h | 1 +
.../include/odp_classification_inlines.h | 70 +--
.../include/odp_classification_internal.h | 5 +-
.../include/odp_name_table_internal.h | 2 +-
.../linux-generic/include/odp_packet_internal.h | 77 ++-
.../linux-generic/include/odp_packet_io_internal.h | 23 +-
platform/linux-generic/include/odp_packet_socket.h | 1 +
platform/linux-generic/include/odp_schedule_if.h | 12 +-
.../include/odp_schedule_ordered_internal.h | 5 +-
.../include/odp_traffic_mngr_internal.h | 4 +-
platform/linux-generic/include/protocols/eth.h | 113 ++++
platform/linux-generic/include/protocols/ip.h | 168 +++++
.../linux-generic/include/protocols}/ipsec.h | 40 +-
.../linux-generic/include/protocols}/tcp.h | 12 +-
platform/linux-generic/include/protocols/udp.h | 49 ++
platform/linux-generic/m4/configure.m4 | 7 +-
platform/linux-generic/odp_buffer.c | 2 +-
platform/linux-generic/odp_classification.c | 46 +-
platform/linux-generic/odp_cpumask.c | 39 +-
platform/linux-generic/odp_hash.c | 2 +
platform/linux-generic/odp_init.c | 1 +
platform/linux-generic/odp_packet.c | 363 +++++------
platform/linux-generic/odp_packet_flags.c | 53 +-
platform/linux-generic/odp_packet_io.c | 148 +++--
platform/linux-generic/odp_pkt_queue.c | 41 +-
platform/linux-generic/odp_pool.c | 2 +-
platform/linux-generic/odp_queue.c | 39 +-
platform/linux-generic/odp_schedule.c | 80 ++-
platform/linux-generic/odp_schedule_ordered.c | 18 +-
platform/linux-generic/odp_schedule_sp.c | 687 ++++++++++++++++++++-
platform/linux-generic/odp_shared_memory.c | 1 +
platform/linux-generic/odp_sorted_list.c | 1 +
platform/linux-generic/odp_system_info.c | 1 +
platform/linux-generic/odp_ticketlock.c | 3 -
platform/linux-generic/odp_timer.c | 1 +
platform/linux-generic/odp_timer_wheel.c | 1 +
platform/linux-generic/odp_traffic_mngr.c | 86 +--
platform/linux-generic/pktio/dpdk.c | 17 +-
platform/linux-generic/pktio/ipc.c | 2 +-
platform/linux-generic/pktio/loop.c | 39 +-
platform/linux-generic/pktio/netmap.c | 18 +-
platform/linux-generic/pktio/pcap.c | 12 +-
platform/linux-generic/pktio/ring.c | 11 +-
platform/linux-generic/pktio/socket.c | 14 +-
platform/linux-generic/pktio/socket_mmap.c | 28 +-
platform/linux-generic/pktio/sysfs.c | 1 +
platform/linux-generic/pktio/tap.c | 3 +-
test/Makefile.am | 2 +-
test/performance/odp_l2fwd.c | 4 +
test/performance/odp_l2fwd_run.sh | 4 +-
test/performance/odp_pktio_perf.c | 1 +
test/performance/odp_scheduling.c | 1 +
.../platform/linux-generic}/.gitignore | 0
.../platform/linux-generic}/Makefile.am | 0
.../platform/linux-generic}/Makefile.inc | 0
test/platform/linux-generic/m4/configure.m4 | 5 +
.../platform/linux-generic}/pktio/.gitignore | 0
.../platform/linux-generic}/pktio/Makefile.am | 0
.../platform/linux-generic}/pktio/pktio_env | 0
.../platform/linux-generic}/pktio/pktio_run.sh | 0
.../linux-generic}/pktio/pktio_run_dpdk.sh | 0
.../linux-generic}/pktio/pktio_run_netmap.sh | 0
.../linux-generic}/pktio/pktio_run_pcap.sh | 0
.../platform/linux-generic}/pktio/pktio_run_tap.sh | 0
.../platform/linux-generic}/pktio_ipc/.gitignore | 0
.../platform/linux-generic}/pktio_ipc/Makefile.am | 0
.../platform/linux-generic}/pktio_ipc/ipc_common.c | 0
.../platform/linux-generic}/pktio_ipc/ipc_common.h | 1 +
.../platform/linux-generic}/pktio_ipc/pktio_ipc1.c | 0
.../platform/linux-generic}/pktio_ipc/pktio_ipc2.c | 0
.../linux-generic}/pktio_ipc/pktio_ipc_run.sh | 0
.../platform/linux-generic}/ring/.gitignore | 0
.../platform/linux-generic}/ring/Makefile.am | 0
.../platform/linux-generic}/ring/ring_basic.c | 0
.../platform/linux-generic}/ring/ring_main.c | 0
.../platform/linux-generic}/ring/ring_stress.c | 0
.../platform/linux-generic}/ring/ring_suites.c | 0
.../platform/linux-generic}/ring/ring_suites.h | 0
.../test => test/platform/linux-generic}/run-test | 0
.../platform/linux-generic}/shmem/.gitignore | 0
.../platform/linux-generic}/shmem/Makefile.am | 0
.../platform/linux-generic}/shmem/shmem.h | 0
.../platform/linux-generic}/shmem/shmem_common.h | 0
.../platform/linux-generic}/shmem/shmem_linux.c | 0
.../platform/linux-generic}/shmem/shmem_linux.h | 0
.../platform/linux-generic}/shmem/shmem_odp.c | 0
.../platform/linux-generic}/shmem/shmem_odp.h | 0
.../classification/odp_classification_testsuites.h | 1 +
test/validation/common/mask_common.c | 2 +
test/validation/common/odp_cunit_common.h | 1 +
test/validation/packet/packet.c | 122 +++-
test/validation/pktio/pktio.c | 37 +-
test/validation/queue/queue.c | 158 ++++-
test/validation/queue/queue.h | 4 +-
test/validation/scheduler/scheduler.c | 267 ++++----
test/validation/timer/timer.c | 33 +-
test/validation/traffic_mngr/traffic_mngr.c | 26 +-
143 files changed, 3307 insertions(+), 1067 deletions(-)
copy doc/{helper-guide/Doxyfile => Doxyfile_common} (64%)
create mode 100644 doc/images/abi_llvm.svg
create mode 100644 doc/images/abi_traditional.svg
copy doc/{application-api-guide => platform-api-guide}/.gitignore (100%)
create mode 100644 doc/platform-api-guide/Doxyfile
copy doc/{helper-guide => platform-api-guide}/Makefile.am (78%)
copy {test/validation => example/hello}/.gitignore (54%)
create mode 100644 example/hello/Makefile.am
create mode 100644 example/hello/odp_hello.c
create mode 100644 example/timer/odp_timer_simple.c
create mode 100644 platform/linux-generic/include/protocols/eth.h
create mode 100644 platform/linux-generic/include/protocols/ip.h
copy {helper/include/odp/helper => platform/linux-generic/include/protocols}/ipsec.h (53%)
copy {helper/include/odp/helper => platform/linux-generic/include/protocols}/tcp.h (88%)
create mode 100644 platform/linux-generic/include/protocols/udp.h
rename {platform/linux-generic/test => test/platform/linux-generic}/.gitignore (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/Makefile.am (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/Makefile.inc (100%)
create mode 100644 test/platform/linux-generic/m4/configure.m4
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/.gitignore (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/Makefile.am (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_env (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_run.sh (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_run_dpdk.sh (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_run_netmap.sh (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_run_pcap.sh (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_run_tap.sh (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/.gitignore (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/Makefile.am (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/ipc_common.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/ipc_common.h (98%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/pktio_ipc1.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/pktio_ipc2.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/pktio_ipc_run.sh (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/ring/.gitignore (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/ring/Makefile.am (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/ring/ring_basic.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/ring/ring_main.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/ring/ring_stress.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/ring/ring_suites.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/ring/ring_suites.h (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/run-test (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/.gitignore (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/Makefile.am (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem.h (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem_common.h (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem_linux.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem_linux.h (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem_odp.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem_odp.h (100%)
hooks/post-receive
--
7 years, 9 months
- 1
- 0
[COMMIT] branch master updated. v1.10.1.0-45-g7f87f43
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via 7f87f43fca88cac2cd36ed5fcffcea8ebee10694 (commit)
from 8b10c2fece805dd35b7396526ee0a09b8fee91c7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7f87f43fca88cac2cd36ed5fcffcea8ebee10694
Author: Matias Elo <matias.elo(a)nokia.com>
Date: Thu Jul 7 17:52:27 2016 +0300
test: l2fwd: prefetch packet data
Prefetch ethernet addresses. This is a no-op on odp-linux but improves
performance significantly on odp-dpdk implementation.
Signed-off-by: Matias Elo <matias.elo(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c
index 164f7f5..e296b94 100644
--- a/test/performance/odp_l2fwd.c
+++ b/test/performance/odp_l2fwd.c
@@ -255,6 +255,9 @@ static inline void fill_eth_addrs(odp_packet_t pkt_tbl[],
for (i = 0; i < num; ++i) {
pkt = pkt_tbl[i];
+
+ odp_packet_prefetch(pkt, 0, ODPH_ETHHDR_LEN);
+
if (odp_packet_has_eth(pkt)) {
eth = (odph_ethhdr_t *)odp_packet_l2_ptr(pkt, NULL);
-----------------------------------------------------------------------
Summary of changes:
test/performance/odp_l2fwd.c | 3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
7 years, 10 months
- 1
- 0
[COMMIT] branch master updated. v1.10.1.0-44-g8b10c2f
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via 8b10c2fece805dd35b7396526ee0a09b8fee91c7 (commit)
via 43cad57aab56e07303514e6f8d2c85d773a3a2d4 (commit)
via fbe74cce0bbe02430de3439b594bf712e791419a (commit)
from 3e9560480627196a26d702be045ff22191b9a6c1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8b10c2fece805dd35b7396526ee0a09b8fee91c7
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Thu Jun 23 12:19:14 2016 +0200
doc: implguide: add sections on typedefs and abi coniderations
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/doc/implementers-guide/implementers-guide.adoc b/doc/implementers-guide/implementers-guide.adoc
index 1abd884..4f49e8f 100644
--- a/doc/implementers-guide/implementers-guide.adoc
+++ b/doc/implementers-guide/implementers-guide.adoc
@@ -12,7 +12,68 @@ This document is intended to guide a new ODP implementation developer.
Further details about ODP may be found at http://opendataplane.org[ODP homepage]
:numbered:
-== The include structure
+
+== Introduction and Overview
+ODP consists of three distinct components:
+
+[[odp_components]]
+.OpenDataPlane Components
+image::odp_components.svg[align="center"]
+
+- An abstract API specification. This is the application's writer's view of
+ODP and defines the syntax and semantics of all ODP routines at a functional
+level.
+
+- An Implementation of the ODP API for a specific target platform. A
+mapping of the ODP APIs to a specific target platform. This is the focus of
+this document.
+
+- A Validation Test Suite. This is an independent set of routines that when
+run against an ODP implmenetation verifies that it correctly implements all of
+the defined ODP APIs at a functional level. The test suite is used by
+implementers to self-certify their ODP implementation as well as by
+third-parties to verify an implementation's claim to be ODP API compliant.
+
+The structure of these components, especially the API specification, is more
+fully defined in the _ODP User's Guide_
+
+=== Organization of this Document
+This document is designed to serve two purposes. Its larger purpose is to
+provide guidenace and practical advice for those wishing to implement ODP on
+their platform. To help with this, as well as to provide deeper insight into
+how to think about ODP from an implementer's standpoint, this document also
+discusses in some depth the design and organization of a specific ODP
+implementation: the odp-linux reference implementation distributed as part of
+the main ODP git repository. By grounding theory in practice and discussing
+a particular example implementation, it is hoped this will provide insight into
+the tradeoffs implementers should consider in approaching how to best implement
+ODP on their platforms.
+
+The section <<include_structure>> discusses the layout of the ODP include tree
+from an implementer's perspective. Although implementers have wide lattitude
+in how they organize their ODP implementations, it is recommended that this
+layout be be observed by other implementations. Doing so both simplifies code
+sharing with the odp-linux reference implementation and also ensure ease of
+upgrading to future ODP API levels, as this is the basic layout that will be
+observed by future revisions to the API. This layout also facilitates shared
+library distribution.
+
+The section <<validation>> then discusses how validation tests are organized
+and run to provide ODP API conformance testing for ODP implementations. This
+is something ODP implementations need to consider from the outset. ODP uses
+a self-certifying model for API compliance, however this self-certification is
+performed by the ODP validation test suite (possibly augmented with a vendor's
+own extensions to this suite). The important point is that because the
+validation suite is itself free open source code, any potential user of a
+given ODP implementation is free to do its own validation of a vendor's ODP
+implementation using this suite.
+
+Following this basic material, each ODP API area is then reviewed and its
+implementation considerations are discussed, illustrating these considerations
+with discussion of how these are done in *odp-linux*.
+
+[[include_structure]]
+== The Include Structure
The implementers view of the include source tree allows the common interface
definitions and documentation to be reused by all the platforms defined in the
@@ -120,16 +181,23 @@ name of the libraries are `libodp-linux` and `libodp-dpdk` respectively. It is
recommended that other implementations follow the same schema
(*odp-<implementation name>*) to make the representation of the ODP
implementations uniform in a distribution.
-Additionally there is an ODP helper library to abstract OS differences.
-
-== The validation Suite
+[[validation]]
+== The Validation Suite
ODP provides a comprehensive set of API validation tests that are intended to be
used by implementers during development and by application developers to verify
that a particular implementation meets their requirements.
The list of these tests is expected to grow as ODP grows.
+Note that validation tests are not typically written by implementers, however
+their structure and operation needs to be understood so that implementations
+can properly run them to validate that they conform to the ODP API
+specification. The only exception to this is platform-specific tests, as
+described in <<platform-specific-tests>>. These may be written by platforms to
+leverage the CUnit framework for their own internal test needs or to extend
+the platform-agnostic tests with platform-specific logic.
+
The list of test executables is run by the automake test harness, when running
`make check`.
Therefore, as required by this harness, each executable should return 0 on
@@ -363,6 +431,7 @@ exit $res
Note how the above script stores the return code of the test executable to
return it properly to the automake test harness.
+[[platform-specific-tests]]
==== Defining platform specific tests
Sometimes, it may be necessary to call platform specific system calls to check
@@ -528,4 +597,108 @@ Five older functions exist to tie and ODP thread to a specific implementation:
The usage of these functions should not occur within ODP examples nor tests.
The usage of these functions in other application is not recommended.
+[[typedefs]]
+== ODP Abstract Types and Implementation Typedefs
+ODP APIs are defined to be abstract and operate on abstract types. For example,
+ODP APIs that perform packet manipulation manipulate objects of type
+`odp_packet_t`. Queues are represented by objects of type `odp_queue_t`, etc.
+
+Since the C compiler cannot compile code that has unresolved abstract types,
+the first task of each ODP implementation is to decide how it wishes to
+represent each of these abstract types and to supply appropriate `typedef`
+definitions for them to make ODP applications compilable on this platform.
+
+It is recommended that however a platform wishes to represent ODP abstract
+types, that it do so in a strongly typed manner. Using strong types means
+that an application that tries to pass a variable of type `odp_packet_t` to
+an API that expects an argument of type `odp_queue_t`, for example, will result
+in a compililation error rather than some difficult to debug runtime failure.
+
+The *odp-linux* reference implementation defines all ODP abstract types strongly
+using a set of utility macros contained in
+`platform/linux-generic/include/odp/api/plat/strong_types.h`. These macros
+can be used or modified as desired by other implementations to achieve strong
+typing of their typedefs.
+
+=== Typedef approaches
+ODP abstract types serve two distinct purposes that each implementation must
+consider. First, they shield applications from implementation internals, thus
+facilitating ODP application portability. Equally important, however, is that
+implementations choose typdefs and representations that permit the
+implementation to realize ODP APIs efficiently. This typically means that the
+handles defined by typedefs are either a pointer to an implementation-defined
+struct or else an index into an implementation-defined resource table. The two
+LNG-provided ODP reference implemnetations illustrate both of these approaches.
+The *odp-dpdk* implementation follows the former approach (pointers) as this
+offers the highest performance. For example, in *odp-dpdk* an
+`odp_packet_t` is a pointer to an `rte_mbuf` struct, which is how DPDK
+represents packets. The *odp-linux* implementation, by contrast, uses indices
+as this permits more robust validation support while still being highly
+efficient. In general, software-based implemnetations will typically favor
+pointers while hardware-based implementations will typically favor indices.
+
+=== ABI Considerations
+An _Application Binary Interface_ is a specification of the _representation_
+of an API that guarantees that applications can move between implementations
+of an API without recompilation. ABIs thus go beyond the basic source-code
+portability guarantees provided by APIs to permit binary portability as well.
+
+It is important to note that ODP neither defines nor prohibits the specification
+of ABIs. This is because ODP itself is an _Abstract API Specification_. As
+noted earlier, abstract APIs cannot be compiled in the absense of completion
+by an implementation that instantiates them, so the question of ABIs is
+really a question of representation agreement between multiple ODP
+implementations. If two or more ODP implementations agree on things like
+typedefs, endianness, alignments, etc., then they are defining an ABI which
+would permit ODP applications compiled to that common set of instantations
+to interoperate at a binary as well as source level.
+
+==== Traditional ABI
+ABIs can be defined at two levels. The simplest ABI is within a specific
+Instruction Set Architecture (ISA). So, for example, an ABI might be defined
+among ODP implementations for the AArch64 or x86 architectures. This
+traditional approach is shown here:
+
+.Traditional ABI Structure
+image::abi_traditional.svg[align="center"]
+
+In the traditional approach, multiple target platforms agree on a common set
+of typedefs, etc. so that the resulting output from compilation is directly
+executable on any platform that subscribes to that ABI. Adding a new platform
+in this approach simply requires that platform to accept the existing ABI
+specification. Note that since the output of compilation in a traditional ABI
+is a ISA-specific binary that applications cannot offer binary compability
+across platforms that use different ISAs.
+
+==== Bitcode based ABI
+An ABI an also be defined at a higher level by moving to a more sophisticated
+tool chain (such as is possible using LLVM) that implements a split
+compilation model. In this model, the output from a compiler is not directly
+executable. Rather it is a standardized intermediate representation called
+_bitcode_ that must be further processed to result in an executable image as
+shown here:
+
+.Bitcode ABI Structure
+image::abi_llvm.svg[align="center"]
+
+The key to this model is that the platform linking and optimization that is
+needed to create a platform executable is a system rather than a developer
+responsibility. The developer's output is a universal bitcode binary. From
+here, the library system creates a series of _managed binaries_ that result
+from performing link-time optimization against a set of platform definitions.
+When a universal application is to run on a specific target platform, the
+library system selects the appropriate managed binary for that target platform
+and loads and runs it.
+
+Adding a new platform in this approach involves adding the definition for that
+platform to the libary system so that a managed binary for it can be created
+and deployed as needed. This occurs without developer involvement since the
+bitcode format that is input to this backend process is indepentent of the
+specific target platform. Note also that since bitcode is not tied to any ISA,
+applications using bitcode ABIs are binary portable between platforms that use
+different ISAs. This occurs without loss of efficiency because the process of
+creating a managed binary is itself a secondary compilation and optimization
+step. The difference is that performing this step is a system rather than a
+developer responsibility.
+
include::../glossary.adoc[]
commit 43cad57aab56e07303514e6f8d2c85d773a3a2d4
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Thu Jun 23 12:19:13 2016 +0200
doc: image: add additional images for abi models
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/doc/images/abi_llvm.svg b/doc/images/abi_llvm.svg
new file mode 100644
index 0000000..0060f7a
--- /dev/null
+++ b/doc/images/abi_llvm.svg
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" viewBox="0 0 959.57743 760.31496" stroke-miterlimit="10" id="svg2" inkscape:version="0.91 r13725" sodipodi:docname="ABI LLVM.svg" width="959.57745" height="760.31494" style="fill:none;stroke:none;stroke-linecap:square;stroke-miterlimit:10">
+ <metadata id="metadata225">
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs id="defs223"/>
+ <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="737" inkscape:window-height="480" id="namedview221" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:zoom="0.30951123" inkscape:cx="479.78873" inkscape:cy="380.15747" inkscape:window-x="65" inkscape:window-y="24" inkscape:window-maximized="0" inkscape:current-layer="svg2"/>
+ <clipPath id="p.0">
+ <path d="m 0,0 959.57745,0 0,760.31494 L 0,760.31494 0,0 Z" id="path5" inkscape:connector-curvature="0" style="clip-rule:nonzero"/>
+ </clipPath>
+ <g clip-path="url(#p.0)" id="g7">
+ <path d="m 0,0 959.57745,0 0,760.31494 -959.57745,0 z" id="path9" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 108.6168,572.6299 744.4094,1.32288" id="path11" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 108.6168,572.6299 744.4094,1.32288" id="path13" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:4, 12"/>
+ <path d="m 352.91077,6.2642045 272.9134,0 0,69.9527495 -272.9134,0 z" id="path15" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 352.91077,6.2642045 272.9134,0 0,69.9527495 -272.9134,0 z" id="path17" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 411.04715,52.960583 8.79687,-22.906252 3.26563,0 9.375,22.906252 -3.45313,0 -2.67187,-6.9375 -9.57813,0 -2.51562,6.9375 -3.21875,0 z m 6.60937,-9.40625 7.76563,0 -2.39063,-6.34375 q -1.09375,-2.890625 -1.625,-4.75 -0.4375,2.203125 -1.23437,4.375 l -2.51563,6.71875 z m 16.89063,15.765625 0,-22.953125 2.5625,0 0,2.15625 q 0.90625,-1.265625 2.04687,-1.890625 1.14063,-0.640625 2.76563,-0.640625 2.125,0 3.75,1.09375 1.625,1.09375 2.45312,3.09375 0.82813,1.984375 0.82813,4.359375 0,2.546875 -0.92188,4.59375 -0.90625,2.03125 -2.65625,3.125 -1.73437,1.078125 -3.65625,1.078125 -1.40625,0 -2.53125,-0.59375 -1.10937,-0.59375 -1.82812,-1.5 l 0,8.078125 -2.8125,0 z m 2.54687,-14.5625 q 0,3.203125 1.29688,4.734375 1.29687,1.53125 3.14062,1.53125 1.875,0 3.20313,-1.578125 1.34375,-1.59375 1.34375,-4.921875 0,-3.171875 -1.3125,-4.75 -1.29688,-1.578125 -3.10938,-1.578125 -1.79687,0 -3.1875,1.6875 -1.375,1.671875 -1.375,4.875 z m 15.25,14.5625 0,-22.953125 2.5625,0 0,2.15625 q 0.90625,
-1.265625 2.04688,-1.890625 1.14062,-0.640625 2.76562,-0.640625 2.125,0 3.75,1.09375 1.625,1.09375 2.45313,3.09375 0.82812,1.984375 0.82812,4.359375 0,2.546875 -0.92187,4.59375 -0.90625,2.03125 -2.65625,3.125 -1.73438,1.078125 -3.65625,1.078125 -1.40625,0 -2.53125,-0.59375 -1.10938,-0.59375 -1.82813,-1.5 l 0,8.078125 -2.8125,0 z m 2.54688,-14.5625 q 0,3.203125 1.29687,4.734375 1.29688,1.53125 3.14063,1.53125 1.875,0 3.20312,-1.578125 1.34375,-1.59375 1.34375,-4.921875 0,-3.171875 -1.3125,-4.75 -1.29687,-1.578125 -3.10937,-1.578125 -1.79688,0 -3.1875,1.6875 -1.375,1.671875 -1.375,4.875 z m 15.1875,8.203125 0,-22.906252 2.8125,0 0,22.906252 -2.8125,0 z m 7.1875,-19.671875 0,-3.234377 2.8125,0 0,3.234377 -2.8125,0 z m 0,19.671875 0,-16.59375 2.8125,0 0,16.59375 -2.8125,0 z m 17.92187,-6.078125 2.76563,0.359375 q -0.45313,2.859375 -2.32813,4.484375 -1.85937,1.609375 -4.57812,1.609375 -3.40625,0 -5.48438,-2.21875 -2.0625,-2.234375 -2.0625,-6.390625 0,-2.6875 0.89063,-4.703125 0.89062,-2.
015625 2.70312,-3.015625 1.82813,-1.015625 3.96875,-1.015625 2.70313,0 4.42188,1.375 1.71875,1.359375 2.20312,3.875 l -2.73437,0.421875 q -0.39063,-1.671875 -1.39063,-2.515625 -0.98437,-0.84375 -2.39062,-0.84375 -2.125,0 -3.45313,1.53125 -1.32812,1.515625 -1.32812,4.8125 0,3.34375 1.28125,4.859375 1.28125,1.515625 3.34375,1.515625 1.65625,0 2.76562,-1.015625 1.10938,-1.015625 1.40625,-3.125 z m 16,4.03125 q -1.5625,1.328125 -3.01562,1.875 -1.4375,0.546875 -3.09375,0.546875 -2.73438,0 -4.20313,-1.328125 -1.46875,-1.34375 -1.46875,-3.421875 0,-1.21875 0.54688,-2.21875 0.5625,-1.015625 1.45312,-1.625 0.90625,-0.609375 2.03125,-0.921875 0.82813,-0.21875 2.5,-0.421875 3.40625,-0.40625 5.01563,-0.96875 0.0156,-0.578125 0.0156,-0.734375 0,-1.71875 -0.79687,-2.421875 -1.07813,-0.953125 -3.20313,-0.953125 -1.98437,0 -2.9375,0.703125 -0.9375,0.6875 -1.39062,2.453125 l -2.75,-0.375 q 0.375,-1.765625 1.23437,-2.84375 0.85938,-1.09375 2.48438,-1.671875 1.625,-0.59375 3.76562,-0.59375 2.125,0 3.4
5313,0.5 1.32809,0.5 1.95309,1.265625 0.625,0.75 0.875,1.90625 0.14063,0.71875 0.14063,2.59375 l 0,3.75 q 0,3.921875 0.17187,4.96875 0.1875,1.03125 0.71875,1.984375 l -2.93747,0 q -0.4375,-0.875 -0.5625,-2.046875 z m -0.23437,-6.28125 q -1.53125,0.625 -4.59375,1.0625 -1.73438,0.25 -2.45313,0.5625 -0.71875,0.3125 -1.10937,0.921875 -0.39063,0.59375 -0.39063,1.328125 0,1.125 0.84375,1.875 0.85938,0.75 2.5,0.75 1.625,0 2.89063,-0.703125 1.26562,-0.71875 1.85937,-1.953125 0.45313,-0.953125 0.45313,-2.8125 l 0,-1.03125 z m 13.34372,5.8125 0.40625,2.484375 q -1.1875,0.25 -2.125,0.25 -1.53125,0 -2.375,-0.484375 -0.84375,-0.484375 -1.1875,-1.265625 -0.34375,-0.796875 -0.34375,-3.328125 l 0,-9.546875 -2.0625,0 0,-2.1875 2.0625,0 0,-4.109375 2.79687,-1.687502 0,5.796877 2.82813,0 0,2.1875 -2.82813,0 0,9.703125 q 0,1.203125 0.14063,1.546875 0.15625,0.34375 0.48437,0.546875 0.34375,0.203125 0.96875,0.203125 0.46875,0 1.23438,-0.109375 z m 2.76562,-17.15625 0,-3.234377 2.8125,0 0,3.234377 -2.8125
,0 z m 0,19.671875 0,-16.59375 2.8125,0 0,16.59375 -2.8125,0 z m 6.04688,-8.296875 q 0,-4.609375 2.5625,-6.828125 2.14062,-1.84375 5.21875,-1.84375 3.42187,0 5.59375,2.25 2.17187,2.234375 2.17187,6.1875 0,3.203125 -0.96875,5.046875 -0.95312,1.828125 -2.79687,2.84375 -1.82813,1.015625 -4,1.015625 -3.48438,0 -5.64063,-2.234375 -2.14062,-2.234375 -2.14062,-6.4375 z m 2.89062,0 q 0,3.1875 1.39063,4.78125 1.39062,1.578125 3.5,1.578125 2.09375,0 3.48437,-1.59375 1.39063,-1.59375 1.39063,-4.859375 0,-3.078125 -1.40625,-4.65625 -1.39063,-1.59375 -3.46875,-1.59375 -2.10938,0 -3.5,1.578125 -1.39063,1.578125 -1.39063,4.765625 z m 15.95313,8.296875 0,-16.59375 2.53125,0 0,2.359375 q 1.82812,-2.734375 5.28125,-2.734375 1.5,0 2.75,0.546875 1.26562,0.53125 1.89062,1.40625 0.625,0.875 0.875,2.078125 0.15625,0.78125 0.15625,2.734375 l 0,10.203125 -2.8125,0 0,-10.09375 q 0,-1.71875 -0.32812,-2.5625 -0.32813,-0.859375 -1.17188,-1.359375 -0.82812,-0.515625 -1.95312,-0.515625 -1.79688,0 -3.10938,1.14062
5 -1.29687,1.140625 -1.29687,4.328125 l 0,9.0625 -2.8125,0 z" id="path19" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 352.91077,114.23798 272.9134,0 0,69.95276 -272.9134,0 z" id="path21" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 352.91077,114.23798 272.9134,0 0,69.95276 -272.9134,0 z" id="path23" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 441.84402,138.37935 q 0,-4.26563 2.29687,-6.6875 2.29688,-2.42188 5.9375,-2.42188 2.375,0 4.28125,1.14063 1.92188,1.125 2.92188,3.17187 1,2.03125 1,4.60938 0,2.60937 -1.0625,4.67187 -1.04688,2.0625 -2.98438,3.125 -1.9375,1.0625 -4.17187,1.0625 -2.42188,0 -4.34375,-1.17187 -1.90625,-1.17188 -2.89063,-3.20313 -0.98437,-2.03125 -0.98437,-4.29687 z m 2.34375,0.0469 q 0,3.09375 1.67187,4.89063 1.67188,1.78125 4.1875,1.78125 2.57813,0 4.23438,-1.79688 1.65625,-1.8125 1.65625,-5.125 0,-2.09375 -0.71875,-3.65625 -0.70313,-1.57812 -2.07813,-2.4375 -1.35937,-0.85937 -3.04687,-0.85937 -2.42188,0 -4.17188,1.65625 -1.73437,1.65625 -1.73437,5.54687 z m 17.02734,8.32813 0,-17.1875 5.90625,0 q 2.01563,0 3.0625,0.25 1.48438,0.34375 2.51563,1.23437 1.35937,1.14063 2.03125,2.9375 0.6875,1.78125 0.6875,4.07813 0,1.95312 -0.46875,3.46875 -0.45313,1.51562 -1.17188,2.51562 -0.70312,0.98438 -1.5625,1.54688 -0.84375,0.5625 -2.04687,0.85937 -1.20313,0.29688 -2.76563,0.29688 l -6.1875,0 z m 2.2
6563,-2.03125 3.67187,0 q 1.70313,0 2.65625,-0.3125 0.96875,-0.3125 1.54688,-0.89063 0.8125,-0.8125 1.26562,-2.17187 0.45313,-1.375 0.45313,-3.3125 0,-2.70313 -0.89063,-4.14063 -0.89062,-1.45312 -2.15625,-1.9375 -0.90625,-0.35937 -2.9375,-0.35937 l -3.60937,0 0,13.125 z m 15.0664,2.03125 0,-17.1875 6.46875,0 q 1.71875,0 2.625,0.17187 1.26563,0.20313 2.10938,0.79688 0.85937,0.59375 1.375,1.67187 0.53125,1.0625 0.53125,2.32813 0,2.20312 -1.40625,3.71875 -1.39063,1.51562 -5.03125,1.51562 l -4.40625,0 0,6.98438 -2.26563,0 z m 2.26563,-9.01563 4.4375,0 q 2.20312,0 3.125,-0.8125 0.9375,-0.82812 0.9375,-2.3125 0,-1.07812 -0.54688,-1.84375 -0.54687,-0.76562 -1.4375,-1.01562 -0.57812,-0.15625 -2.125,-0.15625 l -4.39062,0 0,6.14062 z m 18.51953,9.01563 6.59375,-17.1875 2.45313,0 7.03122,17.1875 -2.59375,0 -1.99997,-5.20313 -7.1875,0 -1.89063,5.20313 -2.40625,0 z m 4.95313,-7.0625 5.82812,0 -1.79687,-4.75 q -0.8125,-2.17188 -1.21875,-3.5625 -0.32813,1.65625 -0.92188,3.28125 l -1.89062,5.03125
z m 12.94528,7.0625 0,-17.1875 6.46875,0 q 1.71875,0 2.625,0.17187 1.26562,0.20313 2.10937,0.79688 0.85938,0.59375 1.375,1.67187 0.53125,1.0625 0.53125,2.32813 0,2.20312 -1.40625,3.71875 -1.39062,1.51562 -5.03125,1.51562 l -4.40625,0 0,6.98438 -2.26562,0 z m 2.26562,-9.01563 4.4375,0 q 2.20313,0 3.125,-0.8125 0.9375,-0.82812 0.9375,-2.3125 0,-1.07812 -0.54687,-1.84375 -0.54688,-0.76562 -1.4375,-1.01562 -0.57813,-0.15625 -2.125,-0.15625 l -4.39063,0 0,6.14062 z m 14.11719,9.01563 0,-17.1875 2.28125,0 0,17.1875 -2.28125,0 z" id="path25" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 412.9821,170.63435 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17188,0 -2.17188,-0.64063 -0.98437,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48438,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98437,-0.64063 2.20312,-0.64063 0.89063,0 1.57813,0.375 0.70312,0.375 1.14062,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54687,0 z m -5.28125,-4.92188 q 0,1.89063 0.79687,2.82813 0.8125,0.9375 1.89063,0.9375 1.09375,0 1.85937,-0.89063 0.76563,-0.89062 0.76563,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92188,-0.95312 -1.10937,0 -1.85937,0.90625 -0.75,0.90625 -0.75,2.85937 z m 16.01633,1.75 1.71875,0.21875 q -0.40625,1.5 -1.51563,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42187,-1.32813 -1.26563,-1.32812 -1.26563,-3.73437 0,-2.48438 1.26563,-3.85938 1.28125,-1.375 3.32812,-1.375 1.98438,0 3.23438,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92188,2.48437 0.82812,0.85938 2.0625,0.85938
0.90625,0 1.54687,-0.46875 0.65625,-0.48438 1.04688,-1.54688 z m -5.48438,-2.70312 5.5,0 q -0.10937,-1.23438 -0.625,-1.85938 -0.79687,-0.96875 -2.07812,-0.96875 -1.14063,0 -1.9375,0.78125 -0.78125,0.76563 -0.85938,2.04688 z m 9.51636,5.875 0,-8.54688 -1.48438,0 0,-1.3125 1.48438,0 0,-1.04687 q 0,-0.98438 0.17187,-1.46875 0.23438,-0.65625 0.84375,-1.04688 0.60938,-0.40625 1.70313,-0.40625 0.70312,0 1.5625,0.15625 l -0.25,1.46875 q -0.51563,-0.0937 -0.98438,-0.0937 -0.76562,0 -1.07812,0.32813 -0.3125,0.3125 -0.3125,1.20312 l 0,0.90625 1.92187,0 0,1.3125 -1.92187,0 0,8.54688 -1.65625,0 z m 4.79266,-11.6875 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 4.12921,0 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32813 0.75,0.3125 1.10938,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01563 -0.20312,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.2968
7 -1.17188,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76562,0.67188 -0.76562,2.57813 l 0,5.375 -1.67188,0 z m 17.12571,-3.17188 1.71875,0.21875 q -0.40625,1.5 -1.51563,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42187,-1.32813 -1.26563,-1.32812 -1.26563,-3.73437 0,-2.48438 1.26563,-3.85938 1.28125,-1.375 3.32812,-1.375 1.98438,0 3.23438,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92188,2.48437 0.82812,0.85938 2.0625,0.85938 0.90625,0 1.54687,-0.46875 0.65625,-0.48438 1.04688,-1.54688 z m -5.48438,-2.70312 5.5,0 q -0.10937,-1.23438 -0.625,-1.85938 -0.79687,-0.96875 -2.07812,-0.96875 -1.14063,0 -1.9375,0.78125 -0.78125,0.76563 -0.85938,2.04688 z m 15.50073,5.875 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17187,0 -2.17187,-0.64063 -0.98438,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48437,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98438,-0.64063 2.20313,-0.64063 0.89062,0 1.57812,0.375 0.70313,0.375 1.14063
,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54688,0 z m -5.28125,-4.92188 q 0,1.89063 0.79688,2.82813 0.8125,0.9375 1.89062,0.9375 1.09375,0 1.85938,-0.89063 0.76562,-0.89062 0.76562,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92187,-0.95312 -1.10938,0 -1.85938,0.90625 -0.75,0.90625 -0.75,2.85937 z m 14.46527,-6.76562 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 4.12918,0 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32813 0.75,0.3125 1.10938,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01563 -0.20312,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17188,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76562,0.67188 -0.76562,2.57813 l 0,5.375 -1.67188,0 z m 14.93403,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26562,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29687,1.32813 1.29687,3.67188 0,1.90625 -0.57812,3 -0.5625,1.0
7812 -1.65625,1.6875 -1.07813,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82812,2.82813 0.82813,0.9375 2.07813,0.9375 1.25,0 2.0625,-0.9375 0.82812,-0.95313 0.82812,-2.89063 0,-1.82812 -0.82812,-2.76562 -0.82813,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07813,0.9375 -0.82812,0.9375 -0.82812,2.82812 z m 15.6726,4.92188 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17187,0 -2.17187,-0.64063 -0.98438,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48437,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98438,-0.64063 2.20313,-0.64063 0.89062,0 1.57812,0.375 0.70313,0.375 1.14063,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54688,0 z m -5.28125,-4.92188 q 0,1.89063 0.79688,2.82813 0.8125,0.9375 1.89062,0.9375 1.09375,0 1.85938,-0.89063 0.76562,-0.89062 0.76562,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92187,-0.95312 -1.10938,0 -1.85938,0.90625 -0.75,0.90625 -0.75,2.85937 z m 9.26636,8.70313 0,-13
.64063 1.53125,0 0,1.28125 q 0.53125,-0.75 1.20312,-1.125 0.6875,-0.375 1.64063,-0.375 1.26562,0 2.23437,0.65625 0.96875,0.64063 1.45313,1.82813 0.5,1.1875 0.5,2.59375 0,1.51562 -0.54688,2.73437 -0.54687,1.20313 -1.57812,1.84375 -1.03125,0.64063 -2.17188,0.64063 -0.84375,0 -1.51562,-0.34375 -0.65625,-0.35938 -1.07813,-0.89063 l 0,4.79688 -1.67187,0 z m 1.51562,-8.65625 q 0,1.90625 0.76563,2.8125 0.78125,0.90625 1.875,0.90625 1.10937,0 1.89062,-0.9375 0.79688,-0.9375 0.79688,-2.92188 0,-1.875 -0.78125,-2.8125 -0.76563,-0.9375 -1.84375,-0.9375 -1.0625,0 -1.89063,1 -0.8125,1 -0.8125,2.89063 z m 7.3288,8.65625 0,-1.21875 11.0625,0 0,1.21875 -11.0625,0 z m 18.34448,-5 q -0.9375,0.79687 -1.79687,1.125 -0.85938,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32813,-1.32813 0.32812,-0.59375 0.85937,-0.95312 0.53125,-0.35938 1.20313,-0.54688 0.5,-0.14062 1.48437,-0.25 2.03125,-0.25 2.98438,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4
375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.23438 q 0.23438,-1.04687 0.73438,-1.6875 0.51562,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26562,0 2.04687,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51563,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10937,0.60938 0.4375,1.17188 l -1.75,0 q -0.26563,-0.51563 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35937 -2.73438,0.625 -1.03125,0.14062 -1.45312,0.32812 -0.42188,0.1875 -0.65625,0.54688 -0.23438,0.35937 -0.23438,0.79687 0,0.67188 0.5,1.125 0.51563,0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10937,-1.15625 0.26563,-0.57813 0.26563,-1.67188 l 0,-0.60937 z m 4.07886,8.71875 0,-13.64063 1.53125,0 0,1.28125 q 0.53125,-0.75 1.20312,-1.125 0.6875,-0.375 1.64063,-0.375 1.26562,0 2.23437,0.65625 0.96875,0.64063 1.45313,1.82813 0.5,1.1875 0.5,2.59375 0,1.51562 -0.54688,2.73437 -0.54687,1.203
13 -1.57812,1.84375 -1.03125,0.64063 -2.17188,0.64063 -0.84375,0 -1.51562,-0.34375 -0.65625,-0.35938 -1.07813,-0.89063 l 0,4.79688 -1.67187,0 z m 1.51562,-8.65625 q 0,1.90625 0.76563,2.8125 0.78125,0.90625 1.875,0.90625 1.10937,0 1.89062,-0.9375 0.79688,-0.9375 0.79688,-2.92188 0,-1.875 -0.78125,-2.8125 -0.76563,-0.9375 -1.84375,-0.9375 -1.0625,0 -1.89063,1 -0.8125,1 -0.8125,2.89063 z m 8.87573,-6.8125 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 4.5979,0 0,-1.90625 1.90625,0 0,1.90625 -1.90625,0 z m 4.7146,0 0,-13.59375 1.67188,0 0,4.875 q 1.17187,-1.35938 2.95312,-1.35938 1.09375,0 1.89063,0.4375 0.8125,0.42188 1.15625,1.1875 0.35937,0.76563 0.35937,2.20313 l 0,6.25 -1.67187,0 0,-6.25 q 0,-1.25 -0.54688,-1.8125 -0.54687,-0.57813 -1.53125,-0.57813 -0.75,0 -1.40625,0.39063 -0.64062,0.375 -0.92187,1.04687 -0.28125,0.65625 -0.28125,1.8125 l 0,5.39063 -1.67188,0 z" id="path27" inkscape:connector-curvature="0" style="fill:#000000;
fill-rule:nonzero"/>
+ <path d="m 155.92686,591.1321 172.7874,0 0,123.4331 -172.7874,0 z" id="path29" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 155.92686,591.1321 172.7874,0 0,123.4331 -172.7874,0 z" id="path31" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 170.1018,664.5686 0,-22.90625 8.64062,0 q 2.28125,0 3.48438,0.21875 1.6875,0.28125 2.82812,1.07812 1.14063,0.78125 1.82813,2.20313 0.70312,1.42187 0.70312,3.125 0,2.92187 -1.85937,4.95312 -1.85938,2.01563 -6.71875,2.01563 l -5.875,0 0,9.3125 -3.03125,0 z m 3.03125,-12.01563 5.92187,0 q 2.9375,0 4.17188,-1.09375 1.23437,-1.09375 1.23437,-3.07812 0,-1.4375 -0.73437,-2.45313 -0.71875,-1.03125 -1.90625,-1.35937 -0.76563,-0.20313 -2.82813,-0.20313 l -5.85937,0 0,8.1875 z m 17.89062,12.01563 0,-22.90625 2.8125,0 0,22.90625 -2.8125,0 z m 18,-2.04688 q -1.5625,1.32813 -3.01562,1.875 -1.4375,0.54688 -3.09375,0.54688 -2.73438,0 -4.20313,-1.32813 -1.46875,-1.34375 -1.46875,-3.42187 0,-1.21875 0.54688,-2.21875 0.5625,-1.01563 1.45312,-1.625 0.90625,-0.60938 2.03125,-0.92188 0.82813,-0.21875 2.5,-0.42187 3.40625,-0.40625 5.01563,-0.96875 0.0156,-0.57813 0.0156,-0.73438 0,-1.71875 -0.79687,-2.42187 -1.07813,-0.95313 -3.20313,-0.95313 -1.98437,0 -2.9375,0.70313 -0.9375,0.6875 -1.390
62,2.45312 l -2.75,-0.375 q 0.375,-1.76562 1.23437,-2.84375 0.85938,-1.09375 2.48438,-1.67187 1.625,-0.59375 3.76562,-0.59375 2.125,0 3.45313,0.5 1.32812,0.5 1.95312,1.26562 0.625,0.75 0.875,1.90625 0.14063,0.71875 0.14063,2.59375 l 0,3.75 q 0,3.92188 0.17187,4.96875 0.1875,1.03125 0.71875,1.98438 l -2.9375,0 q -0.4375,-0.875 -0.5625,-2.04688 z m -0.23437,-6.28125 q -1.53125,0.625 -4.59375,1.0625 -1.73438,0.25 -2.45313,0.5625 -0.71875,0.3125 -1.10937,0.92188 -0.39063,0.59375 -0.39063,1.32812 0,1.125 0.84375,1.875 0.85938,0.75 2.5,0.75 1.625,0 2.89063,-0.70312 1.26562,-0.71875 1.85937,-1.95313 0.45313,-0.95312 0.45313,-2.8125 l 0,-1.03125 z m 13.34375,5.8125 0.40625,2.48438 q -1.1875,0.25 -2.125,0.25 -1.53125,0 -2.375,-0.48438 -0.84375,-0.48437 -1.1875,-1.26562 -0.34375,-0.79688 -0.34375,-3.32813 l 0,-9.54687 -2.0625,0 0,-2.1875 2.0625,0 0,-4.10938 2.79687,-1.6875 0,5.79688 2.82813,0 0,2.1875 -2.82813,0 0,9.70312 q 0,1.20313 0.14063,1.54688 0.15625,0.34375 0.48437,0.54687 0.34375,0.2
0313 0.96875,0.20313 0.46875,0 1.23438,-0.10938 z m 3.42187,2.51563 0,-14.40625 -2.48437,0 0,-2.1875 2.48437,0 0,-1.76563 q 0,-1.67187 0.29688,-2.48437 0.40625,-1.09375 1.42187,-1.76563 1.03125,-0.6875 2.875,-0.6875 1.1875,0 2.625,0.28125 l -0.42187,2.45313 q -0.875,-0.15625 -1.65625,-0.15625 -1.28125,0 -1.8125,0.54687 -0.53125,0.54688 -0.53125,2.04688 l 0,1.53125 3.23437,0 0,2.1875 -3.23437,0 0,14.40625 -2.79688,0 z m 7.17188,-8.29688 q 0,-4.60937 2.5625,-6.82812 2.14062,-1.84375 5.21875,-1.84375 3.42187,0 5.59375,2.25 2.17187,2.23437 2.17187,6.1875 0,3.20312 -0.96875,5.04687 -0.95312,1.82813 -2.79687,2.84375 -1.82813,1.01563 -4,1.01563 -3.48438,0 -5.64063,-2.23438 -2.14062,-2.23437 -2.14062,-6.4375 z m 2.89062,0 q 0,3.1875 1.39063,4.78125 1.39062,1.57813 3.5,1.57813 2.09375,0 3.48437,-1.59375 1.39063,-1.59375 1.39063,-4.85938 0,-3.07812 -1.40625,-4.65625 -1.39063,-1.59375 -3.46875,-1.59375 -2.10938,0 -3.5,1.57813 -1.39063,1.57812 -1.39063,4.76562 z m 15.92188,8.29688 0,-16.59375 2
.53125,0 0,2.51562 q 0.96875,-1.76562 1.78125,-2.32812 0.82813,-0.5625 1.8125,-0.5625 1.42188,0 2.89063,0.90625 l -0.96875,2.60937 q -1.03125,-0.60937 -2.0625,-0.60937 -0.92188,0 -1.65625,0.5625 -0.73438,0.54687 -1.04688,1.53125 -0.46875,1.5 -0.46875,3.28125 l 0,8.6875 -2.8125,0 z m 10.6875,0 0,-16.59375 2.51563,0 0,2.32812 q 0.78125,-1.21875 2.07812,-1.95312 1.29688,-0.75 2.95313,-0.75 1.84375,0 3.01562,0.76562 1.1875,0.76563 1.67188,2.14063 1.96875,-2.90625 5.125,-2.90625 2.46875,0 3.79687,1.375 1.32813,1.35937 1.32813,4.20312 l 0,11.39063 -2.79688,0 0,-10.45313 q 0,-1.6875 -0.28125,-2.42187 -0.26562,-0.75 -0.98437,-1.20313 -0.71875,-0.45312 -1.6875,-0.45312 -1.75,0 -2.90625,1.17187 -1.15625,1.15625 -1.15625,3.71875 l 0,9.64063 -2.8125,0 0,-10.78125 q 0,-1.875 -0.6875,-2.8125 -0.6875,-0.9375 -2.25,-0.9375 -1.1875,0 -2.20313,0.625 -1,0.625 -1.45312,1.82812 -0.45313,1.20313 -0.45313,3.46875 l 0,8.60938 -2.8125,0 z m 33.39063,0 8.79687,-22.90625 3.26563,0 9.375,22.90625 -3.45313,0 -2
.67187,-6.9375 -9.57813,0 -2.51562,6.9375 -3.21875,0 z m 6.60937,-9.40625 7.76563,0 -2.39063,-6.34375 q -1.09375,-2.89063 -1.625,-4.75 -0.4375,2.20312 -1.23437,4.375 l -2.51563,6.71875 z" id="path33" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 399.92685,591.1321 172.78738,0 0,123.4331 -172.78738,0 z" id="path35" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 399.92685,591.1321 172.78738,0 0,123.4331 -172.78738,0 z" id="path37" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 414.1018,664.5686 0,-22.90625 8.64063,0 q 2.28125,0 3.48437,0.21875 1.6875,0.28125 2.82813,1.07812 1.14062,0.78125 1.82812,2.20313 0.70313,1.42187 0.70313,3.125 0,2.92187 -1.85938,4.95312 -1.85937,2.01563 -6.71875,2.01563 l -5.875,0 0,9.3125 -3.03125,0 z m 3.03125,-12.01563 5.92188,0 q 2.9375,0 4.17187,-1.09375 1.23438,-1.09375 1.23438,-3.07812 0,-1.4375 -0.73438,-2.45313 -0.71875,-1.03125 -1.90625,-1.35937 -0.76562,-0.20313 -2.82812,-0.20313 l -5.85938,0 0,8.1875 z m 17.89063,12.01563 0,-22.90625 2.8125,0 0,22.90625 -2.8125,0 z m 18,-2.04688 q -1.5625,1.32813 -3.01563,1.875 -1.4375,0.54688 -3.09375,0.54688 -2.73437,0 -4.20312,-1.32813 -1.46875,-1.34375 -1.46875,-3.42187 0,-1.21875 0.54687,-2.21875 0.5625,-1.01563 1.45313,-1.625 0.90625,-0.60938 2.03125,-0.92188 0.82812,-0.21875 2.5,-0.42187 3.40625,-0.40625 5.01562,-0.96875 0.0156,-0.57813 0.0156,-0.73438 0,-1.71875 -0.79688,-2.42187 -1.07812,-0.95313 -3.20312,-0.95313 -1.98438,0 -2.9375,0.70313 -0.9375,0.6875 -1.390
63,2.45312 l -2.75,-0.375 q 0.375,-1.76562 1.23438,-2.84375 0.85937,-1.09375 2.48437,-1.67187 1.625,-0.59375 3.76563,-0.59375 2.125,0 3.45312,0.5 1.32813,0.5 1.95313,1.26562 0.625,0.75 0.875,1.90625 0.14062,0.71875 0.14062,2.59375 l 0,3.75 q 0,3.92188 0.17188,4.96875 0.1875,1.03125 0.71875,1.98438 l -2.9375,0 q -0.4375,-0.875 -0.5625,-2.04688 z m -0.23438,-6.28125 q -1.53125,0.625 -4.59375,1.0625 -1.73437,0.25 -2.45312,0.5625 -0.71875,0.3125 -1.10938,0.92188 -0.39062,0.59375 -0.39062,1.32812 0,1.125 0.84375,1.875 0.85937,0.75 2.5,0.75 1.625,0 2.89062,-0.70312 1.26563,-0.71875 1.85938,-1.95313 0.45312,-0.95312 0.45312,-2.8125 l 0,-1.03125 z m 13.34375,5.8125 0.40625,2.48438 q -1.1875,0.25 -2.125,0.25 -1.53125,0 -2.375,-0.48438 -0.84375,-0.48437 -1.1875,-1.26562 -0.34375,-0.79688 -0.34375,-3.32813 l 0,-9.54687 -2.0625,0 0,-2.1875 2.0625,0 0,-4.10938 2.79688,-1.6875 0,5.79688 2.82812,0 0,2.1875 -2.82812,0 0,9.70312 q 0,1.20313 0.14062,1.54688 0.15625,0.34375 0.48438,0.54687 0.34375,0.2
0313 0.96875,0.20313 0.46875,0 1.23437,-0.10938 z m 3.42188,2.51563 0,-14.40625 -2.48438,0 0,-2.1875 2.48438,0 0,-1.76563 q 0,-1.67187 0.29687,-2.48437 0.40625,-1.09375 1.42188,-1.76563 1.03125,-0.6875 2.875,-0.6875 1.1875,0 2.625,0.28125 l -0.42188,2.45313 q -0.875,-0.15625 -1.65625,-0.15625 -1.28125,0 -1.8125,0.54687 -0.53125,0.54688 -0.53125,2.04688 l 0,1.53125 3.23438,0 0,2.1875 -3.23438,0 0,14.40625 -2.79687,0 z m 7.17187,-8.29688 q 0,-4.60937 2.5625,-6.82812 2.14063,-1.84375 5.21875,-1.84375 3.42188,0 5.59375,2.25 2.17188,2.23437 2.17188,6.1875 0,3.20312 -0.96875,5.04687 -0.95313,1.82813 -2.79688,2.84375 -1.82812,1.01563 -4,1.01563 -3.48437,0 -5.64062,-2.23438 -2.14063,-2.23437 -2.14063,-6.4375 z m 2.89063,0 q 0,3.1875 1.39062,4.78125 1.39063,1.57813 3.5,1.57813 2.09375,0 3.48438,-1.59375 1.39062,-1.59375 1.39062,-4.85938 0,-3.07812 -1.40625,-4.65625 -1.39062,-1.59375 -3.46875,-1.59375 -2.10937,0 -3.5,1.57813 -1.39062,1.57812 -1.39062,4.76562 z m 15.92187,8.29688 0,-16.59375 2
.53125,0 0,2.51562 q 0.96875,-1.76562 1.78125,-2.32812 0.82813,-0.5625 1.8125,-0.5625 1.42188,0 2.89063,0.90625 l -0.96875,2.60937 q -1.03125,-0.60937 -2.0625,-0.60937 -0.92188,0 -1.65625,0.5625 -0.73438,0.54687 -1.04688,1.53125 -0.46875,1.5 -0.46875,3.28125 l 0,8.6875 -2.8125,0 z m 10.6875,0 0,-16.59375 2.51563,0 0,2.32812 q 0.78125,-1.21875 2.07812,-1.95312 1.29688,-0.75 2.95313,-0.75 1.84375,0 3.01562,0.76562 1.1875,0.76563 1.67188,2.14063 1.96875,-2.90625 5.125,-2.90625 2.46875,0 3.79687,1.375 1.32813,1.35937 1.32813,4.20312 l 0,11.39063 -2.79688,0 0,-10.45313 q 0,-1.6875 -0.28125,-2.42187 -0.26562,-0.75 -0.98437,-1.20313 -0.71875,-0.45312 -1.6875,-0.45312 -1.75,0 -2.90625,1.17187 -1.15625,1.15625 -1.15625,3.71875 l 0,9.64063 -2.8125,0 0,-10.78125 q 0,-1.875 -0.6875,-2.8125 -0.6875,-0.9375 -2.25,-0.9375 -1.1875,0 -2.20313,0.625 -1,0.625 -1.45312,1.82812 -0.45313,1.20313 -0.45313,3.46875 l 0,8.60938 -2.8125,0 z m 35.78125,0 0,-22.90625 8.59375,0 q 2.625,0 4.20313,0.70312 1.59375,
0.6875 2.48437,2.14063 0.90625,1.4375 0.90625,3.01562 0,1.46875 -0.79687,2.76563 -0.79688,1.29687 -2.40625,2.09375 2.07812,0.60937 3.1875,2.07812 1.125,1.46875 1.125,3.46875 0,1.60938 -0.6875,3 -0.67188,1.375 -1.67188,2.125 -1,0.75 -2.51562,1.14063 -1.5,0.375 -3.6875,0.375 l -8.73438,0 z m 3.03125,-13.28125 4.95313,0 q 2.01562,0 2.89062,-0.26563 1.15625,-0.34375 1.73438,-1.14062 0.59375,-0.79688 0.59375,-2 0,-1.14063 -0.54688,-2 -0.54687,-0.875 -1.5625,-1.1875 -1.01562,-0.32813 -3.48437,-0.32813 l -4.57813,0 0,6.92188 z m 0,10.57812 5.70313,0 q 1.46875,0 2.0625,-0.10937 1.04687,-0.1875 1.75,-0.625 0.70312,-0.4375 1.15625,-1.26563 0.45312,-0.84375 0.45312,-1.9375 0,-1.28125 -0.65625,-2.21875 -0.65625,-0.95312 -1.82812,-1.32812 -1.15625,-0.39063 -3.34375,-0.39063 l -5.29688,0 0,7.875 z" id="path39" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 643.9269,591.1321 172.78735,0 0,123.4331 -172.78735,0 z" id="path41" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 643.9269,591.1321 172.78735,0 0,123.4331 -172.78735,0 z" id="path43" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 657.219,664.5686 0,-22.90625 8.64063,0 q 2.28125,0 3.48437,0.21875 1.6875,0.28125 2.82813,1.07812 1.14062,0.78125 1.82812,2.20313 0.70313,1.42187 0.70313,3.125 0,2.92187 -1.85938,4.95312 -1.85937,2.01563 -6.71875,2.01563 l -5.875,0 0,9.3125 -3.03125,0 z m 3.03125,-12.01563 5.92188,0 q 2.9375,0 4.17187,-1.09375 1.23438,-1.09375 1.23438,-3.07812 0,-1.4375 -0.73438,-2.45313 -0.71875,-1.03125 -1.90625,-1.35937 -0.76562,-0.20313 -2.82812,-0.20313 l -5.85938,0 0,8.1875 z m 17.89063,12.01563 0,-22.90625 2.8125,0 0,22.90625 -2.8125,0 z m 18,-2.04688 q -1.5625,1.32813 -3.01563,1.875 -1.4375,0.54688 -3.09375,0.54688 -2.73437,0 -4.20312,-1.32813 -1.46875,-1.34375 -1.46875,-3.42187 0,-1.21875 0.54687,-2.21875 0.5625,-1.01563 1.45313,-1.625 0.90625,-0.60938 2.03125,-0.92188 0.82812,-0.21875 2.5,-0.42187 3.40625,-0.40625 5.01562,-0.96875 0.0156,-0.57813 0.0156,-0.73438 0,-1.71875 -0.79688,-2.42187 -1.07812,-0.95313 -3.20312,-0.95313 -1.98438,0 -2.9375,0.70313 -0.9375,0.6875 -1.3906
3,2.45312 l -2.75,-0.375 q 0.375,-1.76562 1.23438,-2.84375 0.85937,-1.09375 2.48437,-1.67187 1.625,-0.59375 3.76563,-0.59375 2.125,0 3.45312,0.5 1.32813,0.5 1.95313,1.26562 0.625,0.75 0.875,1.90625 0.14062,0.71875 0.14062,2.59375 l 0,3.75 q 0,3.92188 0.17188,4.96875 0.1875,1.03125 0.71875,1.98438 l -2.9375,0 q -0.4375,-0.875 -0.5625,-2.04688 z m -0.23438,-6.28125 q -1.53125,0.625 -4.59375,1.0625 -1.73437,0.25 -2.45312,0.5625 -0.71875,0.3125 -1.10938,0.92188 -0.39062,0.59375 -0.39062,1.32812 0,1.125 0.84375,1.875 0.85937,0.75 2.5,0.75 1.625,0 2.89062,-0.70312 1.26563,-0.71875 1.85938,-1.95313 0.45312,-0.95312 0.45312,-2.8125 l 0,-1.03125 z m 13.34375,5.8125 0.40625,2.48438 q -1.1875,0.25 -2.125,0.25 -1.53125,0 -2.375,-0.48438 -0.84375,-0.48437 -1.1875,-1.26562 -0.34375,-0.79688 -0.34375,-3.32813 l 0,-9.54687 -2.0625,0 0,-2.1875 2.0625,0 0,-4.10938 2.79688,-1.6875 0,5.79688 2.82812,0 0,2.1875 -2.82812,0 0,9.70312 q 0,1.20313 0.14062,1.54688 0.15625,0.34375 0.48438,0.54687 0.34375,0.20
313 0.96875,0.20313 0.46875,0 1.23437,-0.10938 z m 3.42188,2.51563 0,-14.40625 -2.48438,0 0,-2.1875 2.48438,0 0,-1.76563 q 0,-1.67187 0.29687,-2.48437 0.40625,-1.09375 1.42188,-1.76563 1.03125,-0.6875 2.875,-0.6875 1.1875,0 2.625,0.28125 l -0.42188,2.45313 q -0.875,-0.15625 -1.65625,-0.15625 -1.28125,0 -1.8125,0.54687 -0.53125,0.54688 -0.53125,2.04688 l 0,1.53125 3.23438,0 0,2.1875 -3.23438,0 0,14.40625 -2.79687,0 z m 7.17187,-8.29688 q 0,-4.60937 2.5625,-6.82812 2.14063,-1.84375 5.21875,-1.84375 3.42188,0 5.59375,2.25 2.17188,2.23437 2.17188,6.1875 0,3.20312 -0.96875,5.04687 -0.95313,1.82813 -2.79688,2.84375 -1.82812,1.01563 -4,1.01563 -3.48437,0 -5.64062,-2.23438 -2.14063,-2.23437 -2.14063,-6.4375 z m 2.89063,0 q 0,3.1875 1.39062,4.78125 1.39063,1.57813 3.5,1.57813 2.09375,0 3.48438,-1.59375 1.39062,-1.59375 1.39062,-4.85938 0,-3.07812 -1.40625,-4.65625 -1.39062,-1.59375 -3.46875,-1.59375 -2.10937,0 -3.5,1.57813 -1.39062,1.57812 -1.39062,4.76562 z m 15.92187,8.29688 0,-16.59375 2.
53125,0 0,2.51562 q 0.96875,-1.76562 1.78125,-2.32812 0.82813,-0.5625 1.8125,-0.5625 1.42188,0 2.89063,0.90625 l -0.96875,2.60937 q -1.03125,-0.60937 -2.0625,-0.60937 -0.92188,0 -1.65625,0.5625 -0.73438,0.54687 -1.04688,1.53125 -0.46875,1.5 -0.46875,3.28125 l 0,8.6875 -2.8125,0 z m 10.6875,0 0,-16.59375 2.51563,0 0,2.32812 q 0.78125,-1.21875 2.07812,-1.95312 1.29688,-0.75 2.95313,-0.75 1.84375,0 3.01562,0.76562 1.1875,0.76563 1.67188,2.14063 1.96875,-2.90625 5.125,-2.90625 2.46875,0 3.79687,1.375 1.32813,1.35937 1.32813,4.20312 l 0,11.39063 -2.79688,0 0,-10.45313 q 0,-1.6875 -0.28125,-2.42187 -0.26562,-0.75 -0.98437,-1.20313 -0.71875,-0.45312 -1.6875,-0.45312 -1.75,0 -2.90625,1.17187 -1.15625,1.15625 -1.15625,3.71875 l 0,9.64063 -2.8125,0 0,-10.78125 q 0,-1.875 -0.6875,-2.8125 -0.6875,-0.9375 -2.25,-0.9375 -1.1875,0 -2.20313,0.625 -1,0.625 -1.45312,1.82812 -0.45313,1.20313 -0.45313,3.46875 l 0,8.60938 -2.8125,0 z m 52.25,-8.03125 3.03125,0.76562 q -0.95312,3.73438 -3.4375,5.70313 -2
.46875,1.95312 -6.04687,1.95312 -3.70313,0 -6.03125,-1.5 -2.3125,-1.51562 -3.53125,-4.375 -1.20313,-2.85937 -1.20313,-6.14062 0,-3.57813 1.35938,-6.23438 1.375,-2.67187 3.89062,-4.04687 2.53125,-1.39063 5.5625,-1.39063 3.4375,0 5.78125,1.75 2.34375,1.75 3.26563,4.92188 l -2.98438,0.70312 q -0.79687,-2.5 -2.3125,-3.64062 -1.51562,-1.14063 -3.8125,-1.14063 -2.64062,0 -4.42187,1.26563 -1.76563,1.26562 -2.48438,3.40625 -0.71875,2.125 -0.71875,4.39062 0,2.92188 0.84375,5.10938 0.85938,2.17187 2.65625,3.25 1.79688,1.07812 3.89063,1.07812 2.54687,0 4.3125,-1.46875 1.76562,-1.46875 2.39062,-4.35937 z" id="path45" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 469.90808,95.19011 7.88977,0 0,-14.866142 15.77951,0 0,14.866142 7.88977,0 -15.77951,14.86614 z" id="path47" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 469.90808,95.19011 7.88977,0 0,-14.866142 15.77951,0 0,14.866142 7.88977,0 -15.77951,14.86614 z" id="path49" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 352.91077,223.63564 272.9134,0 0,69.95274 -272.9134,0 z" id="path51" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 352.91077,223.63564 272.9134,0 0,69.95274 -272.9134,0 z" id="path53" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 377.7698,249.96451 2.28125,0 0,9.9375 q 0,2.57813 -0.59375,4.10938 -0.57813,1.51562 -2.10938,2.48437 -1.53125,0.95313 -4.01562,0.95313 -2.42188,0 -3.95313,-0.82813 -1.53125,-0.84375 -2.1875,-2.42187 -0.65625,-1.57813 -0.65625,-4.29688 l 0,-9.9375 2.26563,0 0,9.92188 q 0,2.23437 0.42187,3.29687 0.42188,1.0625 1.42188,1.64063 1.01562,0.5625 2.48437,0.5625 2.51563,0 3.57813,-1.125 1.0625,-1.14063 1.0625,-4.375 l 0,-9.92188 z m 5.78516,17.1875 0,-12.45312 1.90625,0 0,1.78125 q 1.375,-2.0625 3.95312,-2.0625 1.125,0 2.0625,0.40625 0.95313,0.40625 1.42188,1.0625 0.46875,0.65625 0.65625,1.5625 0.125,0.57812 0.125,2.04687 l 0,7.65625 -2.10938,0 0,-7.57812 q 0,-1.28125 -0.25,-1.92188 -0.25,-0.64062 -0.875,-1.01562 -0.625,-0.39063 -1.46875,-0.39063 -1.34375,0 -2.32812,0.85938 -0.98438,0.85937 -0.98438,3.25 l 0,6.79687 -2.10937,0 z m 13.36328,-14.75 0,-2.4375 2.10937,0 0,2.4375 -2.10937,0 z m 0,14.75 0,-12.45312 2.10937,0 0,12.45312 -2.10937,0 z m 8.78515,0 -4.73437,-12.45312 2.2
1875,0 2.67187,7.45312 q 0.4375,1.21875 0.79688,2.51563 0.28125,-0.98438 0.78125,-2.375 l 2.76562,-7.59375 2.17188,0 -4.70313,12.45312 -1.96875,0 z m 17.0625,-4.01562 2.17188,0.28125 q -0.51563,1.90625 -1.90625,2.96875 -1.39063,1.04687 -3.5625,1.04687 -2.73438,0 -4.34375,-1.67187 -1.59375,-1.6875 -1.59375,-4.73438 0,-3.14062 1.60937,-4.875 1.625,-1.73437 4.20313,-1.73437 2.5,0 4.07812,1.70312 1.59375,1.70313 1.59375,4.78125 0,0.1875 -0.0156,0.5625 l -9.28125,0 q 0.10937,2.04688 1.15625,3.14063 1.04687,1.09375 2.60937,1.09375 1.15625,0 1.96875,-0.60938 0.82813,-0.60937 1.3125,-1.95312 z m -6.9375,-3.40625 6.95313,0 q -0.14063,-1.5625 -0.79688,-2.35938 -1,-1.21875 -2.60937,-1.21875 -1.45313,0 -2.45313,0.98438 -0.98437,0.96875 -1.09375,2.59375 z m 11.73828,7.42187 0,-12.45312 1.89063,0 0,1.89062 q 0.73437,-1.32812 1.34375,-1.75 0.625,-0.42187 1.35937,-0.42187 1.0625,0 2.17188,0.6875 l -0.73438,1.95312 q -0.76562,-0.45312 -1.54687,-0.45312 -0.6875,0 -1.25,0.42187 -0.54688,0.40625 -0.781
25,1.14063 -0.34375,1.125 -0.34375,2.46875 l 0,6.51562 -2.10938,0 z m 7.16407,-3.71875 2.09375,-0.32812 q 0.17187,1.25 0.96875,1.92187 0.8125,0.67188 2.25,0.67188 1.45312,0 2.15625,-0.59375 0.70312,-0.59375 0.70312,-1.39063 0,-0.71875 -0.625,-1.125 -0.42187,-0.28125 -2.15625,-0.71875 -2.3125,-0.57812 -3.21875,-1 -0.89062,-0.4375 -1.35937,-1.1875 -0.45313,-0.76562 -0.45313,-1.67187 0,-0.82813 0.375,-1.53125 0.39063,-0.71875 1.04688,-1.1875 0.48437,-0.35938 1.32812,-0.60938 0.85938,-0.26562 1.82813,-0.26562 1.46875,0 2.57812,0.42187 1.10938,0.42188 1.625,1.15625 0.53125,0.71875 0.73438,1.92188 l -2.0625,0.28125 q -0.14063,-0.96875 -0.8125,-1.5 -0.67188,-0.54688 -1.90625,-0.54688 -1.45313,0 -2.07813,0.48438 -0.625,0.48437 -0.625,1.125 0,0.40625 0.26563,0.73437 0.25,0.34375 0.8125,0.5625 0.3125,0.125 1.85937,0.54688 2.23438,0.59375 3.10938,0.98437 0.89062,0.375 1.39062,1.10938 0.51563,0.71875 0.51563,1.79687 0,1.04688 -0.625,1.98438 -0.60938,0.9375 -1.76563,1.45312 -1.15625,0.5 -2.625,0
.5 -2.42187,0 -3.70312,-1 -1.26563,-1.01562 -1.625,-3 z m 20.96875,2.1875 q -1.17188,0.98438 -2.26563,1.40625 -1.07812,0.40625 -2.3125,0.40625 -2.04687,0 -3.15625,-1 -1.09375,-1 -1.09375,-2.5625 0,-0.92187 0.40625,-1.67187 0.42188,-0.75 1.09375,-1.20313 0.67188,-0.46875 1.51563,-0.70312 0.625,-0.15625 1.875,-0.3125 2.5625,-0.3125 3.76562,-0.73438 0.0156,-0.42187 0.0156,-0.54687 0,-1.28125 -0.60938,-1.8125 -0.79687,-0.71875 -2.39062,-0.71875 -1.5,0 -2.20313,0.53125 -0.70312,0.51562 -1.04687,1.84375 l -2.0625,-0.28125 q 0.28125,-1.32813 0.92187,-2.14063 0.64063,-0.8125 1.85938,-1.25 1.21875,-0.45312 2.82812,-0.45312 1.59375,0 2.59375,0.375 1,0.375 1.46875,0.95312 0.46875,0.5625 0.65625,1.4375 0.0937,0.53125 0.0937,1.9375 l 0,2.8125 q 0,2.9375 0.14063,3.71875 0.14062,0.78125 0.53125,1.5 l -2.20313,0 q -0.32812,-0.65625 -0.42187,-1.53125 z m -0.17188,-4.71875 q -1.15625,0.46875 -3.45312,0.79688 -1.29688,0.1875 -1.84375,0.42187 -0.53125,0.23438 -0.82813,0.6875 -0.28125,0.45313 -0.28125,1
0,0.84375 0.625,1.40625 0.64063,0.5625 1.875,0.5625 1.21875,0 2.17188,-0.53125 0.95312,-0.53125 1.39062,-1.45312 0.34375,-0.71875 0.34375,-2.10938 l 0,-0.78125 z m 5.34766,6.25 0,-17.1875 2.10937,0 0,17.1875 -2.10937,0 z m 16.65625,-1.89062 0.3125,1.85937 q -0.89063,0.20313 -1.59375,0.20313 -1.15625,0 -1.79688,-0.35938 -0.625,-0.375 -0.89062,-0.96875 -0.25,-0.59375 -0.25,-2.48437 l 0,-7.17188 -1.54688,0 0,-1.64062 1.54688,0 0,-3.07813 2.09375,-1.26562 0,4.34375 2.125,0 0,1.64062 -2.125,0 0,7.28125 q 0,0.90625 0.10937,1.17188 0.125,0.25 0.375,0.40625 0.25,0.14062 0.71875,0.14062 0.34375,0 0.92188,-0.0781 z m 1.96484,6.6875 -0.23437,-1.98438 q 0.70312,0.1875 1.21875,0.1875 0.70312,0 1.125,-0.23437 0.42187,-0.23438 0.6875,-0.65625 0.20312,-0.3125 0.64062,-1.5625 0.0625,-0.1875 0.1875,-0.51563 l -4.71875,-12.48437 2.26563,0 2.59375,7.21875 q 0.5,1.35937 0.90625,2.875 0.35937,-1.45313 0.85937,-2.82813 l 2.67188,-7.26562 2.10937,0 -4.73437,12.67187 q -0.76563,2.04688 -1.1875,2.8125 -0.56
25,1.04688 -1.29688,1.53125 -0.71875,0.48438 -1.73437,0.48438 -0.60938,0 -1.35938,-0.25 z m 12.09375,-0.0312 0,-17.21875 1.92188,0 0,1.625 q 0.6875,-0.95313 1.53125,-1.42188 0.85937,-0.48437 2.07812,-0.48437 1.59375,0 2.8125,0.82812 1.21875,0.8125 1.84375,2.3125 0.625,1.5 0.625,3.28125 0,1.90625 -0.6875,3.4375 -0.6875,1.53125 -2,2.34375 -1.29687,0.8125 -2.73437,0.8125 -1.0625,0 -1.90625,-0.4375 -0.82813,-0.45312 -1.375,-1.14062 l 0,6.0625 -2.10938,0 z m 1.92188,-10.92188 q 0,2.40625 0.96875,3.5625 0.96875,1.14063 2.35937,1.14063 1.40625,0 2.40625,-1.1875 1,-1.1875 1,-3.6875 0,-2.375 -0.98437,-3.5625 -0.96875,-1.1875 -2.32813,-1.1875 -1.35937,0 -2.39062,1.26562 -1.03125,1.25 -1.03125,3.65625 z m 19.957,2.14063 2.17187,0.28125 q -0.51562,1.90625 -1.90625,2.96875 -1.39062,1.04687 -3.56247,1.04687 -2.73437,0 -4.34375,-1.67187 -1.59375,-1.6875 -1.59375,-4.73438 0,-3.14062 1.60938,-4.875 1.625,-1.73437 4.20312,-1.73437 2.49997,0 4.0781,1.70312 1.59375,1.70313 1.59375,4.78125 0,0.1875 -0.0
156,0.5625 l -9.28122,0 q 0.10938,2.04688 1.15625,3.14063 1.04688,1.09375 2.60938,1.09375 1.15625,0 1.96872,-0.60938 0.82812,-0.60937 1.3125,-1.95312 z m -6.93747,-3.40625 6.95309,0 q -0.14062,-1.5625 -0.79687,-2.35938 -0.99997,-1.21875 -2.60935,-1.21875 -1.45312,0 -2.45312,0.98438 -0.98438,0.96875 -1.09375,2.59375 z m 19.832,7.42187 0,-1.57812 q -1.1875,1.85937 -3.48438,1.85937 -1.48437,0 -2.73437,-0.8125 -1.25,-0.82812 -1.9375,-2.29687 -0.67188,-1.46875 -0.67188,-3.39063 0,-1.85937 0.60938,-3.375 0.625,-1.51562 1.85937,-2.32812 1.25,-0.8125 2.78125,-0.8125 1.125,0 2,0.48437 0.89063,0.46875 1.4375,1.23438 l 0,-6.17188 2.09375,0 0,17.1875 -1.95312,0 z m -6.67188,-6.21875 q 0,2.39063 1,3.57813 1.01563,1.1875 2.39063,1.1875 1.39062,0 2.34375,-1.125 0.96875,-1.14063 0.96875,-3.45313 0,-2.5625 -0.98438,-3.75 -0.98437,-1.20312 -2.42187,-1.20312 -1.40625,0 -2.35938,1.15625 -0.9375,1.14062 -0.9375,3.60937 z m 20.47266,2.20313 2.17187,0.28125 q -0.51562,1.90625 -1.90625,2.96875 -1.39062,1.0
4687 -3.5625,1.04687 -2.73437,0 -4.34375,-1.67187 -1.59375,-1.6875 -1.59375,-4.73438 0,-3.14062 1.60938,-4.875 1.625,-1.73437 4.20312,-1.73437 2.5,0 4.07813,1.70312 1.59375,1.70313 1.59375,4.78125 0,0.1875 -0.0156,0.5625 l -9.28125,0 q 0.10938,2.04688 1.15625,3.14063 1.04688,1.09375 2.60938,1.09375 1.15625,0 1.96875,-0.60938 0.82812,-0.60937 1.3125,-1.95312 z m -6.9375,-3.40625 6.95312,0 q -0.14062,-1.5625 -0.79687,-2.35938 -1,-1.21875 -2.60938,-1.21875 -1.45312,0 -2.45312,0.98438 -0.98438,0.96875 -1.09375,2.59375 z m 12.26953,7.42187 0,-10.8125 -1.875,0 0,-1.64062 1.875,0 0,-1.3125 q 0,-1.26563 0.21875,-1.875 0.29687,-0.8125 1.0625,-1.3125 0.78125,-0.51563 2.15625,-0.51563 0.89062,0 1.96875,0.20313 l -0.3125,1.84375 q -0.65625,-0.125 -1.25,-0.125 -0.95313,0 -1.35938,0.42187 -0.39062,0.40625 -0.39062,1.53125 l 0,1.14063 2.42187,0 0,1.64062 -2.42187,0 0,10.8125 -2.09375,0 z m 5.30859,-3.71875 2.09375,-0.32812 q 0.17188,1.25 0.96875,1.92187 0.8125,0.67188 2.25,0.67188 1.45313,0 2.1562
5,-0.59375 0.70313,-0.59375 0.70313,-1.39063 0,-0.71875 -0.625,-1.125 -0.42188,-0.28125 -2.15625,-0.71875 -2.3125,-0.57812 -3.21875,-1 -0.89063,-0.4375 -1.35938,-1.1875 -0.45312,-0.76562 -0.45312,-1.67187 0,-0.82813 0.375,-1.53125 0.39062,-0.71875 1.04687,-1.1875 0.48438,-0.35938 1.32813,-0.60938 0.85937,-0.26562 1.82812,-0.26562 1.46875,0 2.57813,0.42187 1.10937,0.42188 1.625,1.15625 0.53125,0.71875 0.73437,1.92188 l -2.0625,0.28125 q -0.14062,-0.96875 -0.8125,-1.5 -0.67187,-0.54688 -1.90625,-0.54688 -1.45312,0 -2.07812,0.48438 -0.625,0.48437 -0.625,1.125 0,0.40625 0.26562,0.73437 0.25,0.34375 0.8125,0.5625 0.3125,0.125 1.85938,0.54688 2.23437,0.59375 3.10937,0.98437 0.89063,0.375 1.39063,1.10938 0.51562,0.71875 0.51562,1.79687 0,1.04688 -0.625,1.98438 -0.60937,0.9375 -1.76562,1.45312 -1.15625,0.5 -2.625,0.5 -2.42188,0 -3.70313,-1 -1.26562,-1.01562 -1.625,-3 z m 13.40625,3.71875 0,-2.40625 2.39063,0 0,2.40625 q 0,1.32813 -0.46875,2.14063 -0.46875,0.8125 -1.48438,1.26562 l -0.57812,
-0.90625 q 0.65625,-0.29687 0.96875,-0.875 0.32812,-0.5625 0.35937,-1.625 l -1.1875,0 z m 21.30469,-4.01562 2.17188,0.28125 q -0.51563,1.90625 -1.90625,2.96875 -1.39063,1.04687 -3.5625,1.04687 -2.73438,0 -4.34375,-1.67187 -1.59375,-1.6875 -1.59375,-4.73438 0,-3.14062 1.60937,-4.875 1.625,-1.73437 4.20313,-1.73437 2.5,0 4.07812,1.70312 1.59375,1.70313 1.59375,4.78125 0,0.1875 -0.0156,0.5625 l -9.28125,0 q 0.10937,2.04688 1.15625,3.14063 1.04687,1.09375 2.60937,1.09375 1.15625,0 1.96875,-0.60938 0.82813,-0.60937 1.3125,-1.95312 z m -6.9375,-3.40625 6.95313,0 q -0.14063,-1.5625 -0.79688,-2.35938 -1,-1.21875 -2.60937,-1.21875 -1.45313,0 -2.45313,0.98438 -0.98437,0.96875 -1.09375,2.59375 z m 16.36328,5.53125 0.3125,1.85937 q -0.89062,0.20313 -1.59375,0.20313 -1.15625,0 -1.79687,-0.35938 -0.625,-0.375 -0.89063,-0.96875 -0.25,-0.59375 -0.25,-2.48437 l 0,-7.17188 -1.54687,0 0,-1.64062 1.54687,0 0,-3.07813 2.09375,-1.26562 0,4.34375 2.125,0 0,1.64062 -2.125,0 0,7.28125 q 0,0.90625 0.10938,1.
17188 0.125,0.25 0.375,0.40625 0.25,0.14062 0.71875,0.14062 0.34375,0 0.92187,-0.0781 z m 10.1836,-2.67188 2.07812,0.26563 q -0.34375,2.15625 -1.75,3.375 -1.39062,1.20312 -3.4375,1.20312 -2.54687,0 -4.10937,-1.67187 -1.54688,-1.67188 -1.54688,-4.78125 0,-2.01563 0.67188,-3.53125 0.67187,-1.51563 2.03125,-2.26563 1.35937,-0.76562 2.96875,-0.76562 2.03125,0 3.3125,1.03125 1.29687,1.03125 1.65625,2.90625 l -2.04688,0.32812 q -0.29687,-1.26562 -1.04687,-1.89062 -0.73438,-0.64063 -1.79688,-0.64063 -1.59375,0 -2.59375,1.15625 -0.98437,1.14063 -0.98437,3.60938 0,2.5 0.95312,3.64062 0.96875,1.14063 2.51563,1.14063 1.23437,0 2.0625,-0.76563 0.84375,-0.76562 1.0625,-2.34375 z m 4.48437,4.5625 0,-2.40625 2.39063,0 0,2.40625 -2.39063,0 z" id="path55" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 345.82153,291.50305 c -6.4361,0 -11.65356,-0.86954 -11.65356,-1.94217 l 0,-137.24951 c 0,-1.07263 -5.21747,-1.94218 -11.65354,-1.94218 l 0,0 c 6.43607,0 11.65354,-0.86954 11.65354,-1.94217 l 0,-137.249513 0,0 c 0,-1.072636 5.21746,-1.9421795 11.65356,-1.9421795 z" id="path57" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 345.82153,291.50305 c -6.4361,0 -11.65356,-0.86954 -11.65356,-1.94217 l 0,-137.24951 c 0,-1.07263 -5.21747,-1.94218 -11.65354,-1.94218 l 0,0 c 6.43607,0 11.65354,-0.86954 11.65354,-1.94217 l 0,-137.249513 0,0 c 0,-1.072636 5.21746,-1.9421795 11.65356,-1.9421795" id="path59" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 345.82153,291.50305 c -6.4361,0 -11.65356,-0.86954 -11.65356,-1.94217 l 0,-137.24951 c 0,-1.07263 -5.21747,-1.94218 -11.65354,-1.94218 l 0,0 c 6.43607,0 11.65354,-0.86954 11.65354,-1.94217 l 0,-137.249513 0,0 c 0,-1.072636 5.21746,-1.9421795 11.65356,-1.9421795" id="path61" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 108.6168,312.60367 744.4094,1.32285" id="path63" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 108.6168,312.60367 744.4094,1.32285" id="path65" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:4, 12"/>
+ <path d="m 469.90808,204.48848 7.88977,0 0,-14.86615 15.77951,0 0,14.86615 7.88977,0 -15.77951,14.86614 z" id="path67" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 469.90808,204.48848 7.88977,0 0,-14.86615 15.77951,0 0,14.86615 7.88977,0 -15.77951,14.86614 z" id="path69" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 286.02362,262.87314 0,-219.87402 49.00787,0 0,219.87402 z" id="path71" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 303.85382,218.74644 0,-1.79688 7.84375,0 q 2.0625,0 3.26562,0.46875 1.20313,0.45313 1.96875,1.67188 0.75,1.20312 0.75,3.17187 0,1.90625 -0.65625,3.125 -0.65625,1.21875 -1.90625,1.73438 -1.25,0.51562 -3.42187,0.51562 l -7.84375,0 0,-1.79687 7.84375,0 q 1.76562,0 2.60937,-0.32813 0.84375,-0.32812 1.29688,-1.125 0.45312,-0.8125 0.45312,-1.96875 0,-1.98437 -0.89062,-2.82812 -0.90625,-0.84375 -3.46875,-0.84375 l -7.84375,0 z m 13.59375,-4.33232 -9.85938,0 0,-1.5 1.40625,0 q -1.625,-1.09375 -1.625,-3.14063 0,-0.89062 0.32813,-1.64062 0.3125,-0.75 0.84375,-1.10938 0.51562,-0.375 1.21875,-0.53125 0.46875,-0.0937 1.625,-0.0937 l 6.0625,0 0,1.67188 -6,0 q -1.01563,0 -1.51563,0.20312 -0.51562,0.1875 -0.8125,0.6875 -0.29687,0.5 -0.29687,1.17188 0,1.0625 0.67187,1.84375 0.67188,0.76562 2.57813,0.76562 l 5.375,0 0,1.67188 z m -11.6875,-10.39134 -1.90625,0 0,-1.67188 1.90625,0 0,1.67188 z m 11.6875,0 -9.85938,0 0,-1.67188 9.85938,0 0,1.67188 z m 0,-6.86357 -9.85938,3.75 0,-1.76563 5
.90625,-2.125 q 0.95313,-0.34375 1.98438,-0.625 -0.78125,-0.21875 -1.875,-0.625 l -6.01563,-2.1875 0,-1.71875 9.85938,3.73438 0,1.5625 z m -3.17188,-13.34375 0.21875,-1.71875 q 1.5,0.40625 2.34375,1.51562 0.82813,1.09375 0.82813,2.8125 0,2.15625 -1.32813,3.42188 -1.32812,1.26562 -3.73437,1.26562 -2.48438,0 -3.85938,-1.26562 -1.375,-1.28125 -1.375,-3.32813 0,-1.98437 1.34375,-3.23437 1.34375,-1.25 3.79688,-1.25 0.14062,0 0.4375,0.0156 l 0,7.34375 q 1.625,-0.0937 2.48437,-0.92187 0.85938,-0.82813 0.85938,-2.0625 0,-0.90625 -0.46875,-1.54688 -0.48438,-0.65625 -1.54688,-1.04687 z m -2.70312,5.48437 0,-5.5 q -1.23438,0.10938 -1.85938,0.625 -0.96875,0.79688 -0.96875,2.07813 0,1.14062 0.78125,1.9375 0.76563,0.78125 2.04688,0.85937 z m 5.875,-9.09447 -9.85938,0 0,-1.5 1.5,0 q -1.04687,-0.57812 -1.375,-1.0625 -0.34375,-0.48437 -0.34375,-1.07812 0,-0.84375 0.54688,-1.71875 l 1.54687,0.57812 q -0.35937,0.60938 -0.35937,1.23438 0,0.54687 0.32812,0.98437 0.32813,0.42188 0.90625,0.60938 0.89063,0
.28125 1.95313,0.28125 l 5.15625,0 0,1.67187 z m -2.9375,-5.55642 -0.26563,-1.65625 q 1,-0.14063 1.53125,-0.76563 0.51563,-0.64062 0.51563,-1.78125 0,-1.15625 -0.46875,-1.70312 -0.46875,-0.5625 -1.09375,-0.5625 -0.5625,0 -0.89063,0.48437 -0.21875,0.34375 -0.5625,1.70313 -0.46875,1.84375 -0.79687,2.5625 -0.34375,0.70312 -0.9375,1.07812 -0.60938,0.35938 -1.32813,0.35938 -0.65625,0 -1.21875,-0.29688 -0.5625,-0.3125 -0.9375,-0.82812 -0.28125,-0.39063 -0.48437,-1.0625 -0.20313,-0.67188 -0.20313,-1.4375 0,-1.17188 0.34375,-2.04688 0.32813,-0.875 0.90625,-1.28125 0.5625,-0.42187 1.51563,-0.57812 l 0.21875,1.625 q -0.75,0.10937 -1.17188,0.65625 -0.4375,0.53125 -0.4375,1.5 0,1.15625 0.39063,1.64062 0.375,0.48438 0.875,0.48438 0.32812,0 0.59375,-0.20313 0.26562,-0.20312 0.4375,-0.64062 0.0937,-0.25 0.4375,-1.46875 0.46875,-1.76563 0.76562,-2.46875 0.29688,-0.70313 0.875,-1.09375 0.57813,-0.40625 1.4375,-0.40625 0.82813,0 1.57813,0.48437 0.73437,0.48438 1.14062,1.40625 0.39063,0.92188 0.39063,
2.07813 0,1.92187 -0.79688,2.9375 -0.79687,1 -2.35937,1.28125 z m 1.71875,-16.4375 q 0.79687,0.9375 1.125,1.79687 0.3125,0.85938 0.3125,1.84375 0,1.60938 -0.78125,2.48438 -0.79688,0.875 -2.03125,0.875 -0.73438,0 -1.32813,-0.32813 -0.59375,-0.32812 -0.95312,-0.85937 -0.35938,-0.53125 -0.54688,-1.20313 -0.14062,-0.5 -0.25,-1.48437 -0.25,-2.03125 -0.57812,-2.98438 -0.34375,0 -0.4375,0 -1.01563,0 -1.4375,0.46875 -0.5625,0.64063 -0.5625,1.90625 0,1.17188 0.40625,1.73438 0.40625,0.5625 1.46875,0.82812 l -0.23438,1.64063 q -1.04687,-0.23438 -1.6875,-0.73438 -0.64062,-0.51562 -0.98437,-1.46875 -0.35938,-0.96875 -0.35938,-2.25 0,-1.26562 0.29688,-2.04687 0.29687,-0.78125 0.75,-1.15625 0.45312,-0.375 1.14062,-0.51563 0.42188,-0.0937 1.53125,-0.0937 l 2.23438,0 q 2.32812,0 2.95312,-0.0937 0.60938,-0.10937 1.17188,-0.4375 l 0,1.75 q -0.51563,0.26563 -1.21875,0.32813 z m -3.71875,0.14062 q 0.35937,0.90625 0.625,2.73438 0.14062,1.03125 0.32812,1.45312 0.1875,0.42188 0.54688,0.65625 0.35937,0.2343
8 0.79687,0.23438 0.67188,0 1.125,-0.5 0.4375,-0.51563 0.4375,-1.48438 0,-0.96875 -0.42187,-1.71875 -0.4375,-0.75 -1.15625,-1.10937 -0.57813,-0.26563 -1.67188,-0.26563 l -0.60937,0 z m 4.9375,-4.04759 -13.59375,0 0,-1.67188 13.59375,0 0,1.67188 z m 0,-9.57813 -13.59375,0 0,-5.125 q 0,-1.35937 0.125,-2.07812 0.17187,-1 0.64062,-1.67188 0.46875,-0.67187 1.3125,-1.07814 0.84375,-0.42187 1.84375,-0.42187 1.73438,0 2.9375,1.10939 1.20313,1.09375 1.20313,3.98437 l 0,3.48438 5.53125,0 0,1.79687 z m -7.14063,-1.79687 0,-3.51563 q 0,-1.75 -0.64062,-2.46875 -0.65625,-0.73437 -1.82813,-0.73437 -0.85937,0 -1.46875,0.4375 -0.60937,0.42187 -0.79687,1.125 -0.125,0.45312 -0.125,1.67187 l 0,3.48438 4.85937,0 z m 7.14063,-10.39671 -13.59375,0 0,-1.67188 13.59375,0 0,1.67188 z m -1.21875,-10.61355 q 0.79687,0.9375 1.125,1.79687 0.3125,0.85938 0.3125,1.84375 0,1.60938 -0.78125,2.48437 -0.79688,0.875 -2.03125,0.875 -0.73438,0 -1.32813,-0.32812 -0.59375,-0.32813 -0.95312,-0.85937 -0.35938,-0.53125 -0.546
88,-1.20313 -0.14062,-0.5 -0.25,-1.48437 -0.25,-2.03125 -0.57812,-2.98438 -0.34375,0 -0.4375,0 -1.01563,0 -1.4375,0.46875 -0.5625,0.64063 -0.5625,1.90625 0,1.17188 0.40625,1.73438 0.40625,0.5625 1.46875,0.82812 l -0.23438,1.64062 q -1.04687,-0.23437 -1.6875,-0.73437 -0.64062,-0.51562 -0.98437,-1.46875 -0.35938,-0.96875 -0.35938,-2.25 0,-1.26562 0.29688,-2.04687 0.29687,-0.78125 0.75,-1.15625 0.45312,-0.375 1.14062,-0.51563 0.42188,-0.0937 1.53125,-0.0937 l 2.23438,0 q 2.32812,0 2.95312,-0.0937 0.60938,-0.10937 1.17188,-0.4375 l 0,1.75 q -0.51563,0.26563 -1.21875,0.32813 z m -3.71875,0.14062 q 0.35937,0.90625 0.625,2.73438 0.14062,1.03125 0.32812,1.45312 0.1875,0.42188 0.54688,0.65625 0.35937,0.23438 0.79687,0.23438 0.67188,0 1.125,-0.5 0.4375,-0.51563 0.4375,-1.48438 0,-0.96875 -0.42187,-1.71875 -0.4375,-0.75 -1.15625,-1.10937 -0.57813,-0.26563 -1.67188,-0.26563 l -0.60937,0 z m 3.4375,-7.7351 1.48437,-0.23438 q 0.14063,0.70313 0.14063,1.26563 0,0.90625 -0.28125,1.40625 -0.29688,0.5
-0.75,0.70312 -0.46875,0.20313 -1.98438,0.20313 l -5.65625,0 0,1.23437 -1.3125,0 0,-1.23437 -2.4375,0 -1,-1.65625 3.4375,0 0,-1.6875 1.3125,0 0,1.6875 5.75,0 q 0.71875,0 0.92188,-0.0781 0.20312,-0.0937 0.32812,-0.29687 0.125,-0.20313 0.125,-0.57813 0,-0.26562 -0.0781,-0.73437 z m 1.5,-1.93329 -8.54688,0 0,1.48437 -1.3125,0 0,-1.48437 -1.04687,0 q -0.98438,0 -1.46875,-0.17188 -0.65625,-0.23437 -1.04688,-0.84375 -0.40625,-0.60937 -0.40625,-1.70312 0,-0.70313 0.15625,-1.5625 l 1.46875,0.25 q -0.0937,0.51562 -0.0937,0.98437 0,0.76563 0.32813,1.07813 0.3125,0.3125 1.20312,0.3125 l 0.90625,0 0,-1.92188 1.3125,0 0,1.92188 8.54688,0 0,1.65625 z m -4.92188,-4.15207 q -2.73437,0 -4.0625,-1.53125 -1.09375,-1.26563 -1.09375,-3.09375 0,-2.03125 1.34375,-3.3125 1.32813,-1.296876 3.67188,-1.296876 1.90625,0 3,0.578125 1.07812,0.562501 1.6875,1.656251 0.59375,1.07812 0.59375,2.375 0,2.0625 -1.32813,3.34375 -1.32812,1.28125 -3.8125,1.28125 z m 0,-1.71875 q 1.89063,0 2.82813,-0.82813 0.9375,-0.82812
0.9375,-2.07812 0,-1.25 -0.9375,-2.0625 -0.95313,-0.82813 -2.89063,-0.82813 -1.82812,0 -2.76562,0.82813 -0.9375,0.82812 -0.9375,2.0625 0,1.25 0.9375,2.07812 0.9375,0.82813 2.82812,0.82813 z m 4.92188,-9.266328 -9.85938,0 0,-1.5 1.5,0 q -1.04687,-0.578125 -1.375,-1.0625 -0.34375,-0.484375 -0.34375,-1.078125 0,-0.84375 0.54688,-1.71875 l 1.54687,0.578125 q -0.35937,0.609375 -0.35937,1.234375 0,0.546875 0.32812,0.984375 0.32813,0.421875 0.90625,0.609375 0.89063,0.28125 1.95313,0.28125 l 5.15625,0 0,1.671875 z m 0,-6.228302 -9.85938,0 0,-1.5 1.39063,0 q -0.71875,-0.453125 -1.15625,-1.21875 -0.45313,-0.78125 -0.45313,-1.765625 0,-1.09375 0.45313,-1.796875 0.45312,-0.703125 1.28125,-0.984375 -1.73438,-1.171875 -1.73438,-3.046875 0,-1.46875 0.8125,-2.25 0.8125,-0.796875 2.5,-0.796875 l 6.76563,0 0,1.671875 -6.20313,0 q -1,0 -1.4375,0.15625 -0.45312,0.15625 -0.71875,0.59375 -0.26562,0.421875 -0.26562,1 0,1.03125 0.6875,1.71875 0.6875,0.6875 2.21875,0.6875 l 5.71875,0 0,1.671875 -6.40625,0
q -1.10938,0 -1.65625,0.40625 -0.5625,0.40625 -0.5625,1.34375 0,0.703125 0.375,1.3125 0.35937,0.59375 1.07812,0.859375 0.71875,0.265625 2.0625,0.265625 l 5.10938,0 0,1.671875 z" id="path73" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 352.91077,330.28482 272.9134,0 0,69.95276 -272.9134,0 z" id="path75" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 352.91077,330.28482 272.9134,0 0,69.95276 -272.9134,0 z" id="path77" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 409.11746,342.11368 2.28125,0 0,9.9375 q 0,2.57812 -0.59375,4.10937 -0.57813,1.51563 -2.10938,2.48438 -1.53125,0.95312 -4.01562,0.95312 -2.42188,0 -3.95313,-0.82812 -1.53125,-0.84375 -2.1875,-2.42188 -0.65625,-1.57812 -0.65625,-4.29687 l 0,-9.9375 2.26563,0 0,9.92187 q 0,2.23438 0.42187,3.29688 0.42188,1.0625 1.42188,1.64062 1.01562,0.5625 2.48437,0.5625 2.51563,0 3.57813,-1.125 1.0625,-1.14062 1.0625,-4.375 l 0,-9.92187 z m 5.78516,17.1875 0,-12.45313 1.90625,0 0,1.78125 q 1.375,-2.0625 3.95312,-2.0625 1.125,0 2.0625,0.40625 0.95313,0.40625 1.42188,1.0625 0.46875,0.65625 0.65625,1.5625 0.125,0.57813 0.125,2.04688 l 0,7.65625 -2.10938,0 0,-7.57813 q 0,-1.28125 -0.25,-1.92187 -0.25,-0.64063 -0.875,-1.01563 -0.625,-0.39062 -1.46875,-0.39062 -1.34375,0 -2.32812,0.85937 -0.98438,0.85938 -0.98438,3.25 l 0,6.79688 -2.10937,0 z m 13.36328,-14.75 0,-2.4375 2.10937,0 0,2.4375 -2.10937,0 z m 0,14.75 0,-12.45313 2.10937,0 0,12.45313 -2.10937,0 z m 8.78515,0 -4.73437,-12.45313 2.
21875,0 2.67187,7.45313 q 0.4375,1.21875 0.79688,2.51562 0.28125,-0.98437 0.78125,-2.375 l 2.76562,-7.59375 2.17188,0 -4.70313,12.45313 -1.96875,0 z m 17.0625,-4.01563 2.17188,0.28125 q -0.51563,1.90625 -1.90625,2.96875 -1.39063,1.04688 -3.5625,1.04688 -2.73438,0 -4.34375,-1.67188 -1.59375,-1.6875 -1.59375,-4.73437 0,-3.14063 1.60937,-4.875 1.625,-1.73438 4.20313,-1.73438 2.5,0 4.07812,1.70313 1.59375,1.70312 1.59375,4.78125 0,0.1875 -0.0156,0.5625 l -9.28125,0 q 0.10937,2.04687 1.15625,3.14062 1.04687,1.09375 2.60937,1.09375 1.15625,0 1.96875,-0.60937 0.82813,-0.60938 1.3125,-1.95313 z m -6.9375,-3.40625 6.95313,0 q -0.14063,-1.5625 -0.79688,-2.35937 -1,-1.21875 -2.60937,-1.21875 -1.45313,0 -2.45313,0.98437 -0.98437,0.96875 -1.09375,2.59375 z m 11.73828,7.42188 0,-12.45313 1.89063,0 0,1.89063 q 0.73437,-1.32813 1.34375,-1.75 0.625,-0.42188 1.35937,-0.42188 1.0625,0 2.17188,0.6875 l -0.73438,1.95313 q -0.76562,-0.45313 -1.54687,-0.45313 -0.6875,0 -1.25,0.42188 -0.54688,0.40625 -0.78
125,1.14062 -0.34375,1.125 -0.34375,2.46875 l 0,6.51563 -2.10938,0 z m 7.16407,-3.71875 2.09375,-0.32813 q 0.17187,1.25 0.96875,1.92188 0.8125,0.67187 2.25,0.67187 1.45312,0 2.15625,-0.59375 0.70312,-0.59375 0.70312,-1.39062 0,-0.71875 -0.625,-1.125 -0.42187,-0.28125 -2.15625,-0.71875 -2.3125,-0.57813 -3.21875,-1 -0.89062,-0.4375 -1.35937,-1.1875 -0.45313,-0.76563 -0.45313,-1.67188 0,-0.82812 0.375,-1.53125 0.39063,-0.71875 1.04688,-1.1875 0.48437,-0.35937 1.32812,-0.60937 0.85938,-0.26563 1.82813,-0.26563 1.46875,0 2.57812,0.42188 1.10938,0.42187 1.625,1.15625 0.53125,0.71875 0.73438,1.92187 l -2.0625,0.28125 q -0.14063,-0.96875 -0.8125,-1.5 -0.67188,-0.54687 -1.90625,-0.54687 -1.45313,0 -2.07813,0.48437 -0.625,0.48438 -0.625,1.125 0,0.40625 0.26563,0.73438 0.25,0.34375 0.8125,0.5625 0.3125,0.125 1.85937,0.54687 2.23438,0.59375 3.10938,0.98438 0.89062,0.375 1.39062,1.10937 0.51563,0.71875 0.51563,1.79688 0,1.04687 -0.625,1.98437 -0.60938,0.9375 -1.76563,1.45313 -1.15625,0.5 -2.625,
0.5 -2.42187,0 -3.70312,-1 -1.26563,-1.01563 -1.625,-3 z m 20.96875,2.1875 q -1.17188,0.98437 -2.26563,1.40625 -1.07812,0.40625 -2.3125,0.40625 -2.04687,0 -3.15625,-1 -1.09375,-1 -1.09375,-2.5625 0,-0.92188 0.40625,-1.67188 0.42188,-0.75 1.09375,-1.20312 0.67188,-0.46875 1.51563,-0.70313 0.625,-0.15625 1.875,-0.3125 2.5625,-0.3125 3.76562,-0.73437 0.0156,-0.42188 0.0156,-0.54688 0,-1.28125 -0.60938,-1.8125 -0.79687,-0.71875 -2.39062,-0.71875 -1.5,0 -2.20313,0.53125 -0.70312,0.51563 -1.04687,1.84375 l -2.0625,-0.28125 q 0.28125,-1.32812 0.92187,-2.14062 0.64063,-0.8125 1.85938,-1.25 1.21875,-0.45313 2.82812,-0.45313 1.59375,0 2.59375,0.375 1,0.375 1.46875,0.95313 0.46875,0.5625 0.65625,1.4375 0.0937,0.53125 0.0937,1.9375 l 0,2.8125 q 0,2.9375 0.14063,3.71875 0.14062,0.78125 0.53125,1.5 l -2.20313,0 q -0.32812,-0.65625 -0.42187,-1.53125 z m -0.17188,-4.71875 q -1.15625,0.46875 -3.45312,0.79687 -1.29688,0.1875 -1.84375,0.42188 -0.53125,0.23437 -0.82813,0.6875 -0.28125,0.45312 -0.28125,
1 0,0.84375 0.625,1.40625 0.64063,0.5625 1.875,0.5625 1.21875,0 2.17188,-0.53125 0.95312,-0.53125 1.39062,-1.45313 0.34375,-0.71875 0.34375,-2.10937 l 0,-0.78125 z m 5.34766,6.25 0,-17.1875 2.10937,0 0,17.1875 -2.10937,0 z m 12.23437,0 0,-17.1875 6.4375,0 q 1.96872,0 3.15622,0.53125 1.1875,0.51562 1.85938,1.60937 0.6875,1.07813 0.6875,2.26563 0,1.09375 -0.60938,2.07812 -0.59375,0.96875 -1.79687,1.5625 1.5625,0.45313 2.39062,1.5625 0.84375,1.09375 0.84375,2.59375 0,1.20313 -0.51562,2.25 -0.5,1.03125 -1.25,1.59375 -0.75,0.5625 -1.89063,0.85938 -1.125,0.28125 -2.76559,0.28125 l -6.54688,0 z m 2.26563,-9.96875 3.71875,0 q 1.51562,0 2.17184,-0.1875 0.85938,-0.26563 1.29688,-0.85938 0.4375,-0.59375 0.4375,-1.5 0,-0.85937 -0.40625,-1.5 -0.40625,-0.65625 -1.17188,-0.89062 -0.76562,-0.25 -2.60934,-0.25 l -3.4375,0 0,5.1875 z m 0,7.9375 4.28125,0 q 1.09372,0 1.54684,-0.0781 0.78125,-0.14062 1.3125,-0.46875 0.53125,-0.32812 0.85938,-0.95312 0.34375,-0.625 0.34375,-1.45313 0,-0.95312 -0.5,-1.65
625 -0.48438,-0.71875 -1.35938,-1 -0.875,-0.29687 -2.51559,-0.29687 l -3.96875,0 0,5.90625 z m 13.57028,-12.71875 0,-2.4375 2.10937,0 0,2.4375 -2.10937,0 z m 0,14.75 0,-12.45313 2.10937,0 0,12.45313 -2.10937,0 z m 9.92578,-1.89063 0.3125,1.85938 q -0.89062,0.20312 -1.59375,0.20312 -1.15625,0 -1.79687,-0.35937 -0.625,-0.375 -0.89063,-0.96875 -0.25,-0.59375 -0.25,-2.48438 l 0,-7.17187 -1.54687,0 0,-1.64063 1.54687,0 0,-3.07812 2.09375,-1.26563 0,4.34375 2.125,0 0,1.64063 -2.125,0 0,7.28125 q 0,0.90625 0.10938,1.17187 0.125,0.25 0.375,0.40625 0.25,0.14063 0.71875,0.14063 0.34375,0 0.92187,-0.0781 z m 10.18359,-2.67187 2.07813,0.26562 q -0.34375,2.15625 -1.75,3.375 -1.39063,1.20313 -3.4375,1.20313 -2.54688,0 -4.10938,-1.67188 -1.54687,-1.67187 -1.54687,-4.78125 0,-2.01562 0.67187,-3.53125 0.67188,-1.51562 2.03125,-2.26562 1.35938,-0.76563 2.96875,-0.76563 2.03125,0 3.3125,1.03125 1.29688,1.03125 1.65625,2.90625 l -2.04687,0.32813 q -0.29688,-1.26563 -1.04688,-1.89063 -0.73437,-0.64062 -
1.79687,-0.64062 -1.59375,0 -2.59375,1.15625 -0.98438,1.14062 -0.98438,3.60937 0,2.5 0.95313,3.64063 0.96875,1.14062 2.51562,1.14062 1.23438,0 2.0625,-0.76562 0.84375,-0.76563 1.0625,-2.34375 z m 3.09375,-1.65625 q 0,-3.46875 1.92188,-5.125 1.60937,-1.39063 3.92187,-1.39063 2.5625,0 4.1875,1.6875 1.625,1.6875 1.625,4.64063 0,2.40625 -0.71875,3.78125 -0.71875,1.375 -2.09375,2.14062 -1.375,0.76563 -3,0.76563 -2.625,0 -4.23437,-1.67188 -1.60938,-1.6875 -1.60938,-4.82812 z m 2.17188,0 q 0,2.39062 1.03125,3.57812 1.04687,1.1875 2.64062,1.1875 1.5625,0 2.60938,-1.1875 1.04687,-1.20312 1.04687,-3.65625 0,-2.3125 -1.0625,-3.5 -1.04687,-1.1875 -2.59375,-1.1875 -1.59375,0 -2.64062,1.1875 -1.03125,1.1875 -1.03125,3.57813 z m 20.03516,6.21875 0,-1.57813 q -1.1875,1.85938 -3.48438,1.85938 -1.48437,0 -2.73437,-0.8125 -1.25,-0.82813 -1.9375,-2.29688 -0.67188,-1.46875 -0.67188,-3.39062 0,-1.85938 0.60938,-3.375 0.625,-1.51563 1.85937,-2.32813 1.25,-0.8125 2.78125,-0.8125 1.125,0 2,0.48438 0.89063,0
.46875 1.4375,1.23437 l 0,-6.17187 2.09375,0 0,17.1875 -1.95312,0 z m -6.67188,-6.21875 q 0,2.39062 1,3.57812 1.01563,1.1875 2.39063,1.1875 1.39062,0 2.34375,-1.125 0.96875,-1.14062 0.96875,-3.45312 0,-2.5625 -0.98438,-3.75 -0.98437,-1.20313 -2.42187,-1.20313 -1.40625,0 -2.35938,1.15625 -0.9375,1.14063 -0.9375,3.60938 z m 20.47266,2.20312 2.17187,0.28125 q -0.51562,1.90625 -1.90625,2.96875 -1.39062,1.04688 -3.5625,1.04688 -2.73437,0 -4.34375,-1.67188 -1.59375,-1.6875 -1.59375,-4.73437 0,-3.14063 1.60938,-4.875 1.625,-1.73438 4.20312,-1.73438 2.5,0 4.07813,1.70313 1.59375,1.70312 1.59375,4.78125 0,0.1875 -0.0156,0.5625 l -9.28125,0 q 0.10938,2.04687 1.15625,3.14062 1.04688,1.09375 2.60938,1.09375 1.15625,0 1.96875,-0.60937 0.82812,-0.60938 1.3125,-1.95313 z m -6.9375,-3.40625 6.95312,0 q -0.14062,-1.5625 -0.79687,-2.35937 -1,-1.21875 -2.60938,-1.21875 -1.45312,0 -2.45312,0.98437 -0.98438,0.96875 -1.09375,2.59375 z" id="path79" inkscape:connector-curvature="0" style="fill:#000000;fill
-rule:nonzero"/>
+ <path d="m 457.11942,388.3012 0,-17.1875 6.4375,0 q 1.96875,0 3.15625,0.53125 1.1875,0.51562 1.85937,1.60937 0.6875,1.07813 0.6875,2.26563 0,1.09375 -0.60937,2.07812 -0.59375,0.96875 -1.79688,1.5625 1.5625,0.45313 2.39063,1.5625 0.84375,1.09375 0.84375,2.59375 0,1.20313 -0.51563,2.25 -0.5,1.03125 -1.25,1.59375 -0.75,0.5625 -1.89062,0.85938 -1.125,0.28125 -2.76563,0.28125 l -6.54687,0 z m 2.26562,-9.96875 3.71875,0 q 1.51563,0 2.17188,-0.1875 0.85937,-0.26563 1.29687,-0.85938 0.4375,-0.59375 0.4375,-1.5 0,-0.85937 -0.40625,-1.5 -0.40625,-0.65625 -1.17187,-0.89062 -0.76563,-0.25 -2.60938,-0.25 l -3.4375,0 0,5.1875 z m 0,7.9375 4.28125,0 q 1.09375,0 1.54688,-0.0781 0.78125,-0.14062 1.3125,-0.46875 0.53125,-0.32812 0.85937,-0.95312 0.34375,-0.625 0.34375,-1.45313 0,-0.95312 -0.5,-1.65625 -0.48437,-0.71875 -1.35937,-1 -0.875,-0.29687 -2.51563,-0.29687 l -3.96875,0 0,5.90625 z m 13.57032,-12.71875 0,-2.4375 2.10937,0 0,2.4375 -2.10937,0 z m 0,14.75 0,-12.45313 2.10937,0 0,12.45313 -2.
10937,0 z m 5.3164,0 0,-12.45313 1.90625,0 0,1.78125 q 1.375,-2.0625 3.95313,-2.0625 1.125,0 2.0625,0.40625 0.95312,0.40625 1.42187,1.0625 0.46875,0.65625 0.65625,1.5625 0.125,0.57813 0.125,2.04688 l 0,7.65625 -2.10937,0 0,-7.57813 q 0,-1.28125 -0.25,-1.92187 -0.25,-0.64063 -0.875,-1.01563 -0.625,-0.39062 -1.46875,-0.39062 -1.34375,0 -2.32813,0.85937 -0.98437,0.85938 -0.98437,3.25 l 0,6.79688 -2.10938,0 z m 21.47266,-1.53125 q -1.17188,0.98437 -2.26563,1.40625 -1.07812,0.40625 -2.3125,0.40625 -2.04687,0 -3.15625,-1 -1.09375,-1 -1.09375,-2.5625 0,-0.92188 0.40625,-1.67188 0.42188,-0.75 1.09375,-1.20312 0.67188,-0.46875 1.51563,-0.70313 0.625,-0.15625 1.875,-0.3125 2.5625,-0.3125 3.76562,-0.73437 0.0156,-0.42188 0.0156,-0.54688 0,-1.28125 -0.60938,-1.8125 -0.79687,-0.71875 -2.39062,-0.71875 -1.5,0 -2.20313,0.53125 -0.70312,0.51563 -1.04687,1.84375 l -2.0625,-0.28125 q 0.28125,-1.32812 0.92187,-2.14062 0.64063,-0.8125 1.85938,-1.25 1.21875,-0.45313 2.82812,-0.45313 1.59375,0 2.59375,0.
375 1,0.375 1.46875,0.95313 0.46875,0.5625 0.65625,1.4375 0.0937,0.53125 0.0937,1.9375 l 0,2.8125 q 0,2.9375 0.14063,3.71875 0.14062,0.78125 0.53125,1.5 l -2.20313,0 q -0.32812,-0.65625 -0.42187,-1.53125 z m -0.17188,-4.71875 q -1.15625,0.46875 -3.45312,0.79687 -1.29688,0.1875 -1.84375,0.42188 -0.53125,0.23437 -0.82813,0.6875 -0.28125,0.45312 -0.28125,1 0,0.84375 0.625,1.40625 0.64063,0.5625 1.875,0.5625 1.21875,0 2.17188,-0.53125 0.95312,-0.53125 1.39062,-1.45313 0.34375,-0.71875 0.34375,-2.10937 l 0,-0.78125 z m 5.37891,6.25 0,-12.45313 1.89063,0 0,1.89063 q 0.73437,-1.32813 1.34375,-1.75 0.625,-0.42188 1.35937,-0.42188 1.0625,0 2.17188,0.6875 l -0.73438,1.95313 q -0.76562,-0.45313 -1.54687,-0.45313 -0.6875,0 -1.25,0.42188 -0.54688,0.40625 -0.78125,1.14062 -0.34375,1.125 -0.34375,2.46875 l 0,6.51563 -2.10938,0 z m 7.91403,4.79687 -0.23437,-1.98437 q 0.70312,0.1875 1.21875,0.1875 0.70312,0 1.125,-0.23438 0.42187,-0.23437 0.6875,-0.65625 0.20312,-0.3125 0.64062,-1.5625 0.0625,-0.187
5 0.1875,-0.51562 l -4.71872,-12.48438 2.2656,0 2.59375,7.21875 q 0.5,1.35938 0.90625,2.875 0.35937,-1.45312 0.85937,-2.82812 l 2.67188,-7.26563 2.10937,0 -4.73437,12.67188 q -0.76563,2.04687 -1.1875,2.8125 -0.5625,1.04687 -1.29688,1.53125 -0.71875,0.48437 -1.73437,0.48437 -0.60938,0 -1.35938,-0.25 z" id="path81" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 157.07527,513.8373 172.7874,0 0,38.42517 -172.7874,0 z" id="path83" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 157.07527,513.8373 172.7874,0 0,38.42517 -172.7874,0 z" id="path85" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 201.39432,528.96985 0,-13.59375 5.125,0 q 1.35937,0 2.07812,0.125 1,0.17187 1.67188,0.64062 0.67187,0.46875 1.07812,1.3125 0.42188,0.84375 0.42188,1.84375 0,1.73438 -1.10938,2.9375 -1.09375,1.20313 -3.98437,1.20313 l -3.48438,0 0,5.53125 -1.79687,0 z m 1.79687,-7.14063 3.51563,0 q 1.75,0 2.46875,-0.64062 0.73437,-0.65625 0.73437,-1.82813 0,-0.85937 -0.4375,-1.46875 -0.42187,-0.60937 -1.125,-0.79687 -0.45312,-0.125 -1.67187,-0.125 l -3.48438,0 0,4.85937 z m 10.3967,7.14063 0,-13.59375 1.67188,0 0,13.59375 -1.67188,0 z m 10.61357,-1.21875 q -0.9375,0.79687 -1.79687,1.125 -0.85938,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32813,-1.32813 0.32812,-0.59375 0.85937,-0.95312 0.53125,-0.35938 1.20313,-0.54688 0.5,-0.14062 1.48437,-0.25 2.03125,-0.25 2.98438,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.2
3438 q 0.23438,-1.04687 0.73438,-1.6875 0.51562,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26562,0 2.04687,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51563,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10937,0.60938 0.4375,1.17188 l -1.75,0 q -0.26563,-0.51563 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35937 -2.73438,0.625 -1.03125,0.14062 -1.45312,0.32812 -0.42188,0.1875 -0.65625,0.54688 -0.23438,0.35937 -0.23438,0.79687 0,0.67188 0.5,1.125 0.51563,0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10937,-1.15625 0.26563,-0.57813 0.26563,-1.67188 l 0,-0.60937 z m 7.73509,3.4375 0.23438,1.48437 q -0.70313,0.14063 -1.26563,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70312,-0.75 -0.20313,-0.46875 -0.20313,-1.98438 l 0,-5.65625 -1.23437,0 0,-1.3125 1.23437,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29687,0.32812 0.20313,0.125 0.
57813,0.125 0.26562,0 0.73437,-0.0781 z m 1.9333,1.5 0,-8.54688 -1.48437,0 0,-1.3125 1.48437,0 0,-1.04687 q 0,-0.98438 0.17188,-1.46875 0.23437,-0.65625 0.84375,-1.04688 0.60937,-0.40625 1.70312,-0.40625 0.70313,0 1.5625,0.15625 l -0.25,1.46875 q -0.51562,-0.0937 -0.98437,-0.0937 -0.76563,0 -1.07813,0.32813 -0.3125,0.3125 -0.3125,1.20312 l 0,0.90625 1.92188,0 0,1.3125 -1.92188,0 0,8.54688 -1.65625,0 z m 4.15206,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26562,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29687,1.32813 1.29687,3.67188 0,1.90625 -0.57812,3 -0.5625,1.07812 -1.65625,1.6875 -1.07813,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82812,2.82813 0.82813,0.9375 2.07813,0.9375 1.25,0 2.0625,-0.9375 0.82812,-0.95313 0.82812,-2.89063 0,-1.82812 -0.82812,-2.76562 -0.82813,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07813,0.9375 -0.82812,0.9375 -0.82812,2.82812 z m 9.26634,4.92188 0,-9.85938 1.5,0 0,1.5 q 0.57813,-1.04
687 1.0625,-1.375 0.48438,-0.34375 1.07813,-0.34375 0.84375,0 1.71875,0.54688 l -0.57813,1.54687 q -0.60937,-0.35937 -1.23437,-0.35937 -0.54688,0 -0.98438,0.32812 -0.42187,0.32813 -0.60937,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67188,0 z m 6.2283,0 0,-9.85938 1.50002,0 0,1.39063 q 0.45312,-0.71875 1.21875,-1.15625 0.78125,-0.45313 1.76562,-0.45313 1.09375,0 1.79688,0.45313 0.70312,0.45312 0.98437,1.28125 1.17188,-1.73438 3.04688,-1.73438 1.46875,0 2.25,0.8125 0.79687,0.8125 0.79687,2.5 l 0,6.76563 -1.67187,0 0,-6.20313 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45312 -0.59375,-0.71875 -0.42188,-0.26562 -1,-0.26562 -1.03125,0 -1.71875,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67188,0 0,-6.40625 q 0,-1.10938 -0.40625,-1.65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70312,0 -1.3125,0.375 -0.59375,0.35937 -0.85937,1.07812 -0.26563,0.71875 -0.26563,2.0625 l 0,5.10938 -1.67189,0 z m 19.44286,0 5.23437,-13.59375 1.9375,0 5.5625,13.59375 -2.04687,0 -1.59375,-4.125 -5.6875
,0 -1.48438,4.125 -1.92187,0 z m 3.92187,-5.57813 4.60938,0 -1.40625,-3.78125 q -0.65625,-1.70312 -0.96875,-2.8125 -0.26563,1.3125 -0.73438,2.59375 l -1.5,4 z" id="path87" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 176.9457,550.96985 0,-13.59375 2.71875,0 3.21875,9.625 q 0.4375,1.34375 0.64062,2.01562 0.23438,-0.75 0.73438,-2.1875 l 3.25,-9.45312 2.42187,0 0,13.59375 -1.73437,0 0,-11.39063 -3.95313,11.39063 -1.625,0 -3.9375,-11.57813 0,11.57813 -1.73437,0 z m 21.82205,-1.21875 q -0.9375,0.79687 -1.79687,1.125 -0.85938,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32813,-1.32813 0.32812,-0.59375 0.85937,-0.95312 0.53125,-0.35938 1.20313,-0.54688 0.5,-0.14062 1.48437,-0.25 2.03125,-0.25 2.98438,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.23438 q 0.23438,-1.04687 0.73438,-1.6875 0.51562,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26562,0 2.04687,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51563,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10937,0.60938 0
.4375,1.17188 l -1.75,0 q -0.26563,-0.51563 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35937 -2.73438,0.625 -1.03125,0.14062 -1.45312,0.32812 -0.42188,0.1875 -0.65625,0.54688 -0.23438,0.35937 -0.23438,0.79687 0,0.67188 0.5,1.125 0.51563,0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10937,-1.15625 0.26563,-0.57813 0.26563,-1.67188 l 0,-0.60937 z m 4.07884,4.9375 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14062,-1.625 0.89063,0 1.64063,0.32813 0.75,0.3125 1.10937,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67187,0 0,-6 q 0,-1.01563 -0.20313,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17187,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76563,0.67188 -0.76563,2.57813 l 0,5.375 -1.67187,0 z m 16.81322,-1.21875 q -0.9375,0.79687 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32812,-1.32813 0.32813,-0.59375 0.85938,-0.95312 0.53125,-0.35938 1.
20312,-0.54688 0.5,-0.14062 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.23438 q 0.23437,-1.04687 0.73437,-1.6875 0.51563,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26563,0 2.04688,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51562,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10938,0.60938 0.4375,1.17188 l -1.75,0 q -0.26562,-0.51563 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35937 -2.73437,0.625 -1.03125,0.14062 -1.45313,0.32812 -0.42187,0.1875 -0.65625,0.54688 -0.23437,0.35937 -0.23437,0.79687 0,0.67188 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57813 0.26562,-1.67188 l 0,-0.60937 z m 3.78197,5.75 1.60937,0.25 q 0.10938,0.75 0.57813,1.09375 0.60937,0.45312 1.6875,0.45312 1.17187,0 1.79687,-0.468
75 0.625,-0.45312 0.85938,-1.28125 0.125,-0.51562 0.10937,-2.15625 -1.09375,1.29688 -2.71875,1.29688 -2.03125,0 -3.15625,-1.46875 -1.10937,-1.46875 -1.10937,-3.51563 0,-1.40625 0.51562,-2.59375 0.51563,-1.20312 1.48438,-1.84375 0.96875,-0.65625 2.26562,-0.65625 1.75,0 2.875,1.40625 l 0,-1.1875 1.54688,0 0,8.51563 q 0,2.3125 -0.46875,3.26562 -0.46875,0.96875 -1.48438,1.51563 -1.01562,0.5625 -2.5,0.5625 -1.76562,0 -2.85937,-0.79688 -1.07813,-0.79687 -1.03125,-2.39062 z m 1.375,-5.92188 q 0,1.95313 0.76562,2.84375 0.78125,0.89063 1.9375,0.89063 1.14063,0 1.92188,-0.89063 0.78125,-0.89062 0.78125,-2.78125 0,-1.8125 -0.8125,-2.71875 -0.79688,-0.92187 -1.92188,-0.92187 -1.10937,0 -1.89062,0.90625 -0.78125,0.89062 -0.78125,2.67187 z m 16.04759,1.9375 1.71875,0.21875 q -0.40625,1.5 -1.51562,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42188,-1.32813 -1.26562,-1.32812 -1.26562,-3.73437 0,-2.48438 1.26562,-3.85938 1.28125,-1.375 3.32813,-1.375 1.98437,0 3.23437,1.34375 1.25,1.34375
1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92187,2.48437 0.82813,0.85938 2.0625,0.85938 0.90625,0 1.54688,-0.46875 0.65625,-0.48438 1.04687,-1.54688 z m -5.48437,-2.70312 5.5,0 q -0.10938,-1.23438 -0.625,-1.85938 -0.79688,-0.96875 -2.07813,-0.96875 -1.14062,0 -1.9375,0.78125 -0.78125,0.76563 -0.85937,2.04688 z m 15.50071,5.875 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17187,0 -2.17187,-0.64063 -0.98438,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48437,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98438,-0.64063 2.20313,-0.64063 0.89062,0 1.57812,0.375 0.70313,0.375 1.14063,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54688,0 z m -5.28125,-4.92188 q 0,1.89063 0.79688,2.82813 0.8125,0.9375 1.89062,0.9375 1.09375,0 1.85938,-0.89063 0.76562,-0.89062 0.76562,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92187,-0.95312 -1.10938,0 -1.85938,0.90625 -0.75,0.90625 -0.75,2.85937 z m 14.59027,4.92188 0,-13.59375 5.10938,0 q 1.54687,0
2.48437,0.40625 0.95313,0.40625 1.48438,1.26562 0.53125,0.85938 0.53125,1.79688 0,0.875 -0.46875,1.65625 -0.46875,0.76562 -1.4375,1.23437 1.23437,0.35938 1.89062,1.23438 0.67188,0.875 0.67188,2.0625 0,0.95312 -0.40625,1.78125 -0.39063,0.8125 -0.98438,1.26562 -0.59375,0.4375 -1.5,0.67188 -0.89062,0.21875 -2.1875,0.21875 l -5.1875,0 z m 1.79688,-7.89063 2.9375,0 q 1.20312,0 1.71875,-0.15625 0.6875,-0.20312 1.03125,-0.67187 0.35937,-0.46875 0.35937,-1.1875 0,-0.67188 -0.32812,-1.1875 -0.32813,-0.51563 -0.9375,-0.70313 -0.59375,-0.20312 -2.0625,-0.20312 l -2.71875,0 0,4.10937 z m 0,6.28125 3.39062,0 q 0.875,0 1.21875,-0.0625 0.625,-0.10937 1.04688,-0.35937 0.42187,-0.26563 0.6875,-0.76563 0.26562,-0.5 0.26562,-1.14062 0,-0.76563 -0.39062,-1.32813 -0.39063,-0.5625 -1.07813,-0.78125 -0.6875,-0.23437 -1.98437,-0.23437 l -3.15625,0 0,4.67187 z m 10.5217,-10.07812 0,-1.90625 1.67187,0 0,1.90625 -1.67187,0 z m 0,11.6875 0,-9.85938 1.67187,0 0,9.85938 -1.67187,0 z m 4.12921,0 0,-9.85938 1.5,0
0,1.40625 q 1.09375,-1.625 3.14062,-1.625 0.89063,0 1.64063,0.32813 0.75,0.3125 1.10937,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67187,0 0,-6 q 0,-1.01563 -0.20313,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17187,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76563,0.67188 -0.76563,2.57813 l 0,5.375 -1.67187,0 z m 16.8132,-1.21875 q -0.9375,0.79687 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32812,-1.32813 0.32813,-0.59375 0.85938,-0.95312 0.53125,-0.35938 1.20312,-0.54688 0.5,-0.14062 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.23438 q 0.23437,-1.04687 0.73437,-1.6875 0.51563,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26563,0 2.04688,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.5
1562,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10938,0.60938 0.4375,1.17188 l -1.75,0 q -0.26562,-0.51563 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35937 -2.73437,0.625 -1.03125,0.14062 -1.45313,0.32812 -0.42187,0.1875 -0.65625,0.54688 -0.23437,0.35937 -0.23437,0.79687 0,0.67188 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57813 0.26562,-1.67188 l 0,-0.60937 z m 4.06321,4.9375 0,-9.85938 1.5,0 0,1.5 q 0.57812,-1.04687 1.0625,-1.375 0.48437,-0.34375 1.07812,-0.34375 0.84375,0 1.71875,0.54688 l -0.57812,1.54687 q -0.60938,-0.35937 -1.23438,-0.35937 -0.54687,0 -0.98437,0.32812 -0.42188,0.32813 -0.60938,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67187,0 z m 6.15017,3.79687 -0.17187,-1.5625 q 0.54687,0.14063 0.95312,0.14063 0.54688,0 0.875,-0.1875 0.34375,-0.1875 0.5625,-0.51563 0.15625,-0.25 0.5,-1.25 0.0469,-0.14062 0.15625,-0.40625 l -3.73437,-9.875 1.79687,0 2.
04688,5.71875 q 0.40625,1.07813 0.71875,2.28125 0.28125,-1.15625 0.6875,-2.25 l 2.09375,-5.75 1.67187,0 -3.75,10.03125 q -0.59375,1.625 -0.9375,2.23438 -0.4375,0.82812 -1.01562,1.20312 -0.57813,0.39063 -1.375,0.39063 -0.48438,0 -1.07813,-0.20313 z" id="path89" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 469.90808,312.46225 7.88977,0 0,-14.86615 15.77951,0 0,14.86615 7.88977,0 -15.77951,14.86615 z" id="path91" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 469.90808,312.46225 7.88977,0 0,-14.86615 15.77951,0 0,14.86615 7.88977,0 -15.77951,14.86615 z" id="path93" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 60.93176,418.56955 819.5275,2.23624" id="path95" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 60.93176,418.56955 819.5275,2.23624" id="path97" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:4, 12"/>
+ <path d="m 405.07526,513.8373 172.78741,0 0,38.42517 -172.78741,0 z" id="path99" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 405.07526,513.8373 172.78741,0 0,38.42517 -172.78741,0 z" id="path101" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 449.39432,528.96985 0,-13.59375 5.125,0 q 1.35937,0 2.07812,0.125 1,0.17187 1.67188,0.64062 0.67187,0.46875 1.07812,1.3125 0.42188,0.84375 0.42188,1.84375 0,1.73438 -1.10938,2.9375 -1.09375,1.20313 -3.98437,1.20313 l -3.48438,0 0,5.53125 -1.79687,0 z m 1.79687,-7.14063 3.51563,0 q 1.75,0 2.46875,-0.64062 0.73437,-0.65625 0.73437,-1.82813 0,-0.85937 -0.4375,-1.46875 -0.42187,-0.60937 -1.125,-0.79687 -0.45312,-0.125 -1.67187,-0.125 l -3.48438,0 0,4.85937 z m 10.3967,7.14063 0,-13.59375 1.67188,0 0,13.59375 -1.67188,0 z m 10.61359,-1.21875 q -0.9375,0.79687 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32812,-1.32813 0.32813,-0.59375 0.85938,-0.95312 0.53125,-0.35938 1.20312,-0.54688 0.5,-0.14062 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.2
3438 q 0.23437,-1.04687 0.73437,-1.6875 0.51563,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26563,0 2.04688,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51562,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10938,0.60938 0.4375,1.17188 l -1.75,0 q -0.26562,-0.51563 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35937 -2.73437,0.625 -1.03125,0.14062 -1.45313,0.32812 -0.42187,0.1875 -0.65625,0.54688 -0.23437,0.35937 -0.23437,0.79687 0,0.67188 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57813 0.26562,-1.67188 l 0,-0.60937 z m 7.73508,3.4375 0.23438,1.48437 q -0.70313,0.14063 -1.26563,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70312,-0.75 -0.20313,-0.46875 -0.20313,-1.98438 l 0,-5.65625 -1.23437,0 0,-1.3125 1.23437,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29687,0.32812 0.20313,0.125 0.
57813,0.125 0.26562,0 0.73437,-0.0781 z m 1.93332,1.5 0,-8.54688 -1.48437,0 0,-1.3125 1.48437,0 0,-1.04687 q 0,-0.98438 0.17188,-1.46875 0.23437,-0.65625 0.84375,-1.04688 0.60937,-0.40625 1.70312,-0.40625 0.70313,0 1.5625,0.15625 l -0.25,1.46875 q -0.51562,-0.0937 -0.98437,-0.0937 -0.76563,0 -1.07813,0.32813 -0.3125,0.3125 -0.3125,1.20312 l 0,0.90625 1.92188,0 0,1.3125 -1.92188,0 0,8.54688 -1.65625,0 z m 4.15204,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26562,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29687,1.32813 1.29687,3.67188 0,1.90625 -0.57812,3 -0.5625,1.07812 -1.65625,1.6875 -1.07813,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82812,2.82813 0.82813,0.9375 2.07813,0.9375 1.25,0 2.0625,-0.9375 0.82812,-0.95313 0.82812,-2.89063 0,-1.82812 -0.82812,-2.76562 -0.82813,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07813,0.9375 -0.82812,0.9375 -0.82812,2.82812 z m 9.26636,4.92188 0,-9.85938 1.5,0 0,1.5 q 0.57812,-1.0
4687 1.0625,-1.375 0.48437,-0.34375 1.07812,-0.34375 0.84375,0 1.71875,0.54688 l -0.57812,1.54687 q -0.60938,-0.35937 -1.23438,-0.35937 -0.54687,0 -0.98437,0.32812 -0.42188,0.32813 -0.60938,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67187,0 z m 6.2283,0 0,-9.85938 1.5,0 0,1.39063 q 0.45312,-0.71875 1.21875,-1.15625 0.78125,-0.45313 1.76562,-0.45313 1.09375,0 1.79688,0.45313 0.70312,0.45312 0.98437,1.28125 1.17188,-1.73438 3.04685,-1.73438 1.46875,0 2.25,0.8125 0.79687,0.8125 0.79687,2.5 l 0,6.76563 -1.67187,0 0,-6.20313 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45312 -0.59375,-0.71875 -0.42188,-0.26562 -1,-0.26562 -1.03125,0 -1.71872,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67188,0 0,-6.40625 q 0,-1.10938 -0.40625,-1.65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70312,0 -1.3125,0.375 -0.59375,0.35937 -0.85937,1.07812 -0.26563,0.71875 -0.26563,2.0625 l 0,5.10938 -1.67187,0 z m 20.86471,0 0,-13.59375 5.10938,0 q 1.54687,0 2.48437,0.40625 0.95313,0.40625 1.48438,1.2656
2 0.53125,0.85938 0.53125,1.79688 0,0.875 -0.46875,1.65625 -0.46875,0.76562 -1.4375,1.23437 1.23437,0.35938 1.89062,1.23438 0.67188,0.875 0.67188,2.0625 0,0.95312 -0.40625,1.78125 -0.39063,0.8125 -0.98438,1.26562 -0.59375,0.4375 -1.5,0.67188 -0.89062,0.21875 -2.1875,0.21875 l -5.1875,0 z m 1.79688,-7.89063 2.9375,0 q 1.20312,0 1.71875,-0.15625 0.6875,-0.20312 1.03125,-0.67187 0.35937,-0.46875 0.35937,-1.1875 0,-0.67188 -0.32812,-1.1875 -0.32813,-0.51563 -0.9375,-0.70313 -0.59375,-0.20312 -2.0625,-0.20312 l -2.71875,0 0,4.10937 z m 0,6.28125 3.39062,0 q 0.875,0 1.21875,-0.0625 0.625,-0.10937 1.04688,-0.35937 0.42187,-0.26563 0.6875,-0.76563 0.26562,-0.5 0.26562,-1.14062 0,-0.76563 -0.39062,-1.32813 -0.39063,-0.5625 -1.07813,-0.78125 -0.6875,-0.23437 -1.98437,-0.23437 l -3.15625,0 0,4.67187 z" id="path103" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 424.9457,550.96985 0,-13.59375 2.71875,0 3.21875,9.625 q 0.4375,1.34375 0.64062,2.01562 0.23438,-0.75 0.73438,-2.1875 l 3.25,-9.45312 2.42187,0 0,13.59375 -1.73437,0 0,-11.39063 -3.95313,11.39063 -1.625,0 -3.9375,-11.57813 0,11.57813 -1.73437,0 z m 21.82205,-1.21875 q -0.9375,0.79687 -1.79687,1.125 -0.85938,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32813,-1.32813 0.32812,-0.59375 0.85937,-0.95312 0.53125,-0.35938 1.20313,-0.54688 0.5,-0.14062 1.48437,-0.25 2.03125,-0.25 2.98438,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.23438 q 0.23438,-1.04687 0.73438,-1.6875 0.51562,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26562,0 2.04687,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51563,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10937,0.60938 0
.4375,1.17188 l -1.75,0 q -0.26563,-0.51563 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35937 -2.73438,0.625 -1.03125,0.14062 -1.45312,0.32812 -0.42188,0.1875 -0.65625,0.54688 -0.23438,0.35937 -0.23438,0.79687 0,0.67188 0.5,1.125 0.51563,0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10937,-1.15625 0.26563,-0.57813 0.26563,-1.67188 l 0,-0.60937 z m 4.07882,4.9375 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32813 0.75,0.3125 1.10938,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01563 -0.20312,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17188,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76562,0.67188 -0.76562,2.57813 l 0,5.375 -1.67188,0 z m 16.81324,-1.21875 q -0.9375,0.79687 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32812,-1.32813 0.32813,-0.59375 0.85938,-0.95312 0.53125,-0.35938 1.
20312,-0.54688 0.5,-0.14062 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.23438 q 0.23437,-1.04687 0.73437,-1.6875 0.51563,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26563,0 2.04688,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51562,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10938,0.60938 0.4375,1.17188 l -1.75,0 q -0.26562,-0.51563 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35937 -2.73437,0.625 -1.03125,0.14062 -1.45313,0.32812 -0.42187,0.1875 -0.65625,0.54688 -0.23437,0.35937 -0.23437,0.79687 0,0.67188 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57813 0.26562,-1.67188 l 0,-0.60937 z m 3.78195,5.75 1.60938,0.25 q 0.10937,0.75 0.57812,1.09375 0.60938,0.45312 1.6875,0.45312 1.17188,0 1.79688,-0.468
75 0.625,-0.45312 0.85937,-1.28125 0.125,-0.51562 0.10938,-2.15625 -1.09375,1.29688 -2.71875,1.29688 -2.03125,0 -3.15625,-1.46875 -1.10938,-1.46875 -1.10938,-3.51563 0,-1.40625 0.51563,-2.59375 0.51562,-1.20312 1.48437,-1.84375 0.96875,-0.65625 2.26563,-0.65625 1.75,0 2.875,1.40625 l 0,-1.1875 1.54687,0 0,8.51563 q 0,2.3125 -0.46875,3.26562 -0.46875,0.96875 -1.48437,1.51563 -1.01563,0.5625 -2.5,0.5625 -1.76563,0 -2.85938,-0.79688 -1.07812,-0.79687 -1.03125,-2.39062 z m 1.375,-5.92188 q 0,1.95313 0.76563,2.84375 0.78125,0.89063 1.9375,0.89063 1.14062,0 1.92187,-0.89063 0.78125,-0.89062 0.78125,-2.78125 0,-1.8125 -0.8125,-2.71875 -0.79687,-0.92187 -1.92187,-0.92187 -1.10938,0 -1.89063,0.90625 -0.78125,0.89062 -0.78125,2.67187 z m 16.04761,1.9375 1.71875,0.21875 q -0.40625,1.5 -1.51563,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42187,-1.32813 -1.26563,-1.32812 -1.26563,-3.73437 0,-2.48438 1.26563,-3.85938 1.28125,-1.375 3.32812,-1.375 1.98438,0 3.23438,1.34375 1.25,1.34375
1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92188,2.48437 0.82812,0.85938 2.0625,0.85938 0.90625,0 1.54687,-0.46875 0.65625,-0.48438 1.04688,-1.54688 z m -5.48438,-2.70312 5.5,0 q -0.10937,-1.23438 -0.625,-1.85938 -0.79687,-0.96875 -2.07812,-0.96875 -1.14063,0 -1.9375,0.78125 -0.78125,0.76563 -0.85938,2.04688 z m 15.50071,5.875 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17188,0 -2.17188,-0.64063 -0.98437,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48438,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98437,-0.64063 2.20312,-0.64063 0.89063,0 1.57813,0.375 0.70312,0.375 1.14062,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54687,0 z m -5.28125,-4.92188 q 0,1.89063 0.79687,2.82813 0.8125,0.9375 1.89063,0.9375 1.09375,0 1.85937,-0.89063 0.76563,-0.89062 0.76563,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92188,-0.95312 -1.10937,0 -1.85937,0.90625 -0.75,0.90625 -0.75,2.85937 z m 14.59027,4.92188 0,-13.59375 5.1094,0 q 1.54688,0
2.48438,0.40625 0.95312,0.40625 1.48437,1.26562 0.53125,0.85938 0.53125,1.79688 0,0.875 -0.46875,1.65625 -0.46875,0.76562 -1.4375,1.23437 1.23438,0.35938 1.89063,1.23438 0.67187,0.875 0.67187,2.0625 0,0.95312 -0.40625,1.78125 -0.39062,0.8125 -0.98437,1.26562 -0.59375,0.4375 -1.5,0.67188 -0.89063,0.21875 -2.1875,0.21875 l -5.18753,0 z m 1.79687,-7.89063 2.93753,0 q 1.20313,0 1.71875,-0.15625 0.6875,-0.20312 1.03125,-0.67187 0.35938,-0.46875 0.35938,-1.1875 0,-0.67188 -0.32813,-1.1875 -0.32812,-0.51563 -0.9375,-0.70313 -0.59375,-0.20312 -2.0625,-0.20312 l -2.71878,0 0,4.10937 z m 0,6.28125 3.39066,0 q 0.875,0 1.21875,-0.0625 0.625,-0.10937 1.04687,-0.35937 0.42188,-0.26563 0.6875,-0.76563 0.26563,-0.5 0.26563,-1.14062 0,-0.76563 -0.39063,-1.32813 -0.39062,-0.5625 -1.07812,-0.78125 -0.6875,-0.23437 -1.98438,-0.23437 l -3.15628,0 0,4.67187 z m 10.5217,-10.07812 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 4.12921,0 0,-9.85938 1.5,
0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32813 0.75,0.3125 1.10938,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01563 -0.20312,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17188,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76562,0.67188 -0.76562,2.57813 l 0,5.375 -1.67188,0 z m 16.81323,-1.21875 q -0.9375,0.79687 -1.79687,1.125 -0.85938,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32813,-1.32813 0.32812,-0.59375 0.85937,-0.95312 0.53125,-0.35938 1.20313,-0.54688 0.5,-0.14062 1.48437,-0.25 2.03125,-0.25 2.98438,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.23438 q 0.23438,-1.04687 0.73438,-1.6875 0.51562,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26562,0 2.04687,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0
.51563,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10937,0.60938 0.4375,1.17188 l -1.75,0 q -0.26563,-0.51563 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35937 -2.73438,0.625 -1.03125,0.14062 -1.45312,0.32812 -0.42188,0.1875 -0.65625,0.54688 -0.23438,0.35937 -0.23438,0.79687 0,0.67188 0.5,1.125 0.51563,0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10937,-1.15625 0.26563,-0.57813 0.26563,-1.67188 l 0,-0.60937 z m 4.06317,4.9375 0,-9.85938 1.5,0 0,1.5 q 0.57813,-1.04687 1.0625,-1.375 0.48438,-0.34375 1.07813,-0.34375 0.84375,0 1.71875,0.54688 l -0.57813,1.54687 q -0.60937,-0.35937 -1.23437,-0.35937 -0.54688,0 -0.98438,0.32812 -0.42187,0.32813 -0.60937,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67188,0 z m 6.15021,3.79687 -0.17188,-1.5625 q 0.54688,0.14063 0.95313,0.14063 0.54687,0 0.875,-0.1875 0.34375,-0.1875 0.5625,-0.51563 0.15625,-0.25 0.5,-1.25 0.0469,-0.14062 0.15625,-0.40625 l -3.73438,-9.875 1.79688,0
2.04687,5.71875 q 0.40625,1.07813 0.71875,2.28125 0.28125,-1.15625 0.6875,-2.25 l 2.09375,-5.75 1.67188,0 -3.75,10.03125 q -0.59375,1.625 -0.9375,2.23438 -0.4375,0.82812 -1.01563,1.20312 -0.57812,0.39063 -1.375,0.39063 -0.48437,0 -1.07812,-0.20313 z" id="path105" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 645.07526,513.8373 172.78741,0 0,38.42517 -172.78741,0 z" id="path107" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 645.07526,513.8373 172.78741,0 0,38.42517 -172.78741,0 z" id="path109" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 688.87964,528.96985 0,-13.59375 5.125,0 q 1.35937,0 2.07812,0.125 1,0.17187 1.67188,0.64062 0.67187,0.46875 1.07812,1.3125 0.42188,0.84375 0.42188,1.84375 0,1.73438 -1.10938,2.9375 -1.09375,1.20313 -3.98437,1.20313 l -3.48438,0 0,5.53125 -1.79687,0 z m 1.79687,-7.14063 3.51563,0 q 1.75,0 2.46875,-0.64062 0.73437,-0.65625 0.73437,-1.82813 0,-0.85937 -0.4375,-1.46875 -0.42187,-0.60937 -1.125,-0.79687 -0.45312,-0.125 -1.67187,-0.125 l -3.48438,0 0,4.85937 z m 10.39667,7.14063 0,-13.59375 1.67188,0 0,13.59375 -1.67188,0 z m 10.61359,-1.21875 q -0.9375,0.79687 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32812,-1.32813 0.32813,-0.59375 0.85938,-0.95312 0.53125,-0.35938 1.20312,-0.54688 0.5,-0.14062 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.
23438 q 0.23437,-1.04687 0.73437,-1.6875 0.51563,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26563,0 2.04688,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51562,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10938,0.60938 0.4375,1.17188 l -1.75,0 q -0.26562,-0.51563 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35937 -2.73437,0.625 -1.03125,0.14062 -1.45313,0.32812 -0.42187,0.1875 -0.65625,0.54688 -0.23437,0.35937 -0.23437,0.79687 0,0.67188 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57813 0.26562,-1.67188 l 0,-0.60937 z m 7.73511,3.4375 0.23438,1.48437 q -0.70313,0.14063 -1.26563,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70312,-0.75 -0.20313,-0.46875 -0.20313,-1.98438 l 0,-5.65625 -1.23437,0 0,-1.3125 1.23437,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29687,0.32812 0.20313,0.125 0
.57813,0.125 0.26562,0 0.73437,-0.0781 z m 1.93329,1.5 0,-8.54688 -1.48438,0 0,-1.3125 1.48438,0 0,-1.04687 q 0,-0.98438 0.17187,-1.46875 0.23438,-0.65625 0.84375,-1.04688 0.60938,-0.40625 1.70313,-0.40625 0.70312,0 1.5625,0.15625 l -0.25,1.46875 q -0.51563,-0.0937 -0.98438,-0.0937 -0.76562,0 -1.07812,0.32813 -0.3125,0.3125 -0.3125,1.20312 l 0,0.90625 1.92187,0 0,1.3125 -1.92187,0 0,8.54688 -1.65625,0 z m 4.15204,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26562,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29687,1.32813 1.29687,3.67188 0,1.90625 -0.57812,3 -0.5625,1.07812 -1.65625,1.6875 -1.07813,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82812,2.82813 0.82813,0.9375 2.07813,0.9375 1.25,0 2.0625,-0.9375 0.82812,-0.95313 0.82812,-2.89063 0,-1.82812 -0.82812,-2.76562 -0.82813,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07813,0.9375 -0.82812,0.9375 -0.82812,2.82812 z m 9.26636,4.92188 0,-9.85938 1.5,0 0,1.5 q 0.57812,-1.
04687 1.0625,-1.375 0.48437,-0.34375 1.07812,-0.34375 0.84375,0 1.71875,0.54688 l -0.57812,1.54687 q -0.60938,-0.35937 -1.23438,-0.35937 -0.54687,0 -0.98437,0.32812 -0.42188,0.32813 -0.60938,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67187,0 z m 6.22833,0 0,-9.85938 1.5,0 0,1.39063 q 0.45312,-0.71875 1.21875,-1.15625 0.78125,-0.45313 1.76562,-0.45313 1.09375,0 1.79688,0.45313 0.70312,0.45312 0.98437,1.28125 1.17188,-1.73438 3.04688,-1.73438 1.46875,0 2.25,0.8125 0.79687,0.8125 0.79687,2.5 l 0,6.76563 -1.67187,0 0,-6.20313 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45312 -0.59375,-0.71875 -0.42188,-0.26562 -1,-0.26562 -1.03125,0 -1.71875,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67188,0 0,-6.40625 q 0,-1.10938 -0.40625,-1.65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70312,0 -1.3125,0.375 -0.59375,0.35937 -0.85937,1.07812 -0.26563,0.71875 -0.26563,2.0625 l 0,5.10938 -1.67187,0 z m 30.64593,-4.76563 1.79688,0.45313 q -0.5625,2.21875 -2.03125,3.39062 -1.46875,1.15625 -3.
59375,1.15625 -2.20313,0 -3.57813,-0.89062 -1.375,-0.90625 -2.09375,-2.59375 -0.71875,-1.70313 -0.71875,-3.65625 0,-2.125 0.79688,-3.70313 0.8125,-1.57812 2.3125,-2.39062 1.5,-0.82813 3.29687,-0.82813 2.04688,0 3.4375,1.04688 1.39063,1.03125 1.9375,2.90625 l -1.76562,0.42187 q -0.46875,-1.48437 -1.375,-2.15625 -0.90625,-0.6875 -2.26563,-0.6875 -1.5625,0 -2.625,0.75 -1.04687,0.75 -1.48437,2.03125 -0.42188,1.26563 -0.42188,2.60938 0,1.73437 0.5,3.03125 0.51563,1.28125 1.57813,1.92187 1.07812,0.64063 2.3125,0.64063 1.51562,0 2.5625,-0.85938 1.04687,-0.875 1.42187,-2.59375 z" id="path111" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 664.9457,550.96985 0,-13.59375 2.71875,0 3.21875,9.625 q 0.4375,1.34375 0.64062,2.01562 0.23438,-0.75 0.73438,-2.1875 l 3.25,-9.45312 2.42187,0 0,13.59375 -1.73437,0 0,-11.39063 -3.95313,11.39063 -1.625,0 -3.9375,-11.57813 0,11.57813 -1.73437,0 z m 21.82208,-1.21875 q -0.9375,0.79687 -1.79687,1.125 -0.85938,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32813,-1.32813 0.32812,-0.59375 0.85937,-0.95312 0.53125,-0.35938 1.20313,-0.54688 0.5,-0.14062 1.48437,-0.25 2.03125,-0.25 2.98438,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.23438 q 0.23438,-1.04687 0.73438,-1.6875 0.51562,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26562,0 2.04687,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51563,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10937,0.60938 0
.4375,1.17188 l -1.75,0 q -0.26563,-0.51563 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35937 -2.73438,0.625 -1.03125,0.14062 -1.45312,0.32812 -0.42188,0.1875 -0.65625,0.54688 -0.23438,0.35937 -0.23438,0.79687 0,0.67188 0.5,1.125 0.51563,0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10937,-1.15625 0.26563,-0.57813 0.26563,-1.67188 l 0,-0.60937 z m 4.07886,4.9375 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14062,-1.625 0.89063,0 1.64063,0.32813 0.75,0.3125 1.10937,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67187,0 0,-6 q 0,-1.01563 -0.20313,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17187,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76563,0.67188 -0.76563,2.57813 l 0,5.375 -1.67187,0 z m 16.81317,-1.21875 q -0.9375,0.79687 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32812,-1.32813 0.32813,-0.59375 0.85938,-0.95312 0.53125,-0.35938 1.
20312,-0.54688 0.5,-0.14062 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.23438 q 0.23437,-1.04687 0.73437,-1.6875 0.51563,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26563,0 2.04688,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51562,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10938,0.60938 0.4375,1.17188 l -1.75,0 q -0.26562,-0.51563 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35937 -2.73437,0.625 -1.03125,0.14062 -1.45313,0.32812 -0.42187,0.1875 -0.65625,0.54688 -0.23437,0.35937 -0.23437,0.79687 0,0.67188 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57813 0.26562,-1.67188 l 0,-0.60937 z m 3.78198,5.75 1.60938,0.25 q 0.10937,0.75 0.57812,1.09375 0.60938,0.45312 1.6875,0.45312 1.17188,0 1.79688,-0.468
75 0.625,-0.45312 0.85937,-1.28125 0.125,-0.51562 0.10938,-2.15625 -1.09375,1.29688 -2.71875,1.29688 -2.03125,0 -3.15625,-1.46875 -1.10938,-1.46875 -1.10938,-3.51563 0,-1.40625 0.51563,-2.59375 0.51562,-1.20312 1.48437,-1.84375 0.96875,-0.65625 2.26563,-0.65625 1.75,0 2.875,1.40625 l 0,-1.1875 1.54687,0 0,8.51563 q 0,2.3125 -0.46875,3.26562 -0.46875,0.96875 -1.48437,1.51563 -1.01563,0.5625 -2.5,0.5625 -1.76563,0 -2.85938,-0.79688 -1.07812,-0.79687 -1.03125,-2.39062 z m 1.375,-5.92188 q 0,1.95313 0.76563,2.84375 0.78125,0.89063 1.9375,0.89063 1.14062,0 1.92187,-0.89063 0.78125,-0.89062 0.78125,-2.78125 0,-1.8125 -0.8125,-2.71875 -0.79687,-0.92187 -1.92187,-0.92187 -1.10938,0 -1.89063,0.90625 -0.78125,0.89062 -0.78125,2.67187 z m 16.04761,1.9375 1.71875,0.21875 q -0.40625,1.5 -1.51562,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42188,-1.32813 -1.26562,-1.32812 -1.26562,-3.73437 0,-2.48438 1.26562,-3.85938 1.28125,-1.375 3.32813,-1.375 1.98437,0 3.23437,1.34375 1.25,1.34375
1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92187,2.48437 0.82813,0.85938 2.0625,0.85938 0.90625,0 1.54688,-0.46875 0.65625,-0.48438 1.04687,-1.54688 z m -5.48437,-2.70312 5.5,0 q -0.10938,-1.23438 -0.625,-1.85938 -0.79688,-0.96875 -2.07813,-0.96875 -1.14062,0 -1.9375,0.78125 -0.78125,0.76563 -0.85937,2.04688 z m 15.50073,5.875 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17188,0 -2.17188,-0.64063 -0.98437,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48438,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98437,-0.64063 2.20312,-0.64063 0.89063,0 1.57813,0.375 0.70312,0.375 1.14062,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54687,0 z m -5.28125,-4.92188 q 0,1.89063 0.79687,2.82813 0.8125,0.9375 1.89063,0.9375 1.09375,0 1.85937,-0.89063 0.76563,-0.89062 0.76563,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92188,-0.95312 -1.10937,0 -1.85937,0.90625 -0.75,0.90625 -0.75,2.85937 z m 14.59027,4.92188 0,-13.59375 5.10937,0 q 1.54688,0
2.48438,0.40625 0.95312,0.40625 1.48437,1.26562 0.53125,0.85938 0.53125,1.79688 0,0.875 -0.46875,1.65625 -0.46875,0.76562 -1.4375,1.23437 1.23438,0.35938 1.89063,1.23438 0.67187,0.875 0.67187,2.0625 0,0.95312 -0.40625,1.78125 -0.39062,0.8125 -0.98437,1.26562 -0.59375,0.4375 -1.5,0.67188 -0.89063,0.21875 -2.1875,0.21875 l -5.1875,0 z m 1.79687,-7.89063 2.9375,0 q 1.20313,0 1.71875,-0.15625 0.6875,-0.20312 1.03125,-0.67187 0.35938,-0.46875 0.35938,-1.1875 0,-0.67188 -0.32813,-1.1875 -0.32812,-0.51563 -0.9375,-0.70313 -0.59375,-0.20312 -2.0625,-0.20312 l -2.71875,0 0,4.10937 z m 0,6.28125 3.39063,0 q 0.875,0 1.21875,-0.0625 0.625,-0.10937 1.04687,-0.35937 0.42188,-0.26563 0.6875,-0.76563 0.26563,-0.5 0.26563,-1.14062 0,-0.76563 -0.39063,-1.32813 -0.39062,-0.5625 -1.07812,-0.78125 -0.6875,-0.23437 -1.98438,-0.23437 l -3.15625,0 0,4.67187 z m 10.52167,-10.07812 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 4.12921,0 0,-9.85938 1.5,
0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32813 0.75,0.3125 1.10938,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01563 -0.20312,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17188,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76562,0.67188 -0.76562,2.57813 l 0,5.375 -1.67188,0 z m 16.81323,-1.21875 q -0.9375,0.79687 -1.79687,1.125 -0.85938,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32813,-1.32813 0.32812,-0.59375 0.85937,-0.95312 0.53125,-0.35938 1.20313,-0.54688 0.5,-0.14062 1.48437,-0.25 2.03125,-0.25 2.98438,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.23438 q 0.23438,-1.04687 0.73438,-1.6875 0.51562,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26562,0 2.04687,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0
.51563,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10937,0.60938 0.4375,1.17188 l -1.75,0 q -0.26563,-0.51563 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35937 -2.73438,0.625 -1.03125,0.14062 -1.45312,0.32812 -0.42188,0.1875 -0.65625,0.54688 -0.23438,0.35937 -0.23438,0.79687 0,0.67188 0.5,1.125 0.51563,0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10937,-1.15625 0.26563,-0.57813 0.26563,-1.67188 l 0,-0.60937 z m 4.06317,4.9375 0,-9.85938 1.5,0 0,1.5 q 0.57813,-1.04687 1.0625,-1.375 0.48438,-0.34375 1.07813,-0.34375 0.84375,0 1.71875,0.54688 l -0.57813,1.54687 q -0.60937,-0.35937 -1.23437,-0.35937 -0.54688,0 -0.98438,0.32812 -0.42187,0.32813 -0.60937,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67188,0 z m 6.15021,3.79687 -0.17188,-1.5625 q 0.54688,0.14063 0.95313,0.14063 0.54687,0 0.875,-0.1875 0.34375,-0.1875 0.5625,-0.51563 0.15625,-0.25 0.5,-1.25 0.0469,-0.14062 0.15625,-0.40625 l -3.73438,-9.875 1.79688,0
2.04687,5.71875 q 0.40625,1.07813 0.71875,2.28125 0.28125,-1.15625 0.6875,-2.25 l 2.09375,-5.75 1.67188,0 -3.75,10.03125 q -0.59375,1.625 -0.9375,2.23438 -0.4375,0.82812 -1.01563,1.20312 -0.57812,0.39063 -1.375,0.39063 -0.48437,0 -1.07812,-0.20313 z" id="path113" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 479.12775,497.78683 7.88977,0 0,-14.86615 15.77954,0 0,14.86615 7.88977,0 -15.77954,14.86612 z" id="path115" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 479.12775,497.78683 7.88977,0 0,-14.86615 15.77954,0 0,14.86615 7.88977,0 -15.77954,14.86612 z" id="path117" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 719.12775,497.8393 7.88977,0 0,-14.86615 15.77954,0 0,14.86615 7.88977,0 -15.77954,14.86615 z" id="path119" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 719.12775,497.8393 7.88977,0 0,-14.86615 15.77954,0 0,14.86615 7.88977,0 -15.77954,14.86615 z" id="path121" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 231.12776,497.8393 7.88976,0 0,-14.86615 15.77952,0 0,14.86615 7.88979,0 -15.77954,14.86615 z" id="path123" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 231.12776,497.8393 7.88976,0 0,-14.86615 15.77952,0 0,14.86615 7.88979,0 -15.77954,14.86615 z" id="path125" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 157.07527,441.83728 172.7874,0 0,38.4252 -172.7874,0 z" id="path127" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 157.07527,441.83728 172.7874,0 0,38.4252 -172.7874,0 z" id="path129" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 201.39432,456.96988 0,-13.59375 5.125,0 q 1.35937,0 2.07812,0.125 1,0.17187 1.67188,0.64062 0.67187,0.46875 1.07812,1.3125 0.42188,0.84375 0.42188,1.84375 0,1.73438 -1.10938,2.9375 -1.09375,1.20313 -3.98437,1.20313 l -3.48438,0 0,5.53125 -1.79687,0 z m 1.79687,-7.14063 3.51563,0 q 1.75,0 2.46875,-0.64062 0.73437,-0.65625 0.73437,-1.82813 0,-0.85937 -0.4375,-1.46875 -0.42187,-0.60937 -1.125,-0.79687 -0.45312,-0.125 -1.67187,-0.125 l -3.48438,0 0,4.85937 z m 10.3967,7.14063 0,-13.59375 1.67188,0 0,13.59375 -1.67188,0 z m 10.61357,-1.21875 q -0.9375,0.79687 -1.79687,1.125 -0.85938,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32813,-1.32813 0.32812,-0.59375 0.85937,-0.95312 0.53125,-0.35938 1.20313,-0.54688 0.5,-0.14062 1.48437,-0.25 2.03125,-0.25 2.98438,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.2
3438 q 0.23438,-1.04687 0.73438,-1.6875 0.51562,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26562,0 2.04687,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51563,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10937,0.60938 0.4375,1.17188 l -1.75,0 q -0.26563,-0.51563 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35937 -2.73438,0.625 -1.03125,0.14062 -1.45312,0.32812 -0.42188,0.1875 -0.65625,0.54688 -0.23438,0.35937 -0.23438,0.79687 0,0.67188 0.5,1.125 0.51563,0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10937,-1.15625 0.26563,-0.57813 0.26563,-1.67188 l 0,-0.60937 z m 7.73509,3.4375 0.23438,1.48437 q -0.70313,0.14063 -1.26563,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70312,-0.75 -0.20313,-0.46875 -0.20313,-1.98438 l 0,-5.65625 -1.23437,0 0,-1.3125 1.23437,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29687,0.32812 0.20313,0.125 0.
57813,0.125 0.26562,0 0.73437,-0.0781 z m 1.9333,1.5 0,-8.54688 -1.48437,0 0,-1.3125 1.48437,0 0,-1.04687 q 0,-0.98438 0.17188,-1.46875 0.23437,-0.65625 0.84375,-1.04688 0.60937,-0.40625 1.70312,-0.40625 0.70313,0 1.5625,0.15625 l -0.25,1.46875 q -0.51562,-0.0937 -0.98437,-0.0937 -0.76563,0 -1.07813,0.32813 -0.3125,0.3125 -0.3125,1.20312 l 0,0.90625 1.92188,0 0,1.3125 -1.92188,0 0,8.54688 -1.65625,0 z m 4.15206,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26562,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29687,1.32813 1.29687,3.67188 0,1.90625 -0.57812,3 -0.5625,1.07812 -1.65625,1.6875 -1.07813,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82812,2.82813 0.82813,0.9375 2.07813,0.9375 1.25,0 2.0625,-0.9375 0.82812,-0.95313 0.82812,-2.89063 0,-1.82812 -0.82812,-2.76562 -0.82813,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07813,0.9375 -0.82812,0.9375 -0.82812,2.82812 z m 9.26634,4.92188 0,-9.85938 1.5,0 0,1.5 q 0.57813,-1.04
687 1.0625,-1.375 0.48438,-0.34375 1.07813,-0.34375 0.84375,0 1.71875,0.54688 l -0.57813,1.54687 q -0.60937,-0.35937 -1.23437,-0.35937 -0.54688,0 -0.98438,0.32812 -0.42187,0.32813 -0.60937,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67188,0 z m 6.2283,0 0,-9.85938 1.50002,0 0,1.39063 q 0.45312,-0.71875 1.21875,-1.15625 0.78125,-0.45313 1.76562,-0.45313 1.09375,0 1.79688,0.45313 0.70312,0.45312 0.98437,1.28125 1.17188,-1.73438 3.04688,-1.73438 1.46875,0 2.25,0.8125 0.79687,0.8125 0.79687,2.5 l 0,6.76563 -1.67187,0 0,-6.20313 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45312 -0.59375,-0.71875 -0.42188,-0.26562 -1,-0.26562 -1.03125,0 -1.71875,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67188,0 0,-6.40625 q 0,-1.10938 -0.40625,-1.65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70312,0 -1.3125,0.375 -0.59375,0.35937 -0.85937,1.07812 -0.26563,0.71875 -0.26563,2.0625 l 0,5.10938 -1.67189,0 z m 19.44286,0 5.23437,-13.59375 1.9375,0 5.5625,13.59375 -2.04687,0 -1.59375,-4.125 -5.6875
,0 -1.48438,4.125 -1.92187,0 z m 3.92187,-5.57813 4.60938,0 -1.40625,-3.78125 q -0.65625,-1.70312 -0.96875,-2.8125 -0.26563,1.3125 -0.73438,2.59375 l -1.5,4 z" id="path131" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 209.1057,478.96988 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17187,0 -2.17187,-0.64063 -0.98438,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48437,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98438,-0.64063 2.20313,-0.64063 0.89062,0 1.57812,0.375 0.70313,0.375 1.14063,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54688,0 z m -5.28125,-4.92188 q 0,1.89063 0.79688,2.82813 0.8125,0.9375 1.89062,0.9375 1.09375,0 1.85938,-0.89063 0.76562,-0.89062 0.76562,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92187,-0.95312 -1.10938,0 -1.85938,0.90625 -0.75,0.90625 -0.75,2.85937 z m 16.01634,1.75 1.71875,0.21875 q -0.40625,1.5 -1.51562,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42188,-1.32813 -1.26562,-1.32812 -1.26562,-3.73437 0,-2.48438 1.26562,-3.85938 1.28125,-1.375 3.32813,-1.375 1.98437,0 3.23437,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92187,2.48437 0.82813,0.85938 2.0625,0.85938
0.90625,0 1.54688,-0.46875 0.65625,-0.48438 1.04687,-1.54688 z m -5.48437,-2.70312 5.5,0 q -0.10938,-1.23438 -0.625,-1.85938 -0.79688,-0.96875 -2.07813,-0.96875 -1.14062,0 -1.9375,0.78125 -0.78125,0.76563 -0.85937,2.04688 z m 9.51634,5.875 0,-8.54688 -1.48438,0 0,-1.3125 1.48438,0 0,-1.04687 q 0,-0.98438 0.17187,-1.46875 0.23438,-0.65625 0.84375,-1.04688 0.60938,-0.40625 1.70313,-0.40625 0.70312,0 1.5625,0.15625 l -0.25,1.46875 q -0.51563,-0.0937 -0.98438,-0.0937 -0.76562,0 -1.07812,0.32813 -0.3125,0.3125 -0.3125,1.20312 l 0,0.90625 1.92187,0 0,1.3125 -1.92187,0 0,8.54688 -1.65625,0 z m 4.79268,-11.6875 0,-1.90625 1.67187,0 0,1.90625 -1.67187,0 z m 0,11.6875 0,-9.85938 1.67187,0 0,9.85938 -1.67187,0 z m 4.12919,0 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32813 0.75,0.3125 1.10938,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01563 -0.20312,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.2968
7 -1.17188,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76562,0.67188 -0.76562,2.57813 l 0,5.375 -1.67188,0 z m 10.39135,-11.6875 0,-1.90625 1.67187,0 0,1.90625 -1.67187,0 z m 0,11.6875 0,-9.85938 1.67187,0 0,9.85938 -1.67187,0 z m 7.78544,-1.5 0.23438,1.48437 q -0.70313,0.14063 -1.26563,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70312,-0.75 -0.20313,-0.46875 -0.20313,-1.98438 l 0,-5.65625 -1.23437,0 0,-1.3125 1.23437,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29687,0.32812 0.20313,0.125 0.57813,0.125 0.26562,0 0.73437,-0.0781 z m 1.54268,-10.1875 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 3.50421,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26563,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29688,1.32813 1.29688,3.67188 0,1.90625 -0.57813,3 -0.5625,1.07812 -1.65625,1.6875 -1.07812,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812
-1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82813,2.82813 0.82812,0.9375 2.07812,0.9375 1.25,0 2.0625,-0.9375 0.82813,-0.95313 0.82813,-2.89063 0,-1.82812 -0.82813,-2.76562 -0.82812,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07812,0.9375 -0.82813,0.9375 -0.82813,2.82812 z m 9.28195,4.92188 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32813 0.75,0.3125 1.10938,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01563 -0.20312,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17188,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76562,0.67188 -0.76562,2.57813 l 0,5.375 -1.67188,0 z m 9.70386,-2.9375 1.65625,-0.26563 q 0.14063,1 0.76563,1.53125 0.64062,0.51563 1.78125,0.51563 1.15625,0 1.70312,-0.46875 0.5625,-0.46875 0.5625,-1.09375 0,-0.5625 -0.48437,-0.89063 -0.34375,-0.21875 -1.70313,-0.5625 -1.84375,-0.46875 -2.5625,-0.79687 -0.70312,-0.34375 -1.07812,-0.9375 -0.35938,-0.60938 -0.35938,-1.32813 0,-0.65625 0
.29688,-1.21875 0.3125,-0.5625 0.82812,-0.9375 0.39063,-0.28125 1.0625,-0.48437 0.67188,-0.20313 1.4375,-0.20313 1.17188,0 2.04688,0.34375 0.875,0.32813 1.28125,0.90625 0.42187,0.5625 0.57812,1.51563 l -1.625,0.21875 q -0.10937,-0.75 -0.65625,-1.17188 -0.53125,-0.4375 -1.5,-0.4375 -1.15625,0 -1.64062,0.39063 -0.48438,0.375 -0.48438,0.875 0,0.32812 0.20313,0.59375 0.20312,0.26562 0.64062,0.4375 0.25,0.0937 1.46875,0.4375 1.76563,0.46875 2.46875,0.76562 0.70313,0.29688 1.09375,0.875 0.40625,0.57813 0.40625,1.4375 0,0.82813 -0.48437,1.57813 -0.48438,0.73437 -1.40625,1.14062 -0.92188,0.39063 -2.07813,0.39063 -1.92187,0 -2.9375,-0.79688 -1,-0.79687 -1.28125,-2.35937 z" id="path133" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 405.07526,441.83728 172.78741,0 0,38.4252 -172.78741,0 z" id="path135" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 405.07526,441.83728 172.78741,0 0,38.4252 -172.78741,0 z" id="path137" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 449.39432,456.96988 0,-13.59375 5.125,0 q 1.35937,0 2.07812,0.125 1,0.17187 1.67188,0.64062 0.67187,0.46875 1.07812,1.3125 0.42188,0.84375 0.42188,1.84375 0,1.73438 -1.10938,2.9375 -1.09375,1.20313 -3.98437,1.20313 l -3.48438,0 0,5.53125 -1.79687,0 z m 1.79687,-7.14063 3.51563,0 q 1.75,0 2.46875,-0.64062 0.73437,-0.65625 0.73437,-1.82813 0,-0.85937 -0.4375,-1.46875 -0.42187,-0.60937 -1.125,-0.79687 -0.45312,-0.125 -1.67187,-0.125 l -3.48438,0 0,4.85937 z m 10.3967,7.14063 0,-13.59375 1.67188,0 0,13.59375 -1.67188,0 z m 10.61359,-1.21875 q -0.9375,0.79687 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32812,-1.32813 0.32813,-0.59375 0.85938,-0.95312 0.53125,-0.35938 1.20312,-0.54688 0.5,-0.14062 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.2
3438 q 0.23437,-1.04687 0.73437,-1.6875 0.51563,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26563,0 2.04688,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51562,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10938,0.60938 0.4375,1.17188 l -1.75,0 q -0.26562,-0.51563 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35937 -2.73437,0.625 -1.03125,0.14062 -1.45313,0.32812 -0.42187,0.1875 -0.65625,0.54688 -0.23437,0.35937 -0.23437,0.79687 0,0.67188 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57813 0.26562,-1.67188 l 0,-0.60937 z m 7.73508,3.4375 0.23438,1.48437 q -0.70313,0.14063 -1.26563,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70312,-0.75 -0.20313,-0.46875 -0.20313,-1.98438 l 0,-5.65625 -1.23437,0 0,-1.3125 1.23437,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29687,0.32812 0.20313,0.125 0.
57813,0.125 0.26562,0 0.73437,-0.0781 z m 1.93332,1.5 0,-8.54688 -1.48437,0 0,-1.3125 1.48437,0 0,-1.04687 q 0,-0.98438 0.17188,-1.46875 0.23437,-0.65625 0.84375,-1.04688 0.60937,-0.40625 1.70312,-0.40625 0.70313,0 1.5625,0.15625 l -0.25,1.46875 q -0.51562,-0.0937 -0.98437,-0.0937 -0.76563,0 -1.07813,0.32813 -0.3125,0.3125 -0.3125,1.20312 l 0,0.90625 1.92188,0 0,1.3125 -1.92188,0 0,8.54688 -1.65625,0 z m 4.15204,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26562,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29687,1.32813 1.29687,3.67188 0,1.90625 -0.57812,3 -0.5625,1.07812 -1.65625,1.6875 -1.07813,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82812,2.82813 0.82813,0.9375 2.07813,0.9375 1.25,0 2.0625,-0.9375 0.82812,-0.95313 0.82812,-2.89063 0,-1.82812 -0.82812,-2.76562 -0.82813,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07813,0.9375 -0.82812,0.9375 -0.82812,2.82812 z m 9.26636,4.92188 0,-9.85938 1.5,0 0,1.5 q 0.57812,-1.0
4687 1.0625,-1.375 0.48437,-0.34375 1.07812,-0.34375 0.84375,0 1.71875,0.54688 l -0.57812,1.54687 q -0.60938,-0.35937 -1.23438,-0.35937 -0.54687,0 -0.98437,0.32812 -0.42188,0.32813 -0.60938,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67187,0 z m 6.2283,0 0,-9.85938 1.5,0 0,1.39063 q 0.45312,-0.71875 1.21875,-1.15625 0.78125,-0.45313 1.76562,-0.45313 1.09375,0 1.79688,0.45313 0.70312,0.45312 0.98437,1.28125 1.17188,-1.73438 3.04685,-1.73438 1.46875,0 2.25,0.8125 0.79687,0.8125 0.79687,2.5 l 0,6.76563 -1.67187,0 0,-6.20313 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45312 -0.59375,-0.71875 -0.42188,-0.26562 -1,-0.26562 -1.03125,0 -1.71872,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67188,0 0,-6.40625 q 0,-1.10938 -0.40625,-1.65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70312,0 -1.3125,0.375 -0.59375,0.35937 -0.85937,1.07812 -0.26563,0.71875 -0.26563,2.0625 l 0,5.10938 -1.67187,0 z m 20.86471,0 0,-13.59375 5.10938,0 q 1.54687,0 2.48437,0.40625 0.95313,0.40625 1.48438,1.2656
2 0.53125,0.85938 0.53125,1.79688 0,0.875 -0.46875,1.65625 -0.46875,0.76562 -1.4375,1.23437 1.23437,0.35938 1.89062,1.23438 0.67188,0.875 0.67188,2.0625 0,0.95312 -0.40625,1.78125 -0.39063,0.8125 -0.98438,1.26562 -0.59375,0.4375 -1.5,0.67188 -0.89062,0.21875 -2.1875,0.21875 l -5.1875,0 z m 1.79688,-7.89063 2.9375,0 q 1.20312,0 1.71875,-0.15625 0.6875,-0.20312 1.03125,-0.67187 0.35937,-0.46875 0.35937,-1.1875 0,-0.67188 -0.32812,-1.1875 -0.32813,-0.51563 -0.9375,-0.70313 -0.59375,-0.20312 -2.0625,-0.20312 l -2.71875,0 0,4.10937 z m 0,6.28125 3.39062,0 q 0.875,0 1.21875,-0.0625 0.625,-0.10937 1.04688,-0.35937 0.42187,-0.26563 0.6875,-0.76563 0.26562,-0.5 0.26562,-1.14062 0,-0.76563 -0.39062,-1.32813 -0.39063,-0.5625 -1.07813,-0.78125 -0.6875,-0.23437 -1.98437,-0.23437 l -3.15625,0 0,4.67187 z" id="path139" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 457.1057,478.96988 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17187,0 -2.17187,-0.64063 -0.98438,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48437,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98438,-0.64063 2.20313,-0.64063 0.89062,0 1.57812,0.375 0.70313,0.375 1.14063,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54688,0 z m -5.28125,-4.92188 q 0,1.89063 0.79688,2.82813 0.8125,0.9375 1.89062,0.9375 1.09375,0 1.85938,-0.89063 0.76562,-0.89062 0.76562,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92187,-0.95312 -1.10938,0 -1.85938,0.90625 -0.75,0.90625 -0.75,2.85937 z m 16.01633,1.75 1.71875,0.21875 q -0.40625,1.5 -1.51563,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42187,-1.32813 -1.26563,-1.32812 -1.26563,-3.73437 0,-2.48438 1.26563,-3.85938 1.28125,-1.375 3.32812,-1.375 1.98438,0 3.23438,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92188,2.48437 0.82812,0.85938 2.0625,0.85938
0.90625,0 1.54687,-0.46875 0.65625,-0.48438 1.04688,-1.54688 z m -5.48438,-2.70312 5.5,0 q -0.10937,-1.23438 -0.625,-1.85938 -0.79687,-0.96875 -2.07812,-0.96875 -1.14063,0 -1.9375,0.78125 -0.78125,0.76563 -0.85938,2.04688 z m 9.51636,5.875 0,-8.54688 -1.48438,0 0,-1.3125 1.48438,0 0,-1.04687 q 0,-0.98438 0.17187,-1.46875 0.23438,-0.65625 0.84375,-1.04688 0.60938,-0.40625 1.70313,-0.40625 0.70312,0 1.5625,0.15625 l -0.25,1.46875 q -0.51563,-0.0937 -0.98438,-0.0937 -0.76562,0 -1.07812,0.32813 -0.3125,0.3125 -0.3125,1.20312 l 0,0.90625 1.92187,0 0,1.3125 -1.92187,0 0,8.54688 -1.65625,0 z m 4.79266,-11.6875 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 4.12921,0 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32813 0.75,0.3125 1.10938,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01563 -0.20312,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.2968
7 -1.17188,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76562,0.67188 -0.76562,2.57813 l 0,5.375 -1.67188,0 z m 10.39133,-11.6875 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 7.78546,-1.5 0.23438,1.48437 q -0.70313,0.14063 -1.26563,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70312,-0.75 -0.20313,-0.46875 -0.20313,-1.98438 l 0,-5.65625 -1.23437,0 0,-1.3125 1.23437,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29687,0.32812 0.20313,0.125 0.57813,0.125 0.26562,0 0.73437,-0.0781 z m 1.54267,-10.1875 0,-1.90625 1.67187,0 0,1.90625 -1.67187,0 z m 0,11.6875 0,-9.85938 1.67187,0 0,9.85938 -1.67187,0 z m 3.50421,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26562,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29687,1.32813 1.29687,3.67188 0,1.90625 -0.57812,3 -0.5625,1.07812 -1.65625,1.6875 -1.07813,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812
-1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82812,2.82813 0.82813,0.9375 2.07813,0.9375 1.25,0 2.0625,-0.9375 0.82812,-0.95313 0.82812,-2.89063 0,-1.82812 -0.82812,-2.76562 -0.82813,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07813,0.9375 -0.82812,0.9375 -0.82812,2.82812 z m 9.28198,4.92188 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14062,-1.625 0.89063,0 1.64063,0.32813 0.75,0.3125 1.10937,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67187,0 0,-6 q 0,-1.01563 -0.20313,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17187,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76563,0.67188 -0.76563,2.57813 l 0,5.375 -1.67187,0 z m 9.7038,-2.9375 1.65625,-0.26563 q 0.14062,1 0.76562,1.53125 0.64063,0.51563 1.78125,0.51563 1.15625,0 1.70313,-0.46875 0.5625,-0.46875 0.5625,-1.09375 0,-0.5625 -0.48438,-0.89063 -0.34375,-0.21875 -1.70312,-0.5625 -1.84375,-0.46875 -2.5625,-0.79687 -0.70313,-0.34375 -1.07813,-0.9375 -0.35937,-0.60938 -0.35937,-1.32813 0,-0.65625 0.
29687,-1.21875 0.3125,-0.5625 0.82813,-0.9375 0.39062,-0.28125 1.0625,-0.48437 0.67187,-0.20313 1.4375,-0.20313 1.17187,0 2.04687,0.34375 0.875,0.32813 1.28125,0.90625 0.42188,0.5625 0.57813,1.51563 l -1.625,0.21875 q -0.10938,-0.75 -0.65625,-1.17188 -0.53125,-0.4375 -1.5,-0.4375 -1.15625,0 -1.64063,0.39063 -0.48437,0.375 -0.48437,0.875 0,0.32812 0.20312,0.59375 0.20313,0.26562 0.64063,0.4375 0.25,0.0937 1.46875,0.4375 1.76562,0.46875 2.46875,0.76562 0.70312,0.29688 1.09375,0.875 0.40625,0.57813 0.40625,1.4375 0,0.82813 -0.48438,1.57813 -0.48437,0.73437 -1.40625,1.14062 -0.92187,0.39063 -2.07812,0.39063 -1.92188,0 -2.9375,-0.79688 -1,-0.79687 -1.28125,-2.35937 z" id="path141" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 645.07526,441.83728 172.78741,0 0,38.4252 -172.78741,0 z" id="path143" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 645.07526,441.83728 172.78741,0 0,38.4252 -172.78741,0 z" id="path145" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 688.87964,456.96988 0,-13.59375 5.125,0 q 1.35937,0 2.07812,0.125 1,0.17187 1.67188,0.64062 0.67187,0.46875 1.07812,1.3125 0.42188,0.84375 0.42188,1.84375 0,1.73438 -1.10938,2.9375 -1.09375,1.20313 -3.98437,1.20313 l -3.48438,0 0,5.53125 -1.79687,0 z m 1.79687,-7.14063 3.51563,0 q 1.75,0 2.46875,-0.64062 0.73437,-0.65625 0.73437,-1.82813 0,-0.85937 -0.4375,-1.46875 -0.42187,-0.60937 -1.125,-0.79687 -0.45312,-0.125 -1.67187,-0.125 l -3.48438,0 0,4.85937 z m 10.39667,7.14063 0,-13.59375 1.67188,0 0,13.59375 -1.67188,0 z m 10.61359,-1.21875 q -0.9375,0.79687 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32812,-1.32813 0.32813,-0.59375 0.85938,-0.95312 0.53125,-0.35938 1.20312,-0.54688 0.5,-0.14062 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.
23438 q 0.23437,-1.04687 0.73437,-1.6875 0.51563,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26563,0 2.04688,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51562,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10938,0.60938 0.4375,1.17188 l -1.75,0 q -0.26562,-0.51563 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35937 -2.73437,0.625 -1.03125,0.14062 -1.45313,0.32812 -0.42187,0.1875 -0.65625,0.54688 -0.23437,0.35937 -0.23437,0.79687 0,0.67188 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57813 0.26562,-1.67188 l 0,-0.60937 z m 7.73511,3.4375 0.23438,1.48437 q -0.70313,0.14063 -1.26563,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70312,-0.75 -0.20313,-0.46875 -0.20313,-1.98438 l 0,-5.65625 -1.23437,0 0,-1.3125 1.23437,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29687,0.32812 0.20313,0.125 0
.57813,0.125 0.26562,0 0.73437,-0.0781 z m 1.93329,1.5 0,-8.54688 -1.48438,0 0,-1.3125 1.48438,0 0,-1.04687 q 0,-0.98438 0.17187,-1.46875 0.23438,-0.65625 0.84375,-1.04688 0.60938,-0.40625 1.70313,-0.40625 0.70312,0 1.5625,0.15625 l -0.25,1.46875 q -0.51563,-0.0937 -0.98438,-0.0937 -0.76562,0 -1.07812,0.32813 -0.3125,0.3125 -0.3125,1.20312 l 0,0.90625 1.92187,0 0,1.3125 -1.92187,0 0,8.54688 -1.65625,0 z m 4.15204,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26562,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29687,1.32813 1.29687,3.67188 0,1.90625 -0.57812,3 -0.5625,1.07812 -1.65625,1.6875 -1.07813,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82812,2.82813 0.82813,0.9375 2.07813,0.9375 1.25,0 2.0625,-0.9375 0.82812,-0.95313 0.82812,-2.89063 0,-1.82812 -0.82812,-2.76562 -0.82813,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07813,0.9375 -0.82812,0.9375 -0.82812,2.82812 z m 9.26636,4.92188 0,-9.85938 1.5,0 0,1.5 q 0.57812,-1.
04687 1.0625,-1.375 0.48437,-0.34375 1.07812,-0.34375 0.84375,0 1.71875,0.54688 l -0.57812,1.54687 q -0.60938,-0.35937 -1.23438,-0.35937 -0.54687,0 -0.98437,0.32812 -0.42188,0.32813 -0.60938,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67187,0 z m 6.22833,0 0,-9.85938 1.5,0 0,1.39063 q 0.45312,-0.71875 1.21875,-1.15625 0.78125,-0.45313 1.76562,-0.45313 1.09375,0 1.79688,0.45313 0.70312,0.45312 0.98437,1.28125 1.17188,-1.73438 3.04688,-1.73438 1.46875,0 2.25,0.8125 0.79687,0.8125 0.79687,2.5 l 0,6.76563 -1.67187,0 0,-6.20313 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45312 -0.59375,-0.71875 -0.42188,-0.26562 -1,-0.26562 -1.03125,0 -1.71875,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67188,0 0,-6.40625 q 0,-1.10938 -0.40625,-1.65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70312,0 -1.3125,0.375 -0.59375,0.35937 -0.85937,1.07812 -0.26563,0.71875 -0.26563,2.0625 l 0,5.10938 -1.67187,0 z m 30.64593,-4.76563 1.79688,0.45313 q -0.5625,2.21875 -2.03125,3.39062 -1.46875,1.15625 -3.
59375,1.15625 -2.20313,0 -3.57813,-0.89062 -1.375,-0.90625 -2.09375,-2.59375 -0.71875,-1.70313 -0.71875,-3.65625 0,-2.125 0.79688,-3.70313 0.8125,-1.57812 2.3125,-2.39062 1.5,-0.82813 3.29687,-0.82813 2.04688,0 3.4375,1.04688 1.39063,1.03125 1.9375,2.90625 l -1.76562,0.42187 q -0.46875,-1.48437 -1.375,-2.15625 -0.90625,-0.6875 -2.26563,-0.6875 -1.5625,0 -2.625,0.75 -1.04687,0.75 -1.48437,2.03125 -0.42188,1.26563 -0.42188,2.60938 0,1.73437 0.5,3.03125 0.51563,1.28125 1.57813,1.92187 1.07812,0.64063 2.3125,0.64063 1.51562,0 2.5625,-0.85938 1.04687,-0.875 1.42187,-2.59375 z" id="path147" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 697.1057,478.96988 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17188,0 -2.17188,-0.64063 -0.98437,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48438,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98437,-0.64063 2.20312,-0.64063 0.89063,0 1.57813,0.375 0.70312,0.375 1.14062,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54687,0 z m -5.28125,-4.92188 q 0,1.89063 0.79687,2.82813 0.8125,0.9375 1.89063,0.9375 1.09375,0 1.85937,-0.89063 0.76563,-0.89062 0.76563,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92188,-0.95312 -1.10937,0 -1.85937,0.90625 -0.75,0.90625 -0.75,2.85937 z m 16.01636,1.75 1.71875,0.21875 q -0.40625,1.5 -1.51563,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42187,-1.32813 -1.26563,-1.32812 -1.26563,-3.73437 0,-2.48438 1.26563,-3.85938 1.28125,-1.375 3.32812,-1.375 1.98438,0 3.23438,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92188,2.48437 0.82812,0.85938 2.0625,0.85938
0.90625,0 1.54687,-0.46875 0.65625,-0.48438 1.04688,-1.54688 z m -5.48438,-2.70312 5.5,0 q -0.10937,-1.23438 -0.625,-1.85938 -0.79687,-0.96875 -2.07812,-0.96875 -1.14063,0 -1.9375,0.78125 -0.78125,0.76563 -0.85938,2.04688 z m 9.5163,5.875 0,-8.54688 -1.48438,0 0,-1.3125 1.48438,0 0,-1.04687 q 0,-0.98438 0.17187,-1.46875 0.23438,-0.65625 0.84375,-1.04688 0.60938,-0.40625 1.70313,-0.40625 0.70312,0 1.5625,0.15625 l -0.25,1.46875 q -0.51563,-0.0937 -0.98438,-0.0937 -0.76562,0 -1.07812,0.32813 -0.3125,0.3125 -0.3125,1.20312 l 0,0.90625 1.92187,0 0,1.3125 -1.92187,0 0,8.54688 -1.65625,0 z m 4.79272,-11.6875 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 4.12915,0 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32813 0.75,0.3125 1.10938,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01563 -0.20312,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687
-1.17188,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76562,0.67188 -0.76562,2.57813 l 0,5.375 -1.67188,0 z m 10.39136,-11.6875 0,-1.90625 1.67187,0 0,1.90625 -1.67187,0 z m 0,11.6875 0,-9.85938 1.67187,0 0,9.85938 -1.67187,0 z m 7.78546,-1.5 0.23438,1.48437 q -0.70313,0.14063 -1.26563,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70312,-0.75 -0.20313,-0.46875 -0.20313,-1.98438 l 0,-5.65625 -1.23437,0 0,-1.3125 1.23437,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29687,0.32812 0.20313,0.125 0.57813,0.125 0.26562,0 0.73437,-0.0781 z m 1.54266,-10.1875 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 3.50422,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26562,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29687,1.32813 1.29687,3.67188 0,1.90625 -0.57812,3 -0.5625,1.07812 -1.65625,1.6875 -1.07813,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -
1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82812,2.82813 0.82813,0.9375 2.07813,0.9375 1.25,0 2.0625,-0.9375 0.82812,-0.95313 0.82812,-2.89063 0,-1.82812 -0.82812,-2.76562 -0.82813,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07813,0.9375 -0.82812,0.9375 -0.82812,2.82812 z m 9.28198,4.92188 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14062,-1.625 0.89063,0 1.64063,0.32813 0.75,0.3125 1.10937,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67187,0 0,-6 q 0,-1.01563 -0.20313,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17187,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76563,0.67188 -0.76563,2.57813 l 0,5.375 -1.67187,0 z m 9.70379,-2.9375 1.65625,-0.26563 q 0.14063,1 0.76563,1.53125 0.64062,0.51563 1.78125,0.51563 1.15625,0 1.70312,-0.46875 0.5625,-0.46875 0.5625,-1.09375 0,-0.5625 -0.48437,-0.89063 -0.34375,-0.21875 -1.70313,-0.5625 -1.84375,-0.46875 -2.5625,-0.79687 -0.70312,-0.34375 -1.07812,-0.9375 -0.35938,-0.60938 -0.35938,-1.32813 0,-0.65625 0.
29688,-1.21875 0.3125,-0.5625 0.82812,-0.9375 0.39063,-0.28125 1.0625,-0.48437 0.67188,-0.20313 1.4375,-0.20313 1.17188,0 2.04688,0.34375 0.875,0.32813 1.28125,0.90625 0.42187,0.5625 0.57812,1.51563 l -1.625,0.21875 q -0.10937,-0.75 -0.65625,-1.17188 -0.53125,-0.4375 -1.5,-0.4375 -1.15625,0 -1.64062,0.39063 -0.48438,0.375 -0.48438,0.875 0,0.32812 0.20313,0.59375 0.20312,0.26562 0.64062,0.4375 0.25,0.0937 1.46875,0.4375 1.76563,0.46875 2.46875,0.76562 0.70313,0.29688 1.09375,0.875 0.40625,0.57813 0.40625,1.4375 0,0.82813 -0.48437,1.57813 -0.48438,0.73437 -1.40625,1.14062 -0.92188,0.39063 -2.07813,0.39063 -1.92187,0 -2.9375,-0.79688 -1,-0.79687 -1.28125,-2.35937 z" id="path149" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="M 489.36746,400.23758 243.47769,441.84387" id="path151" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="M 489.36746,400.23758 249.3936,440.84283" id="path153" inkscape:connector-curvature="0" style="fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 249.11803,439.21426 -4.19893,2.38571 4.75006,0.87146 z" id="path155" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt"/>
+ <path d="m 489.36746,400.23758 2.11023,41.60629" id="path157" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 489.36746,400.23758 1.8063,35.61401" id="path159" inkscape:connector-curvature="0" style="fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 489.52414,435.93524 1.87949,4.44861 1.41973,-4.61594 z" id="path161" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt"/>
+ <path d="m 489.36746,400.23758 242.1102,41.60629" id="path163" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 489.36746,400.23758 236.19693,40.59009" id="path165" inkscape:connector-curvature="0" style="fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 725.2846,442.45554 4.75232,-0.85925 -4.19281,-2.39649 z" id="path167" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt"/>
+ <path d="m 231.12776,572.48846 7.88976,0 0,-14.86615 15.77952,0 0,14.86615 7.88979,0 -15.77954,14.86615 z" id="path169" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 231.12776,572.48846 7.88976,0 0,-14.86615 15.77952,0 0,14.86615 7.88979,0 -15.77954,14.86615 z" id="path171" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 479.12775,571.11145 7.88977,0 0,-14.86615 15.77954,0 0,14.86615 7.88977,0 -15.77954,14.86609 z" id="path173" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 479.12775,571.11145 7.88977,0 0,-14.86615 15.77954,0 0,14.86615 7.88977,0 -15.77954,14.86609 z" id="path175" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 719.12775,571.1639 7.88977,0 0,-14.86615 15.77954,0 0,14.86615 7.88977,0 -15.77954,14.86615 z" id="path177" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 719.12775,571.1639 7.88977,0 0,-14.86615 15.77954,0 0,14.86615 7.88977,0 -15.77954,14.86615 z" id="path179" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="M 86.097115,20.889763 97.750657,9.2362205 109.4042,20.889763 l -5.82677,0 0,384.440947 -11.653547,0 0,-384.440947 z" id="path181" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="M 86.097115,20.889763 97.750657,9.2362205 109.4042,20.889763 l -5.82677,0 0,384.440947 -11.653547,0 0,-384.440947 z" id="path183" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 86.04462,702.90027 5.826775,0 0,-273.7323 11.653545,0 0,273.7323 5.82677,0 -11.653541,11.65356 z" id="path185" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 86.04462,702.90027 5.826775,0 0,-273.7323 11.653545,0 0,273.7323 5.82677,0 -11.653541,11.65356 z" id="path187" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 642.4252,223.63518 0,0 c 3.98346,0 7.21265,1.07526 7.21265,2.40164 l 0,138.47261 c 0,1.32642 3.22918,2.40167 7.21258,2.40167 l 0,0 c -3.9834,0 -7.21258,1.07526 -7.21258,2.40165 l 0,28.07824 c 0,1.32642 -3.22919,2.40168 -7.21265,2.40168 z" id="path189" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 642.4252,223.63518 0,0 c 3.98346,0 7.21265,1.07526 7.21265,2.40164 l 0,138.47261 c 0,1.32642 3.22918,2.40167 7.21258,2.40167 l 0,0 c -3.9834,0 -7.21258,1.07526 -7.21258,2.40165 l 0,28.07824 c 0,1.32642 -3.22919,2.40168 -7.21265,2.40168" id="path191" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 642.4252,223.63518 0,0 c 3.98346,0 7.21265,1.07526 7.21265,2.40164 l 0,138.47261 c 0,1.32642 3.22918,2.40167 7.21258,2.40167 l 0,0 c -3.9834,0 -7.21258,1.07526 -7.21258,2.40165 l 0,28.07824 c 0,1.32642 -3.22919,2.40168 -7.21265,2.40168" id="path193" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 656.8399,349.63867 181.48029,0 0,29.7323 -181.48029,0 z" id="path195" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 677.0118,366.6592 1.79687,0.45312 q -0.5625,2.21875 -2.03125,3.39063 -1.46875,1.15625 -3.59375,1.15625 -2.20312,0 -3.57812,-0.89063 -1.375,-0.90625 -2.09375,-2.59375 -0.71875,-1.70312 -0.71875,-3.65625 0,-2.125 0.79687,-3.70312 0.8125,-1.57813 2.3125,-2.39063 1.5,-0.82812 3.29688,-0.82812 2.04687,0 3.4375,1.04687 1.39062,1.03125 1.9375,2.90625 l -1.76563,0.42188 q -0.46875,-1.48438 -1.375,-2.15625 -0.90625,-0.6875 -2.26562,-0.6875 -1.5625,0 -2.625,0.75 -1.04688,0.75 -1.48438,2.03125 -0.42187,1.26562 -0.42187,2.60937 0,1.73438 0.5,3.03125 0.51562,1.28125 1.57812,1.92188 1.07813,0.64062 2.3125,0.64062 1.51563,0 2.5625,-0.85937 1.04688,-0.875 1.42188,-2.59375 z m 2.92609,-0.15625 q 0,-2.73438 1.53125,-4.0625 1.26562,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29687,1.32812 1.29687,3.67187 0,1.90625 -0.57812,3 -0.5625,1.07813 -1.65625,1.6875 -1.07813,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32812 -1.28125,-1.32813 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89062 0.
82812,2.82812 0.82813,0.9375 2.07813,0.9375 1.25,0 2.0625,-0.9375 0.82812,-0.95312 0.82812,-2.89062 0,-1.82813 -0.82812,-2.76563 -0.82813,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07813,0.9375 -0.82812,0.9375 -0.82812,2.82813 z m 9.28192,4.92187 0,-9.85937 1.5,0 0,1.39062 q 0.45312,-0.71875 1.21875,-1.15625 0.78125,-0.45312 1.76562,-0.45312 1.09375,0 1.79688,0.45312 0.70312,0.45313 0.98437,1.28125 1.17188,-1.73437 3.04688,-1.73437 1.46875,0 2.25,0.8125 0.79687,0.8125 0.79687,2.5 l 0,6.76562 -1.67187,0 0,-6.20312 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45313 -0.59375,-0.71875 -0.42188,-0.26563 -1,-0.26563 -1.03125,0 -1.71875,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67188,0 0,-6.40625 q 0,-1.10937 -0.40625,-1.65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70312,0 -1.3125,0.375 -0.59375,0.35938 -0.85937,1.07813 -0.26563,0.71875 -0.26563,2.0625 l 0,5.10937 -1.67187,0 z m 15.54083,3.78125 0,-13.64062 1.53125,0 0,1.28125 q 0.53125,-0.75 1.20312,-1.125 0.6875,-0.375 1.64063,-0.375 1.26562,0 2
.23437,0.65625 0.96875,0.64062 1.45313,1.82812 0.5,1.1875 0.5,2.59375 0,1.51563 -0.54688,2.73438 -0.54687,1.20312 -1.57812,1.84375 -1.03125,0.64062 -2.17188,0.64062 -0.84375,0 -1.51562,-0.34375 -0.65625,-0.35937 -1.07813,-0.89062 l 0,4.79687 -1.67187,0 z m 1.51562,-8.65625 q 0,1.90625 0.76563,2.8125 0.78125,0.90625 1.875,0.90625 1.10937,0 1.89062,-0.9375 0.79688,-0.9375 0.79688,-2.92187 0,-1.875 -0.78125,-2.8125 -0.76563,-0.9375 -1.84375,-0.9375 -1.0625,0 -1.89063,1 -0.8125,1 -0.8125,2.89062 z m 8.87574,-6.8125 0,-1.90625 1.67187,0 0,1.90625 -1.67187,0 z m 0,11.6875 0,-9.85937 1.67187,0 0,9.85937 -1.67187,0 z m 4.0979,0 0,-13.59375 1.67187,0 0,13.59375 -1.67187,0 z m 10.61358,-1.21875 q -0.9375,0.79688 -1.79687,1.125 -0.85938,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.875,-0.79687 -0.875,-2.03125 0,-0.73437 0.32813,-1.32812 0.32812,-0.59375 0.85937,-0.95313 0.53125,-0.35937 1.20313,-0.54687 0.5,-0.14063 1.48437,-0.25 2.03125,-0.25 2.98438,-0.57813 0,-0.34375 0,-0.4375 0,
-1.01562 -0.46875,-1.4375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.23437 q 0.23438,-1.04688 0.73438,-1.6875 0.51562,-0.64063 1.46875,-0.98438 0.96875,-0.35937 2.25,-0.35937 1.26562,0 2.04687,0.29687 0.78125,0.29688 1.15625,0.75 0.375,0.45313 0.51563,1.14063 0.0937,0.42187 0.0937,1.53125 l 0,2.23437 q 0,2.32813 0.0937,2.95313 0.10937,0.60937 0.4375,1.17187 l -1.75,0 q -0.26563,-0.51562 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35938 -2.73438,0.625 -1.03125,0.14063 -1.45312,0.32813 -0.42188,0.1875 -0.65625,0.54687 -0.23438,0.35938 -0.23438,0.79688 0,0.67187 0.5,1.125 0.51563,0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42188 0.75,-0.4375 1.10937,-1.15625 0.26563,-0.57812 0.26563,-1.67187 l 0,-0.60938 z m 7.73511,3.4375 0.23437,1.48438 q -0.70312,0.14062 -1.26562,0.14062 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29687 -0.70313,-0.75 -0.20312,-0.46875 -0.20312,-1.98437 l 0,-5.65625 -1.23438,0 0,-1.3125 1.23438,0 0,-
2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92187 0.0937,0.20313 0.29688,0.32813 0.20312,0.125 0.57812,0.125 0.26563,0 0.73438,-0.0781 z m 1.54266,-10.1875 0,-1.90625 1.67187,0 0,1.90625 -1.67187,0 z m 0,11.6875 0,-9.85937 1.67187,0 0,9.85937 -1.67187,0 z m 3.50421,-4.92187 q 0,-2.73438 1.53125,-4.0625 1.26563,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29688,1.32812 1.29688,3.67187 0,1.90625 -0.57813,3 -0.5625,1.07813 -1.65625,1.6875 -1.07812,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32812 -1.28125,-1.32813 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89062 0.82813,2.82812 0.82812,0.9375 2.07812,0.9375 1.25,0 2.0625,-0.9375 0.82813,-0.95312 0.82813,-2.89062 0,-1.82813 -0.82813,-2.76563 -0.82812,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07812,0.9375 -0.82813,0.9375 -0.82813,2.82813 z m 9.28198,4.92187 0,-9.85937 1.5,0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32812 0.75,0.3125 1.10938,0.84375 0.375,0.51563 0.53125,1.21875 0.093
7,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01562 -0.20312,-1.51562 -0.1875,-0.51563 -0.6875,-0.8125 -0.5,-0.29688 -1.17188,-0.29688 -1.0625,0 -1.84375,0.67188 -0.76562,0.67187 -0.76562,2.57812 l 0,5.375 -1.67188,0 z" id="path197" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 838.3202,456.93176 133.92126,0 0,91.30707 -133.92126,0 z" id="path199" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 848.78894,483.85175 0,-13.59375 5.125,0 q 1.35938,0 2.07813,0.125 1,0.17187 1.67187,0.64062 0.67188,0.46875 1.07813,1.3125 0.42187,0.84375 0.42187,1.84375 0,1.73438 -1.10937,2.9375 -1.09375,1.20313 -3.98438,1.20313 l -3.48437,0 0,5.53125 -1.79688,0 z m 1.79688,-7.14063 3.51562,0 q 1.75,0 2.46875,-0.64062 0.73438,-0.65625 0.73438,-1.82813 0,-0.85937 -0.4375,-1.46875 -0.42188,-0.60937 -1.125,-0.79687 -0.45313,-0.125 -1.67188,-0.125 l -3.48437,0 0,4.85937 z m 10.39672,7.14063 0,-13.59375 1.67188,0 0,13.59375 -1.67188,0 z m 10.61359,-1.21875 q -0.9375,0.79687 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32812,-1.32813 0.32813,-0.59375 0.85938,-0.95312 0.53125,-0.35938 1.20312,-0.54688 0.5,-0.14062 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.
23438 q 0.23437,-1.04687 0.73437,-1.6875 0.51563,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26563,0 2.04688,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51562,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10938,0.60938 0.4375,1.17188 l -1.75,0 q -0.26562,-0.51563 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35937 -2.73437,0.625 -1.03125,0.14062 -1.45313,0.32812 -0.42187,0.1875 -0.65625,0.54688 -0.23437,0.35937 -0.23437,0.79687 0,0.67188 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57813 0.26562,-1.67188 l 0,-0.60937 z m 7.73505,3.4375 0.23438,1.48437 q -0.70313,0.14063 -1.26563,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70312,-0.75 -0.20313,-0.46875 -0.20313,-1.98438 l 0,-5.65625 -1.23437,0 0,-1.3125 1.23437,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29687,0.32812 0.20313,0.125 0
.57813,0.125 0.26562,0 0.73437,-0.0781 z m 1.93335,1.5 0,-8.54688 -1.48437,0 0,-1.3125 1.48437,0 0,-1.04687 q 0,-0.98438 0.17188,-1.46875 0.23437,-0.65625 0.84375,-1.04688 0.60937,-0.40625 1.70312,-0.40625 0.70313,0 1.5625,0.15625 l -0.25,1.46875 q -0.51562,-0.0937 -0.98437,-0.0937 -0.76563,0 -1.07813,0.32813 -0.3125,0.3125 -0.3125,1.20312 l 0,0.90625 1.92188,0 0,1.3125 -1.92188,0 0,8.54688 -1.65625,0 z m 4.15204,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26562,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29687,1.32813 1.29687,3.67188 0,1.90625 -0.57812,3 -0.5625,1.07812 -1.65625,1.6875 -1.07813,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82812,2.82813 0.82813,0.9375 2.07813,0.9375 1.25,0 2.0625,-0.9375 0.82812,-0.95313 0.82812,-2.89063 0,-1.82812 -0.82812,-2.76562 -0.82813,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07813,0.9375 -0.82812,0.9375 -0.82812,2.82812 z m 9.26636,4.92188 0,-9.85938 1.5,0 0,1.5 q 0.57812,-1.
04687 1.0625,-1.375 0.48437,-0.34375 1.07812,-0.34375 0.84375,0 1.71875,0.54688 l -0.57812,1.54687 q -0.60938,-0.35937 -1.23438,-0.35937 -0.54687,0 -0.98437,0.32812 -0.42188,0.32813 -0.60938,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67187,0 z m 6.22827,0 0,-9.85938 1.5,0 0,1.39063 q 0.45312,-0.71875 1.21875,-1.15625 0.78125,-0.45313 1.76562,-0.45313 1.09375,0 1.79688,0.45313 0.70312,0.45312 0.98437,1.28125 1.17188,-1.73438 3.04688,-1.73438 1.46875,0 2.25,0.8125 0.79687,0.8125 0.79687,2.5 l 0,6.76563 -1.67187,0 0,-6.20313 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45312 -0.59375,-0.71875 -0.42188,-0.26562 -1,-0.26562 -1.03125,0 -1.71875,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67188,0 0,-6.40625 q 0,-1.10938 -0.40625,-1.65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70312,0 -1.3125,0.375 -0.59375,0.35937 -0.85937,1.07812 -0.26563,0.71875 -0.26563,2.0625 l 0,5.10938 -1.67187,0 z" id="path201" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 848.7108,505.85175 0,-13.59375 1.79687,0 0,11.98437 6.70313,0 0,1.60938 -8.5,0 z m 10.25073,-11.6875 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 4.12921,0 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32813 0.75,0.3125 1.10938,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01563 -0.20312,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17188,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76562,0.67188 -0.76562,2.57813 l 0,5.375 -1.67188,0 z m 10.39136,0 0,-13.59375 1.67188,0 0,7.75 3.95312,-4.01563 2.15625,0 -3.76562,3.65625 4.14062,6.20313 -2.0625,0 -3.25,-5.03125 -1.17187,1.125 0,3.90625 -1.67188,0 z m 9.32813,-11.6875 0,-1.90625 1.67187,0 0,1.90625 -1.67187,0 z m 0,11.6875 0,-9.85938 1.67187,0 0,9.85938 -1.67187,0 z m 4.12915,0 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14062,-1.625 0.89063,0 1.64063,0.32813 0.75,0.312
5 1.10937,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67187,0 0,-6 q 0,-1.01563 -0.20313,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17187,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76563,0.67188 -0.76563,2.57813 l 0,5.375 -1.67187,0 z m 10.07885,0.8125 1.60938,0.25 q 0.10937,0.75 0.57812,1.09375 0.60938,0.45312 1.6875,0.45312 1.17188,0 1.79688,-0.46875 0.625,-0.45312 0.85937,-1.28125 0.125,-0.51562 0.10938,-2.15625 -1.09375,1.29688 -2.71875,1.29688 -2.03125,0 -3.15625,-1.46875 -1.10938,-1.46875 -1.10938,-3.51563 0,-1.40625 0.51563,-2.59375 0.51562,-1.20312 1.48437,-1.84375 0.96875,-0.65625 2.26563,-0.65625 1.75,0 2.875,1.40625 l 0,-1.1875 1.54687,0 0,8.51563 q 0,2.3125 -0.46875,3.26562 -0.46875,0.96875 -1.48437,1.51563 -1.01563,0.5625 -2.5,0.5625 -1.76563,0 -2.85938,-0.79688 -1.07812,-0.79687 -1.03125,-2.39062 z m 1.375,-5.92188 q 0,1.95313 0.76563,2.84375 0.78125,0.89063 1.9375,0.89063 1.14062,0 1.92187,-0.89063 0.78125,-0.89062 0.781
25,-2.78125 0,-1.8125 -0.8125,-2.71875 -0.79687,-0.92187 -1.92187,-0.92187 -1.10938,0 -1.89063,0.90625 -0.78125,0.89062 -0.78125,2.67187 z m 20.9184,3.89063 q -0.9375,0.79687 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32812,-1.32813 0.32813,-0.59375 0.85938,-0.95312 0.53125,-0.35938 1.20312,-0.54688 0.5,-0.14062 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.23438 q 0.23437,-1.04687 0.73437,-1.6875 0.51563,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26563,0 2.04688,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51562,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10938,0.60938 0.4375,1.17188 l -1.75,0 q -0.26562,-0.51563 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35937 -2.73437,0.625 -1.0312
5,0.14062 -1.45313,0.32812 -0.42187,0.1875 -0.65625,0.54688 -0.23437,0.35937 -0.23437,0.79687 0,0.67188 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57813 0.26562,-1.67188 l 0,-0.60937 z m 4.07886,4.9375 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32813 0.75,0.3125 1.10938,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01563 -0.20312,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17188,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76562,0.67188 -0.76562,2.57813 l 0,5.375 -1.67188,0 z m 16.76636,0 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17188,0 -2.17188,-0.64063 -0.98437,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48438,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98437,-0.64063 2.20312,-0.64063 0.89063,0 1.57813,0.375 0.70312,0.375 1.14062,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54687,0 z m -5.2812
5,-4.92188 q 0,1.89063 0.79687,2.82813 0.8125,0.9375 1.89063,0.9375 1.09375,0 1.85937,-0.89063 0.76563,-0.89062 0.76563,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92188,-0.95312 -1.10937,0 -1.85937,0.90625 -0.75,0.90625 -0.75,2.85937 z" id="path203" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 848.24207,521.22675 q 0,-3.39062 1.8125,-5.29687 1.82812,-1.92188 4.70312,-1.92188 1.875,0 3.39063,0.90625 1.51562,0.89063 2.29687,2.5 0.79688,1.60938 0.79688,3.65625 0,2.0625 -0.84375,3.70313 -0.82813,1.625 -2.35938,2.46875 -1.53125,0.84375 -3.29687,0.84375 -1.92188,0 -3.4375,-0.92188 -1.5,-0.9375 -2.28125,-2.53125 -0.78125,-1.60937 -0.78125,-3.40625 z m 1.85937,0.0312 q 0,2.45313 1.3125,3.875 1.32813,1.40625 3.3125,1.40625 2.03125,0 3.34375,-1.42187 1.3125,-1.4375 1.3125,-4.0625 0,-1.65625 -0.5625,-2.89063 -0.54687,-1.23437 -1.64062,-1.92187 -1.07813,-0.6875 -2.42188,-0.6875 -1.90625,0 -3.28125,1.3125 -1.375,1.3125 -1.375,4.39062 z m 12.98023,10.375 0,-13.64062 1.53125,0 0,1.28125 q 0.53125,-0.75 1.20313,-1.125 0.6875,-0.375 1.64062,-0.375 1.26563,0 2.23438,0.65625 0.96875,0.64062 1.45312,1.82812 0.5,1.1875 0.5,2.59375 0,1.51563 -0.54687,2.73438 -0.54688,1.20312 -1.57813,1.84375 -1.03125,0.64062 -2.17187,0.64062 -0.84375,0 -1.51563,-0.34375 -0.65625,-0.35937 -1.0781
2,-0.89062 l 0,4.79687 -1.67188,0 z m 1.51563,-8.65625 q 0,1.90625 0.76562,2.8125 0.78125,0.90625 1.875,0.90625 1.10938,0 1.89063,-0.9375 0.79687,-0.9375 0.79687,-2.92187 0,-1.875 -0.78125,-2.8125 -0.76562,-0.9375 -1.84375,-0.9375 -1.0625,0 -1.89062,1 -0.8125,1 -0.8125,2.89062 z m 12.51629,3.375 0.23438,1.48438 q -0.70313,0.14062 -1.26563,0.14062 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29687 -0.70312,-0.75 -0.20313,-0.46875 -0.20313,-1.98437 l 0,-5.65625 -1.23437,0 0,-1.3125 1.23437,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92187 0.0937,0.20313 0.29687,0.32813 0.20313,0.125 0.57813,0.125 0.26562,0 0.73437,-0.0781 z m 1.54273,-10.1875 0,-1.90625 1.67187,0 0,1.90625 -1.67187,0 z m 0,11.6875 0,-9.85937 1.67187,0 0,9.85937 -1.67187,0 z m 4.12915,0 0,-9.85937 1.5,0 0,1.39062 q 0.45312,-0.71875 1.21875,-1.15625 0.78125,-0.45312 1.76562,-0.45312 1.09375,0 1.79688,0.45312 0.70312,0.45313 0.98437,1.28125 1.17188,-1.73437 3.04688,-1.73437 1.46875,0 2
.25,0.8125 0.79687,0.8125 0.79687,2.5 l 0,6.76562 -1.67187,0 0,-6.20312 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45313 -0.59375,-0.71875 -0.42188,-0.26563 -1,-0.26563 -1.03125,0 -1.71875,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67188,0 0,-6.40625 q 0,-1.10937 -0.40625,-1.65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70312,0 -1.3125,0.375 -0.59375,0.35938 -0.85937,1.07813 -0.26563,0.71875 -0.26563,2.0625 l 0,5.10937 -1.67187,0 z m 15.55645,-11.6875 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85937 1.67188,0 0,9.85937 -1.67188,0 z m 3.25421,0 0,-1.35937 6.26563,-7.1875 q -1.0625,0.0469 -1.875,0.0469 l -4.01563,0 0,-1.35937 8.04688,0 0,1.10937 -5.34375,6.25 -1.01563,1.14063 q 1.10938,-0.0781 2.09375,-0.0781 l 4.5625,0 0,1.4375 -8.71875,0 z m 16.64063,-1.21875 q -0.9375,0.79688 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79687 -0.875,-2.03125 0,-0.73437 0.32812,-1.32812 0.32813,-0.59375 0.85938,-0.95313 0.53125,-0.35937 1.20
312,-0.54687 0.5,-0.14063 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57813 0,-0.34375 0,-0.4375 0,-1.01562 -0.46875,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.23437 q 0.23437,-1.04688 0.73437,-1.6875 0.51563,-0.64063 1.46875,-0.98438 0.96875,-0.35937 2.25,-0.35937 1.26563,0 2.04688,0.29687 0.78125,0.29688 1.15625,0.75 0.375,0.45313 0.51562,1.14063 0.0937,0.42187 0.0937,1.53125 l 0,2.23437 q 0,2.32813 0.0937,2.95313 0.10938,0.60937 0.4375,1.17187 l -1.75,0 q -0.26562,-0.51562 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35938 -2.73437,0.625 -1.03125,0.14063 -1.45313,0.32813 -0.42187,0.1875 -0.65625,0.54687 -0.23437,0.35938 -0.23437,0.79688 0,0.67187 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42188 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57812 0.26562,-1.67187 l 0,-0.60938 z m 7.73505,3.4375 0.23438,1.48438 q -0.70313,0.14062 -1.26563,0.14062 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29687 -0.7
0312,-0.75 -0.20313,-0.46875 -0.20313,-1.98437 l 0,-5.65625 -1.23437,0 0,-1.3125 1.23437,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92187 0.0937,0.20313 0.29687,0.32813 0.20313,0.125 0.57813,0.125 0.26562,0 0.73437,-0.0781 z m 1.54273,-10.1875 0,-1.90625 1.67187,0 0,1.90625 -1.67187,0 z m 0,11.6875 0,-9.85937 1.67187,0 0,9.85937 -1.67187,0 z m 3.50415,-4.92187 q 0,-2.73438 1.53125,-4.0625 1.26562,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29687,1.32812 1.29687,3.67187 0,1.90625 -0.57812,3 -0.5625,1.07813 -1.65625,1.6875 -1.07813,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32812 -1.28125,-1.32813 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89062 0.82812,2.82812 0.82813,0.9375 2.07813,0.9375 1.25,0 2.0625,-0.9375 0.82812,-0.95312 0.82812,-2.89062 0,-1.82813 -0.82812,-2.76563 -0.82813,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07813,0.9375 -0.82812,0.9375 -0.82812,2.82813 z m 9.28198,4.92187 0,-9.85937 1.5,0 0,1.40625 q 1.09375,-1.625 3.14062,-1
.625 0.89063,0 1.64063,0.32812 0.75,0.3125 1.10937,0.84375 0.375,0.51563 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67187,0 0,-6 q 0,-1.01562 -0.20313,-1.51562 -0.1875,-0.51563 -0.6875,-0.8125 -0.5,-0.29688 -1.17187,-0.29688 -1.0625,0 -1.84375,0.67188 -0.76563,0.67187 -0.76563,2.57812 l 0,5.375 -1.67187,0 z" id="path205" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 827.8688,313.9265 0,0 c 3.9834,0 7.21259,0.53818 7.21259,1.20206 l 0,183.03864 c 0,0.66388 3.22918,1.20205 7.21258,1.20205 l 0,0 c -3.9834,0 -7.21258,0.53818 -7.21258,1.20203 l 0,50.48389 c 0,0.66388 -3.22919,1.20202 -7.21259,1.20202 z" id="path207" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 827.8688,313.9265 0,0 c 3.9834,0 7.21259,0.53818 7.21259,1.20206 l 0,183.03864 c 0,0.66388 3.22918,1.20205 7.21258,1.20205 l 0,0 c -3.9834,0 -7.21258,0.53818 -7.21258,1.20203 l 0,50.48389 c 0,0.66388 -3.22919,1.20202 -7.21259,1.20202" id="path209" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 827.8688,313.9265 0,0 c 3.9834,0 7.21259,0.53818 7.21259,1.20206 l 0,183.03864 c 0,0.66388 3.22918,1.20205 7.21258,1.20205 l 0,0 c -3.9834,0 -7.21258,0.53818 -7.21258,1.20203 l 0,50.48389 c 0,0.66388 -3.22919,1.20202 -7.21259,1.20202" id="path211" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 56.020996,348.14435 0,-245.88976 29.732285,0 0,245.88976 z" id="path213" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 82.940994,326.3902 -13.59375,0 0,-4.6875 q 0,-1.57813 0.1875,-2.42188 0.265625,-1.15625 0.96875,-1.98437 0.921875,-1.07813 2.34375,-1.60938 1.40625,-0.53125 3.21875,-0.53125 1.546875,0 2.75,0.35938 1.1875,0.35937 1.984375,0.92187 0.78125,0.5625 1.234375,1.23438 0.4375,0.67187 0.671875,1.625 0.234375,0.95312 0.234375,2.1875 l 0,4.90625 z m -1.609375,-1.79688 0,-2.90625 q 0,-1.34375 -0.25,-2.10937 -0.25,-0.76563 -0.703125,-1.21875 -0.640625,-0.64063 -1.71875,-1 -1.078125,-0.35938 -2.625,-0.35938 -2.125,0 -3.265625,0.70313 -1.15625,0.70312 -1.546875,1.70312 -0.28125,0.71875 -0.28125,2.32813 l 0,2.85937 10.390625,0 z m -1.5625,-18.2073 0.21875,-1.71875 q 1.5,0.40625 2.34375,1.51562 0.828125,1.09375 0.828125,2.8125 0,2.15625 -1.328125,3.42188 -1.328125,1.26562 -3.734375,1.26562 -2.484375,0 -3.859375,-1.26562 -1.375,-1.28125 -1.375,-3.32813 0,-1.98437 1.34375,-3.23437 1.34375,-1.25 3.796875,-1.25 0.140625,0 0.4375,0.0156 l 0,7.34375 q 1.625,-0.0937 2.484375,-0.92187 0.85937
5,-0.82813 0.859375,-2.0625 0,-0.90625 -0.46875,-1.54688 -0.484375,-0.65625 -1.546875,-1.04687 z m -2.703125,5.48437 0,-5.5 q -1.234375,0.10938 -1.859375,0.625 -0.96875,0.79688 -0.96875,2.07813 0,1.14062 0.78125,1.9375 0.765625,0.78125 2.046875,0.85937 z m 5.875,-11.84448 -9.859375,3.75 0,-1.76562 5.90625,-2.125 q 0.953125,-0.34375 1.984375,-0.625 -0.78125,-0.21875 -1.875,-0.625 l -6.015625,-2.1875 0,-1.71875 9.859375,3.73437 0,1.5625 z m -3.171875,-13.34375 0.21875,-1.71875 q 1.5,0.40625 2.34375,1.51563 0.828125,1.09375 0.828125,2.8125 0,2.15625 -1.328125,3.42187 -1.328125,1.26563 -3.734375,1.26563 -2.484375,0 -3.859375,-1.26563 -1.375,-1.28125 -1.375,-3.32812 0,-1.98438 1.34375,-3.23438 1.34375,-1.25 3.796875,-1.25 0.140625,0 0.4375,0.0156 l 0,7.34375 q 1.625,-0.0937 2.484375,-0.92188 0.859375,-0.82812 0.859375,-2.0625 0,-0.90625 -0.46875,-1.54687 -0.484375,-0.65625 -1.546875,-1.04688 z m -2.703125,5.48438 0,-5.5 q -1.234375,0.10937 -1.859375,0.625 -0.96875,0.79687 -0.96875,2.0781
2 0,1.14063 0.78125,1.9375 0.765625,0.78125 2.046875,0.85938 z m 5.875,-9.07883 -13.59375,0 0,-1.67188 13.59375,0 0,1.67188 z m -4.921875,-3.55109 q -2.734375,0 -4.0625,-1.53125 -1.09375,-1.26562 -1.09375,-3.09375 0,-2.03125 1.34375,-3.3125 1.328125,-1.29687 3.671875,-1.29687 1.90625,0 3,0.57812 1.078125,0.5625 1.6875,1.65625 0.59375,1.07813 0.59375,2.375 0,2.0625 -1.328125,3.34375 -1.328125,1.28125 -3.8125,1.28125 z m 0,-1.71875 q 1.890625,0 2.828125,-0.82812 0.9375,-0.82813 0.9375,-2.07813 0,-1.25 -0.9375,-2.0625 -0.953125,-0.82812 -2.890625,-0.82812 -1.828125,0 -2.765625,0.82812 -0.9375,0.82813 -0.9375,2.0625 0,1.25 0.9375,2.07813 0.9375,0.82812 2.828125,0.82812 z m 8.703125,-9.28195 -13.640625,0 0,-1.53125 1.28125,0 q -0.75,-0.53125 -1.125,-1.20312 -0.375,-0.6875 -0.375,-1.64063 0,-1.26562 0.65625,-2.23437 0.640625,-0.96875 1.828125,-1.45313 1.1875,-0.5 2.59375,-0.5 1.515625,0 2.734375,0.54688 1.203125,0.54687 1.84375,1.57812 0.640625,1.03125 0.640625,2.17188 0,0.84375 -0.34375,
1.51562 -0.359375,0.65625 -0.890625,1.07813 l 4.796875,0 0,1.67187 z m -8.65625,-1.51562 q 1.90625,0 2.8125,-0.76563 0.90625,-0.78125 0.90625,-1.875 0,-1.10937 -0.9375,-1.89062 -0.9375,-0.79688 -2.921875,-0.79688 -1.875,0 -2.8125,0.78125 -0.9375,0.76563 -0.9375,1.84375 0,1.0625 1,1.89063 1,0.8125 2.890625,0.8125 z m 1.703125,-15.61011 0.21875,-1.71875 q 1.5,0.40625 2.34375,1.51562 0.828125,1.09375 0.828125,2.8125 0,2.15625 -1.328125,3.42188 -1.328125,1.26562 -3.734375,1.26562 -2.484375,0 -3.859375,-1.26562 -1.375,-1.28125 -1.375,-3.32813 0,-1.98437 1.34375,-3.23437 1.34375,-1.25 3.796875,-1.25 0.140625,0 0.4375,0.0156 l 0,7.34375 q 1.625,-0.0937 2.484375,-0.92187 0.859375,-0.82813 0.859375,-2.0625 0,-0.90625 -0.46875,-1.54688 -0.484375,-0.65625 -1.546875,-1.04687 z m -2.703125,5.48437 0,-5.5 q -1.234375,0.10938 -1.859375,0.625 -0.96875,0.79688 -0.96875,2.07813 0,1.14062 0.78125,1.9375 0.765625,0.78125 2.046875,0.85937 z m 5.875,-9.09446 -9.859375,0 0,-1.5 1.5,0 q -1.046875,-0.57813
-1.375,-1.0625 -0.34375,-0.48438 -0.34375,-1.07813 0,-0.84375 0.546875,-1.71875 l 1.546875,0.57813 q -0.359375,0.60937 -0.359375,1.23437 0,0.54688 0.328125,0.98438 0.328125,0.42187 0.90625,0.60937 0.890625,0.28125 1.953125,0.28125 l 5.15625,0 0,1.67188 z m 0,-11.66161 -13.59375,0 0,-6.03125 q 0,-1.8125 0.359375,-2.75 0.359375,-0.95312 1.296875,-1.51562 0.921875,-0.5625 2.046875,-0.5625 1.453125,0 2.453125,0.9375 0.984375,0.92187 1.25,2.89062 0.34375,-0.71875 0.671875,-1.09375 0.734375,-0.78125 1.8125,-1.48437 l 3.703125,-2.375 0,2.26562 -2.828125,1.79688 q -1.21875,0.79687 -1.875,1.3125 -0.65625,0.5 -0.90625,0.90625 -0.265625,0.40625 -0.359375,0.8125 -0.07813,0.3125 -0.07813,1.01562 l 0,2.07813 6.046875,0 0,1.79687 z m -7.59375,-1.79687 0,-3.85938 q 0,-1.23437 -0.25,-1.92187 -0.265625,-0.70313 -0.828125,-1.0625 -0.5625,-0.375 -1.21875,-0.375 -0.96875,0 -1.578125,0.70312 -0.625,0.70313 -0.625,2.21875 l 0,4.29688 4.5,0 z m 4.421875,-18.17607 0.21875,-1.71875 q 1.5,0.40625 2.34375,1.51
562 0.828125,1.09375 0.828125,2.8125 0,2.15625 -1.328125,3.42188 -1.328125,1.26562 -3.734375,1.26562 -2.484375,0 -3.859375,-1.26562 -1.375,-1.28125 -1.375,-3.32813 0,-1.98437 1.34375,-3.23437 1.34375,-1.25 3.796875,-1.25 0.140625,0 0.4375,0.0156 l 0,7.34375 q 1.625,-0.0937 2.484375,-0.92187 0.859375,-0.82813 0.859375,-2.0625 0,-0.90625 -0.46875,-1.54688 -0.484375,-0.65625 -1.546875,-1.04687 z m -2.703125,5.48437 0,-5.5 q -1.234375,0.10938 -1.859375,0.625 -0.96875,0.79688 -0.96875,2.07813 0,1.14062 0.78125,1.9375 0.765625,0.78125 2.046875,0.85937 z m 2.9375,-8.4382 -0.265625,-1.65625 q 1,-0.14063 1.53125,-0.76563 0.515625,-0.64062 0.515625,-1.78125 0,-1.15625 -0.46875,-1.70312 -0.46875,-0.5625 -1.09375,-0.5625 -0.5625,0 -0.890625,0.48437 -0.21875,0.34375 -0.5625,1.70313 -0.46875,1.84375 -0.796875,2.5625 -0.34375,0.70312 -0.9375,1.07812 -0.609375,0.35938 -1.328125,0.35938 -0.65625,0 -1.21875,-0.29688 -0.5625,-0.3125 -0.9375,-0.82812 -0.28125,-0.39063 -0.484375,-1.0625 -0.203125,-0.671
88 -0.203125,-1.4375 0,-1.17188 0.34375,-2.04688 0.328125,-0.875 0.90625,-1.28125 0.5625,-0.42187 1.515625,-0.57812 l 0.21875,1.625 q -0.75,0.10937 -1.171875,0.65625 -0.4375,0.53125 -0.4375,1.5 0,1.15625 0.390625,1.64062 0.375,0.48438 0.875,0.48438 0.328125,0 0.59375,-0.20313 0.265625,-0.20312 0.4375,-0.64062 0.09375,-0.25 0.4375,-1.46875 0.46875,-1.76563 0.765625,-2.46875 0.296875,-0.70313 0.875,-1.09375 0.578125,-0.40625 1.4375,-0.40625 0.828125,0 1.578125,0.48437 0.734375,0.48438 1.140625,1.40625 0.390625,0.92188 0.390625,2.07813 0,1.92187 -0.796875,2.9375 -0.796875,1 -2.359375,1.28125 z m 6.71875,-10 -13.640625,0 0,-1.53125 1.28125,0 q -0.75,-0.53125 -1.125,-1.20313 -0.375,-0.6875 -0.375,-1.64062 0,-1.26563 0.65625,-2.23438 0.640625,-0.96875 1.828125,-1.45312 1.1875,-0.5 2.59375,-0.5 1.515625,0 2.734375,0.54687 1.203125,0.54688 1.84375,1.57813 0.640625,1.03125 0.640625,2.17187 0,0.84375 -0.34375,1.51563 -0.359375,0.65625 -0.890625,1.07812 l 4.796875,0 0,1.67188 z m -8.65625,-1.5
1563 q 1.90625,0 2.8125,-0.76562 0.90625,-0.78125 0.90625,-1.875 0,-1.10938 -0.9375,-1.89063 -0.9375,-0.79687 -2.921875,-0.79687 -1.875,0 -2.8125,0.78125 -0.9375,0.76562 -0.9375,1.84375 0,1.0625 1,1.89062 1,0.8125 2.890625,0.8125 z m -0.04687,-8.2351 q -2.734375,0 -4.0625,-1.53125 -1.09375,-1.26563 -1.09375,-3.09375 0,-2.03125 1.34375,-3.3125 1.328125,-1.29688 3.671875,-1.29688 1.90625,0 3,0.57813 1.078125,0.5625 1.6875,1.65625 0.59375,1.07812 0.59375,2.375 0,2.0625 -1.328125,3.34375 -1.328125,1.28125 -3.8125,1.28125 z m 0,-1.71875 q 1.890625,0 2.828125,-0.82813 0.9375,-0.82812 0.9375,-2.07812 0,-1.25 -0.9375,-2.0625 -0.953125,-0.82813 -2.890625,-0.82813 -1.828125,0 -2.765625,0.82813 -0.9375,0.82812 -0.9375,2.0625 0,1.25 0.9375,2.07812 0.9375,0.82813 2.828125,0.82813 z m 4.921875,-9.28196 -9.859375,0 0,-1.5 1.40625,0 q -1.625,-1.09375 -1.625,-3.14062 0,-0.89063 0.328125,-1.64063 0.3125,-0.75 0.84375,-1.10937 0.515625,-0.375 1.21875,-0.53125 0.46875,-0.0937 1.625,-0.0937 l 6.0625,0 0
,1.67187 -6,0 q -1.015625,0 -1.515625,0.20313 -0.515625,0.1875 -0.8125,0.6875 -0.296875,0.5 -0.296875,1.17187 0,1.0625 0.671875,1.84375 0.671875,0.76563 2.578125,0.76563 l 5.375,0 0,1.67187 z m -2.9375,-9.70385 -0.265625,-1.65625 q 1,-0.14063 1.53125,-0.76563 0.515625,-0.64062 0.515625,-1.78125 0,-1.15625 -0.46875,-1.70312 -0.46875,-0.5625 -1.09375,-0.5625 -0.5625,0 -0.890625,0.48437 -0.21875,0.34375 -0.5625,1.70313 -0.46875,1.84375 -0.796875,2.5625 -0.34375,0.70312 -0.9375,1.07812 -0.609375,0.35938 -1.328125,0.35938 -0.65625,0 -1.21875,-0.29688 -0.5625,-0.3125 -0.9375,-0.82812 -0.28125,-0.39063 -0.484375,-1.0625 -0.203125,-0.67188 -0.203125,-1.4375 0,-1.17188 0.34375,-2.04688 0.328125,-0.875 0.90625,-1.28125 0.5625,-0.42187 1.515625,-0.57812 l 0.21875,1.625 q -0.75,0.10937 -1.171875,0.65625 -0.4375,0.53125 -0.4375,1.5 0,1.15625 0.390625,1.64062 0.375,0.48438 0.875,0.48438 0.328125,0 0.59375,-0.20313 0.265625,-0.20312 0.4375,-0.64062 0.09375,-0.25 0.4375,-1.46875 0.46875,-1.76563 0.
765625,-2.46875 0.296875,-0.70313 0.875,-1.09375 0.578125,-0.40625 1.4375,-0.40625 0.828125,0 1.578125,0.48437 0.734375,0.48438 1.140625,1.40625 0.390625,0.92188 0.390625,2.07813 0,1.92187 -0.796875,2.9375 -0.796875,1 -2.359375,1.28125 z m -8.75,-10.01563 -1.90625,0 0,-1.67187 1.90625,0 0,1.67187 z m 11.6875,0 -9.859375,0 0,-1.67187 9.859375,0 0,1.67187 z m 0,-5.67605 0,1.54687 -13.59375,0 0,-1.65625 4.84375,0 q -1.328125,-1.0625 -1.328125,-2.70312 0,-0.90625 0.375,-1.71875 0.359375,-0.8125 1.03125,-1.32813 0.65625,-0.53125 1.59375,-0.82812 0.9375,-0.29688 2,-0.29688 2.53125,0 3.921875,1.25 1.375,1.25 1.375,3 0,1.75 -1.453125,2.73438 l 1.234375,0 z m -5,0.0156 q 1.765625,0 2.5625,-0.46875 1.28125,-0.79687 1.28125,-2.14062 0,-1.09375 -0.9375,-1.89063 -0.953125,-0.79687 -2.84375,-0.79687 -1.921875,0 -2.84375,0.76562 -0.921875,0.76563 -0.921875,1.84375 0,1.09375 0.953125,1.89063 0.953125,0.79687 2.75,0.79687 z m -6.6875,-8.86011 -1.90625,0 0,-1.67187 1.90625,0 0,1.67187 z m 11.6875,0 -
9.859375,0 0,-1.67187 9.859375,0 0,1.67187 z m 0,-4.09793 -13.59375,0 0,-1.67187 13.59375,0 0,1.67187 z m -11.6875,-4.19171 -1.90625,0 0,-1.67187 1.90625,0 0,1.67187 z m 11.6875,0 -9.859375,0 0,-1.67187 9.859375,0 0,1.67187 z m -1.5,-7.78543 1.484375,-0.23437 q 0.140625,0.70312 0.140625,1.26562 0,0.90625 -0.28125,1.40625 -0.296875,0.5 -0.75,0.70313 -0.46875,0.20312 -1.984375,0.20312 l -5.65625,0 0,1.23438 -1.3125,0 0,-1.23438 -2.4375,0 -1,-1.65625 3.4375,0 0,-1.6875 1.3125,0 0,1.6875 5.75,0 q 0.71875,0 0.921875,-0.0781 0.203125,-0.0937 0.328125,-0.29688 0.125,-0.20312 0.125,-0.57812 0,-0.26563 -0.07813,-0.73438 z m 5.296875,-1.44894 -1.5625,0.17187 q 0.140625,-0.54687 0.140625,-0.95312 0,-0.54688 -0.1875,-0.875 -0.1875,-0.34375 -0.515625,-0.5625 -0.25,-0.15625 -1.25,-0.50001 -0.140625,-0.0469 -0.40625,-0.15625 l -9.875,3.73438 0,-1.79687 5.71875,-2.04689 q 1.078125,-0.40625 2.28125,-0.71875 -1.15625,-0.28125 -2.25,-0.6875 l -5.75,-2.09375 0,-1.67187 10.03125,3.75 q 1.625,0.59375 2.2
34375,0.9375 0.828125,0.4375 1.203125,1.01563 0.390625,0.57813 0.390625,1.375 0,0.48438 -0.203125,1.07813 z" id="path215" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 56.020996,676.14435 0,-245.88974 29.732285,0 0,245.88974 z" id="path217" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 78.565994,646.1725 -0.140625,-1.6875 q 1.015625,-0.125 1.671875,-0.5625 0.65625,-0.4375 1.0625,-1.35937 0.40625,-0.9375 0.40625,-2.09375 0,-1.03125 -0.3125,-1.8125 -0.3125,-0.79688 -0.84375,-1.1875 -0.53125,-0.39063 -1.15625,-0.39063 -0.640625,0 -1.109375,0.375 -0.484375,0.375 -0.8125,1.23438 -0.21875,0.54687 -0.65625,2.42187 -0.453125,1.875 -0.859375,2.625 -0.515625,0.96875 -1.265625,1.45313 -0.75,0.46875 -1.6875,0.46875 -1.03125,0 -1.921875,-0.57813 -0.90625,-0.59375 -1.359375,-1.70312 -0.46875,-1.125 -0.46875,-2.5 0,-1.51563 0.484375,-2.67188 0.484375,-1.15625 1.4375,-1.76562 0.9375,-0.625 2.140625,-0.67188 l 0.125,1.71875 q -1.28125,0.14063 -1.9375,0.95313 -0.671875,0.79687 -0.671875,2.35937 0,1.625 0.609375,2.375 0.59375,0.75 1.4375,0.75 0.734375,0 1.203125,-0.53125 0.46875,-0.51562 0.96875,-2.70312 0.5,-2.20313 0.875,-3.01563 0.546875,-1.1875 1.390625,-1.75 0.828125,-0.57812 1.921875,-0.57812 1.09375,0 2.0625,0.625 0.953125,0.625 1.484375,1.79687 0.53125,1.15625
0.53125,2.60938 0,1.84375 -0.53125,3.09375 -0.546875,1.25 -1.625,1.96875 -1.078125,0.70312 -2.453125,0.73437 z m 8.171875,-12.7561 -1.5625,0.17187 q 0.140625,-0.54687 0.140625,-0.95312 0,-0.54688 -0.1875,-0.875 -0.1875,-0.34375 -0.515625,-0.5625 -0.25,-0.15625 -1.25,-0.5 -0.140625,-0.0469 -0.40625,-0.15625 l -9.875,3.73437 0,-1.79687 5.71875,-2.04688 q 1.078125,-0.40625 2.28125,-0.71875 -1.15625,-0.28125 -2.25,-0.6875 l -5.75,-2.09375 0,-1.67187 10.03125,3.75 q 1.625,0.59375 2.234375,0.9375 0.828125,0.4375 1.203125,1.01562 0.390625,0.57813 0.390625,1.375 0,0.48438 -0.203125,1.07813 z m -6.734375,-8.73438 -0.265625,-1.65625 q 1,-0.14062 1.53125,-0.76562 0.515625,-0.64063 0.515625,-1.78125 0,-1.15625 -0.46875,-1.70313 -0.46875,-0.5625 -1.09375,-0.5625 -0.5625,0 -0.890625,0.48438 -0.21875,0.34375 -0.5625,1.70312 -0.46875,1.84375 -0.796875,2.5625 -0.34375,0.70313 -0.9375,1.07813 -0.609375,0.35937 -1.328125,0.35937 -0.65625,0 -1.21875,-0.29687 -0.5625,-0.3125 -0.9375,-0.82813 -0.28125,-
0.39062 -0.484375,-1.0625 -0.203125,-0.67187 -0.203125,-1.4375 0,-1.17187 0.34375,-2.04687 0.328125,-0.875 0.90625,-1.28125 0.5625,-0.42188 1.515625,-0.57813 l 0.21875,1.625 q -0.75,0.10938 -1.171875,0.65625 -0.4375,0.53125 -0.4375,1.5 0,1.15625 0.390625,1.64063 0.375,0.48437 0.875,0.48437 0.328125,0 0.59375,-0.20312 0.265625,-0.20313 0.4375,-0.64063 0.09375,-0.25 0.4375,-1.46875 0.46875,-1.76562 0.765625,-2.46875 0.296875,-0.70312 0.875,-1.09375 0.578125,-0.40625 1.4375,-0.40625 0.828125,0 1.578125,0.48438 0.734375,0.48437 1.140625,1.40625 0.390625,0.92187 0.390625,2.07812 0,1.92188 -0.796875,2.9375 -0.796875,1 -2.359375,1.28125 z m 1.4375,-13.65625 1.484375,-0.23437 q 0.140625,0.70312 0.140625,1.26562 0,0.90625 -0.28125,1.40625 -0.296875,0.5 -0.75,0.70313 -0.46875,0.20312 -1.984375,0.20312 l -5.65625,0 0,1.23438 -1.3125,0 0,-1.23438 -2.4375,0 -1,-1.65625 3.4375,0 0,-1.6875 1.3125,0 0,1.6875 5.75,0 q 0.71875,0 0.921875,-0.0781 0.203125,-0.0937 0.328125,-0.29688 0.125,-0.20312 0.125
,-0.57812 0,-0.26563 -0.07813,-0.73438 z m -1.671875,-8.27704 0.21875,-1.71875 q 1.5,0.40625 2.34375,1.51563 0.828125,1.09375 0.828125,2.8125 0,2.15625 -1.328125,3.42187 -1.328125,1.26563 -3.734375,1.26563 -2.484375,0 -3.859375,-1.26563 -1.375,-1.28125 -1.375,-3.32812 0,-1.98438 1.34375,-3.23438 1.34375,-1.25 3.796875,-1.25 0.140625,0 0.4375,0.0156 l 0,7.34375 q 1.625,-0.0937 2.484375,-0.92188 0.859375,-0.82812 0.859375,-2.0625 0,-0.90625 -0.46875,-1.54687 -0.484375,-0.65625 -1.546875,-1.04688 z m -2.703125,5.48438 0,-5.5 q -1.234375,0.10937 -1.859375,0.625 -0.96875,0.79687 -0.96875,2.07812 0,1.14063 0.78125,1.9375 0.765625,0.78125 2.046875,0.85938 z m 5.875,-9.11011 -9.859375,0 0,-1.5 1.390625,0 q -0.71875,-0.45312 -1.15625,-1.21875 -0.453125,-0.78125 -0.453125,-1.76562 0,-1.09375 0.453125,-1.79688 0.453125,-0.70312 1.28125,-0.98437 -1.734375,-1.17188 -1.734375,-3.04688 0,-1.46875 0.8125,-2.25 0.8125,-0.79687 2.5,-0.79687 l 6.765625,0 0,1.67187 -6.203125,0 q -1,0 -1.4375,0.15625 -0
.453125,0.15625 -0.71875,0.59375 -0.265625,0.42188 -0.265625,1 0,1.03125 0.6875,1.71875 0.6875,0.6875 2.21875,0.6875 l 5.71875,0 0,1.67188 -6.40625,0 q -1.109375,0 -1.65625,0.40625 -0.5625,0.40625 -0.5625,1.34375 0,0.70312 0.375,1.3125 0.359375,0.59375 1.078125,0.85937 0.71875,0.26563 2.0625,0.26563 l 5.109375,0 0,1.67187 z m 0,-26.15741 -13.59375,0 0,-6.03125 q 0,-1.8125 0.359375,-2.75 0.359375,-0.95312 1.296875,-1.51562 0.921875,-0.5625 2.046875,-0.5625 1.453125,0 2.453125,0.9375 0.984375,0.92187 1.25,2.89062 0.34375,-0.71875 0.671875,-1.09375 0.734375,-0.78125 1.8125,-1.48437 l 3.703125,-2.375 0,2.26562 -2.828125,1.79688 q -1.21875,0.79687 -1.875,1.3125 -0.65625,0.5 -0.90625,0.90625 -0.265625,0.40625 -0.359375,0.8125 -0.07813,0.3125 -0.07813,1.01562 l 0,2.07813 6.046875,0 0,1.79687 z m -7.59375,-1.79687 0,-3.85938 q 0,-1.23437 -0.25,-1.92187 -0.265625,-0.70313 -0.828125,-1.0625 -0.5625,-0.375 -1.21875,-0.375 -0.96875,0 -1.578125,0.70312 -0.625,0.70313 -0.625,2.21875 l 0,4.29688 4
.5,0 z m 4.421875,-18.17603 0.21875,-1.71875 q 1.5,0.40625 2.34375,1.51563 0.828125,1.09375 0.828125,2.8125 0,2.15625 -1.328125,3.42187 -1.328125,1.26563 -3.734375,1.26563 -2.484375,0 -3.859375,-1.26563 -1.375,-1.28125 -1.375,-3.32812 0,-1.98438 1.34375,-3.23438 1.34375,-1.25 3.796875,-1.25 0.140625,0 0.4375,0.0156 l 0,7.34375 q 1.625,-0.0937 2.484375,-0.92188 0.859375,-0.82812 0.859375,-2.0625 0,-0.90625 -0.46875,-1.54687 -0.484375,-0.65625 -1.546875,-1.04688 z m -2.703125,5.48438 0,-5.5 q -1.234375,0.10937 -1.859375,0.625 -0.96875,0.79687 -0.96875,2.07812 0,1.14063 0.78125,1.9375 0.765625,0.78125 2.046875,0.85938 z m 2.9375,-8.43824 -0.265625,-1.65625 q 1,-0.14062 1.53125,-0.76562 0.515625,-0.64063 0.515625,-1.78125 0,-1.15625 -0.46875,-1.70313 -0.46875,-0.5625 -1.09375,-0.5625 -0.5625,0 -0.890625,0.48438 -0.21875,0.34375 -0.5625,1.70312 -0.46875,1.84375 -0.796875,2.5625 -0.34375,0.70313 -0.9375,1.07813 -0.609375,0.35937 -1.328125,0.35937 -0.65625,0 -1.21875,-0.29687 -0.5625,-0.31
25 -0.9375,-0.82813 -0.28125,-0.39062 -0.484375,-1.0625 -0.203125,-0.67187 -0.203125,-1.4375 0,-1.17187 0.34375,-2.04687 0.328125,-0.875 0.90625,-1.28125 0.5625,-0.42188 1.515625,-0.57813 l 0.21875,1.625 q -0.75,0.10938 -1.171875,0.65625 -0.4375,0.53125 -0.4375,1.5 0,1.15625 0.390625,1.64063 0.375,0.48437 0.875,0.48437 0.328125,0 0.59375,-0.20312 0.265625,-0.20313 0.4375,-0.64063 0.09375,-0.25 0.4375,-1.46875 0.46875,-1.76562 0.765625,-2.46875 0.296875,-0.70312 0.875,-1.09375 0.578125,-0.40625 1.4375,-0.40625 0.828125,0 1.578125,0.48438 0.734375,0.48437 1.140625,1.40625 0.390625,0.92187 0.390625,2.07812 0,1.92188 -0.796875,2.9375 -0.796875,1 -2.359375,1.28125 z m 6.71875,-10 -13.640625,0 0,-1.53125 1.28125,0 q -0.75,-0.53125 -1.125,-1.20312 -0.375,-0.6875 -0.375,-1.64063 0,-1.26562 0.65625,-2.23437 0.640625,-0.96875 1.828125,-1.45313 1.1875,-0.5 2.59375,-0.5 1.515625,0 2.734375,0.54688 1.203125,0.54687 1.84375,1.57812 0.640625,1.03125 0.640625,2.17188 0,0.84375 -0.34375,1.51562 -0.3
59375,0.65625 -0.890625,1.07813 l 4.796875,0 0,1.67187 z m -8.65625,-1.51562 q 1.90625,0 2.8125,-0.76563 0.90625,-0.78125 0.90625,-1.875 0,-1.10937 -0.9375,-1.89062 -0.9375,-0.79688 -2.921875,-0.79688 -1.875,0 -2.8125,0.78125 -0.9375,0.76563 -0.9375,1.84375 0,1.0625 1,1.89063 1,0.8125 2.890625,0.8125 z m -0.04687,-8.23511 q -2.734375,0 -4.0625,-1.53125 -1.09375,-1.26562 -1.09375,-3.09375 0,-2.03125 1.34375,-3.3125 1.328125,-1.29687 3.671875,-1.29687 1.90625,0 3,0.57812 1.078125,0.5625 1.6875,1.65625 0.59375,1.07813 0.59375,2.375 0,2.0625 -1.328125,3.34375 -1.328125,1.28125 -3.8125,1.28125 z m 0,-1.71875 q 1.890625,0 2.828125,-0.82812 0.9375,-0.82813 0.9375,-2.07813 0,-1.25 -0.9375,-2.0625 -0.953125,-0.82812 -2.890625,-0.82812 -1.828125,0 -2.765625,0.82812 -0.9375,0.82813 -0.9375,2.0625 0,1.25 0.9375,2.07813 0.9375,0.82812 2.828125,0.82812 z m 4.921875,-9.28198 -9.859375,0 0,-1.5 1.40625,0 q -1.625,-1.09375 -1.625,-3.14063 0,-0.89062 0.328125,-1.64062 0.3125,-0.75 0.84375,-1.10938 0.
515625,-0.375 1.21875,-0.53125 0.46875,-0.0937 1.625,-0.0937 l 6.0625,0 0,1.67188 -6,0 q -1.015625,0 -1.515625,0.20312 -0.515625,0.1875 -0.8125,0.6875 -0.296875,0.5 -0.296875,1.17188 0,1.0625 0.671875,1.84375 0.671875,0.76562 2.578125,0.76562 l 5.375,0 0,1.67188 z m -2.9375,-9.70383 -0.265625,-1.65625 q 1,-0.14062 1.53125,-0.76562 0.515625,-0.64063 0.515625,-1.78125 0,-1.15625 -0.46875,-1.70313 -0.46875,-0.5625 -1.09375,-0.5625 -0.5625,0 -0.890625,0.48438 -0.21875,0.34375 -0.5625,1.70312 -0.46875,1.84375 -0.796875,2.5625 -0.34375,0.70313 -0.9375,1.07813 -0.609375,0.35937 -1.328125,0.35937 -0.65625,0 -1.21875,-0.29687 -0.5625,-0.3125 -0.9375,-0.82813 -0.28125,-0.39062 -0.484375,-1.0625 -0.203125,-0.67187 -0.203125,-1.4375 0,-1.17187 0.34375,-2.04687 0.328125,-0.875 0.90625,-1.28125 0.5625,-0.42188 1.515625,-0.57813 l 0.21875,1.625 q -0.75,0.10938 -1.171875,0.65625 -0.4375,0.53125 -0.4375,1.5 0,1.15625 0.390625,1.64063 0.375,0.48437 0.875,0.48437 0.328125,0 0.59375,-0.20312 0.265625,-
0.20313 0.4375,-0.64063 0.09375,-0.25 0.4375,-1.46875 0.46875,-1.76562 0.765625,-2.46875 0.296875,-0.70312 0.875,-1.09375 0.578125,-0.40625 1.4375,-0.40625 0.828125,0 1.578125,0.48438 0.734375,0.48437 1.140625,1.40625 0.390625,0.92187 0.390625,2.07812 0,1.92188 -0.796875,2.9375 -0.796875,1 -2.359375,1.28125 z m -8.75,-10.01562 -1.90625,0 0,-1.67188 1.90625,0 0,1.67188 z m 11.6875,0 -9.859375,0 0,-1.67188 9.859375,0 0,1.67188 z m 0,-5.67609 0,1.54688 -13.59375,0 0,-1.65625 4.84375,0 q -1.328125,-1.0625 -1.328125,-2.70313 0,-0.90625 0.375,-1.71875 0.359375,-0.8125 1.03125,-1.32812 0.65625,-0.53125 1.59375,-0.82813 0.9375,-0.29687 2,-0.29687 2.53125,0 3.921875,1.25 1.375,1.25 1.375,3 0,1.75 -1.453125,2.73437 l 1.234375,0 z m -5,0.0156 q 1.765625,0 2.5625,-0.46875 1.28125,-0.79688 1.28125,-2.14063 0,-1.09375 -0.9375,-1.89062 -0.953125,-0.79688 -2.84375,-0.79688 -1.921875,0 -2.84375,0.76563 -0.921875,0.76562 -0.921875,1.84375 0,1.09375 0.953125,1.89062 0.953125,0.79688 2.75,0.79688 z m -
6.6875,-8.86008 -1.90625,0 0,-1.67188 1.90625,0 0,1.67188 z m 11.6875,0 -9.859375,0 0,-1.67188 9.859375,0 0,1.67188 z m 0,-4.09796 -13.59375,0 0,-1.67188 13.59375,0 0,1.67188 z m -11.6875,-4.19168 -1.90625,0 0,-1.67188 1.90625,0 0,1.67188 z m 11.6875,0 -9.859375,0 0,-1.67188 9.859375,0 0,1.67188 z m -1.5,-7.78546 1.484375,-0.23438 q 0.140625,0.70313 0.140625,1.26563 0,0.90625 -0.28125,1.40625 -0.296875,0.5 -0.75,0.70312 -0.46875,0.20313 -1.984375,0.20313 l -5.65625,0 0,1.23437 -1.3125,0 0,-1.23437 -2.4375,0 -1,-1.65625 3.4375,0 0,-1.6875 1.3125,0 0,1.6875 5.75,0 q 0.71875,0 0.921875,-0.0781 0.203125,-0.0937 0.328125,-0.29687 0.125,-0.20313 0.125,-0.57813 0,-0.26562 -0.07813,-0.73437 z m 5.296875,-1.44892 -1.5625,0.17188 q 0.140625,-0.54688 0.140625,-0.95313 0,-0.54687 -0.1875,-0.875 -0.1875,-0.34375 -0.515625,-0.5625 -0.25,-0.15625 -1.25,-0.5 -0.140625,-0.0469 -0.40625,-0.15625 l -9.875,3.73438 0,-1.79688 5.71875,-2.04687 q 1.078125,-0.40625 2.28125,-0.71875 -1.15625,-0.28125 -2.25,
-0.6875 l -5.75,-2.09375 0,-1.67188 10.03125,3.75 q 1.625,0.59375 2.234375,0.9375 0.828125,0.4375 1.203125,1.01563 0.390625,0.57812 0.390625,1.375 0,0.48437 -0.203125,1.07812 z" id="path219" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ </g>
+</svg>
diff --git a/doc/images/abi_traditional.svg b/doc/images/abi_traditional.svg
new file mode 100644
index 0000000..f9046e1
--- /dev/null
+++ b/doc/images/abi_traditional.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" viewBox="0 0 959.57743 760.31496" stroke-miterlimit="10" id="svg2" inkscape:version="0.91 r13725" sodipodi:docname="ABI Traditional.svg" width="959.57745" height="760.31494" style="fill:none;stroke:none;stroke-linecap:square;stroke-miterlimit:10">
+ <metadata id="metadata153">
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs id="defs151"/>
+ <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="737" inkscape:window-height="480" id="namedview149" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:zoom="0.30951123" inkscape:cx="479.78873" inkscape:cy="380.15747" inkscape:window-x="65" inkscape:window-y="24" inkscape:window-maximized="0" inkscape:current-layer="svg2"/>
+ <clipPath id="p.0">
+ <path d="m 0,0 959.57745,0 0,760.31494 L 0,760.31494 0,0 Z" id="path5" inkscape:connector-curvature="0" style="clip-rule:nonzero"/>
+ </clipPath>
+ <g clip-path="url(#p.0)" id="g7">
+ <path d="m 0,0 959.57745,0 0,760.31494 -959.57745,0 z" id="path9" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 120.91076,40.913387 272.9134,0 0,69.952763 -272.9134,0 z" id="path11" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 120.91076,40.913387 272.9134,0 0,69.952763 -272.9134,0 z" id="path13" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 179.04715,87.609764 8.79687,-22.90625 3.26563,0 9.375,22.90625 -3.45313,0 -2.67187,-6.9375 -9.57813,0 -2.51562,6.9375 -3.21875,0 z m 6.60937,-9.40625 7.76563,0 -2.39063,-6.34375 q -1.09375,-2.890625 -1.625,-4.75 -0.4375,2.203125 -1.23437,4.375 l -2.51563,6.71875 z m 16.89063,15.765625 0,-22.953125 2.5625,0 0,2.15625 q 0.90625,-1.265625 2.04687,-1.890625 1.14063,-0.640625 2.76563,-0.640625 2.125,0 3.75,1.09375 1.625,1.09375 2.45312,3.09375 0.82813,1.984375 0.82813,4.359375 0,2.546875 -0.92188,4.59375 -0.90625,2.03125 -2.65625,3.125 -1.73437,1.078125 -3.65625,1.078125 -1.40625,0 -2.53125,-0.59375 -1.10937,-0.59375 -1.82812,-1.5 l 0,8.078125 -2.8125,0 z m 2.54687,-14.5625 q 0,3.203125 1.29688,4.734375 1.29687,1.53125 3.14062,1.53125 1.875,0 3.20313,-1.578125 1.34375,-1.59375 1.34375,-4.921875 0,-3.171875 -1.3125,-4.75 -1.29688,-1.578125 -3.10938,-1.578125 -1.79687,0 -3.1875,1.6875 -1.375,1.671875 -1.375,4.875 z m 15.25,14.5625 0,-22.953125 2.5625,0 0,2.15625 q 0.90625,-1
.265625 2.04688,-1.890625 1.14062,-0.640625 2.76562,-0.640625 2.125,0 3.75,1.09375 1.625,1.09375 2.45313,3.09375 0.82812,1.984375 0.82812,4.359375 0,2.546875 -0.92187,4.59375 -0.90625,2.03125 -2.65625,3.125 -1.73438,1.078125 -3.65625,1.078125 -1.40625,0 -2.53125,-0.59375 -1.10938,-0.59375 -1.82813,-1.5 l 0,8.078125 -2.8125,0 z m 2.54688,-14.5625 q 0,3.203125 1.29687,4.734375 1.29688,1.53125 3.14063,1.53125 1.875,0 3.20312,-1.578125 1.34375,-1.59375 1.34375,-4.921875 0,-3.171875 -1.3125,-4.75 -1.29687,-1.578125 -3.10937,-1.578125 -1.79688,0 -3.1875,1.6875 -1.375,1.671875 -1.375,4.875 z m 15.1875,8.203125 0,-22.90625 2.8125,0 0,22.90625 -2.8125,0 z m 7.1875,-19.671875 0,-3.234375 2.8125,0 0,3.234375 -2.8125,0 z m 0,19.671875 0,-16.59375 2.8125,0 0,16.59375 -2.8125,0 z m 17.92187,-6.078125 2.76563,0.359375 q -0.45313,2.859375 -2.32813,4.484375 -1.85937,1.609375 -4.57812,1.609375 -3.40625,0 -5.48438,-2.21875 -2.0625,-2.234375 -2.0625,-6.390625 0,-2.6875 0.89063,-4.703125 0.89062,-2.0156
25 2.70312,-3.015625 1.82813,-1.015625 3.96875,-1.015625 2.70313,0 4.42188,1.375 1.71875,1.359375 2.20312,3.875 l -2.73437,0.421875 q -0.39063,-1.671875 -1.39063,-2.515625 -0.98437,-0.84375 -2.39062,-0.84375 -2.125,0 -3.45313,1.53125 -1.32812,1.515625 -1.32812,4.8125 0,3.34375 1.28125,4.859375 1.28125,1.515625 3.34375,1.515625 1.65625,0 2.76562,-1.015625 1.10938,-1.015625 1.40625,-3.125 z m 16,4.03125 q -1.5625,1.328125 -3.01562,1.875 -1.4375,0.546875 -3.09375,0.546875 -2.73438,0 -4.20313,-1.328125 -1.46875,-1.34375 -1.46875,-3.421875 0,-1.21875 0.54688,-2.21875 0.5625,-1.015625 1.45312,-1.625 0.90625,-0.609375 2.03125,-0.921875 0.82813,-0.21875 2.5,-0.421875 3.40625,-0.40625 5.01563,-0.96875 0.0156,-0.578125 0.0156,-0.734375 0,-1.71875 -0.79687,-2.421875 -1.07813,-0.953125 -3.20313,-0.953125 -1.98437,0 -2.9375,0.703125 -0.9375,0.6875 -1.39062,2.453125 l -2.75,-0.375 q 0.375,-1.765625 1.23437,-2.84375 0.85938,-1.09375 2.48438,-1.671875 1.625,-0.59375 3.76562,-0.59375 2.125,0 3.45313
,0.5 1.32812,0.5 1.95312,1.265625 0.625,0.75 0.875,1.90625 0.14063,0.71875 0.14063,2.59375 l 0,3.75 q 0,3.921875 0.17187,4.96875 0.1875,1.03125 0.71875,1.984375 l -2.9375,0 q -0.4375,-0.875 -0.5625,-2.046875 z m -0.23437,-6.28125 q -1.53125,0.625 -4.59375,1.0625 -1.73438,0.25 -2.45313,0.5625 -0.71875,0.3125 -1.10937,0.921875 -0.39063,0.59375 -0.39063,1.328125 0,1.125 0.84375,1.875 0.85938,0.75 2.5,0.75 1.625,0 2.89063,-0.703125 1.26562,-0.71875 1.85937,-1.953125 0.45313,-0.953125 0.45313,-2.8125 l 0,-1.03125 z m 13.34375,5.8125 0.40625,2.484375 q -1.1875,0.25 -2.125,0.25 -1.53125,0 -2.375,-0.484375 -0.84375,-0.484375 -1.1875,-1.265625 -0.34375,-0.796875 -0.34375,-3.328125 l 0,-9.546875 -2.0625,0 0,-2.1875 2.0625,0 0,-4.109375 2.79687,-1.6875 0,5.796875 2.82813,0 0,2.1875 -2.82813,0 0,9.703125 q 0,1.203125 0.14063,1.546875 0.15625,0.34375 0.48437,0.546875 0.34375,0.203125 0.96875,0.203125 0.46875,0 1.23438,-0.109375 z m 2.76562,-17.15625 0,-3.234375 2.8125,0 0,3.234375 -2.8125,0 z m
0,19.671875 0,-16.59375 2.8125,0 0,16.59375 -2.8125,0 z m 6.04688,-8.296875 q 0,-4.609375 2.5625,-6.828125 2.14062,-1.84375 5.21875,-1.84375 3.42187,0 5.59375,2.25 2.17187,2.234375 2.17187,6.1875 0,3.203125 -0.96875,5.046875 -0.95312,1.828125 -2.79687,2.84375 -1.82813,1.015625 -4,1.015625 -3.48438,0 -5.64063,-2.234375 -2.14062,-2.234375 -2.14062,-6.4375 z m 2.89062,0 q 0,3.1875 1.39063,4.78125 1.39062,1.578125 3.5,1.578125 2.09375,0 3.48437,-1.59375 1.39063,-1.59375 1.39063,-4.859375 0,-3.078125 -1.40625,-4.65625 -1.39063,-1.59375 -3.46875,-1.59375 -2.10938,0 -3.5,1.578125 -1.39063,1.578125 -1.39063,4.765625 z m 15.95313,8.296875 0,-16.59375 2.53125,0 0,2.359375 q 1.82812,-2.734375 5.28125,-2.734375 1.5,0 2.75,0.546875 1.26562,0.53125 1.89062,1.40625 0.625,0.875 0.875,2.078125 0.15625,0.78125 0.15625,2.734375 l 0,10.203125 -2.8125,0 0,-10.09375 q 0,-1.71875 -0.32812,-2.5625 -0.32813,-0.859375 -1.17188,-1.359375 -0.82812,-0.515625 -1.95312,-0.515625 -1.79688,0 -3.10938,1.140625 -1.29
687,1.140625 -1.29687,4.328125 l 0,9.0625 -2.8125,0 z" id="path15" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 120.91076,176.91339 272.9134,0 0,69.95274 -272.9134,0 z" id="path17" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 120.91076,176.91339 272.9134,0 0,69.95274 -272.9134,0 z" id="path19" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 209.84402,201.05476 q 0,-4.26563 2.29687,-6.6875 2.29688,-2.42188 5.9375,-2.42188 2.375,0 4.28125,1.14063 1.92188,1.125 2.92188,3.17187 1,2.03125 1,4.60938 0,2.60937 -1.0625,4.67187 -1.04688,2.0625 -2.98438,3.125 -1.9375,1.0625 -4.17187,1.0625 -2.42188,0 -4.34375,-1.17187 -1.90625,-1.17188 -2.89063,-3.20313 -0.98437,-2.03125 -0.98437,-4.29687 z m 2.34375,0.0469 q 0,3.09375 1.67187,4.89063 1.67188,1.78125 4.1875,1.78125 2.57813,0 4.23438,-1.79688 1.65625,-1.8125 1.65625,-5.125 0,-2.09375 -0.71875,-3.65625 -0.70313,-1.57812 -2.07813,-2.4375 -1.35937,-0.85937 -3.04687,-0.85937 -2.42188,0 -4.17188,1.65625 -1.73437,1.65625 -1.73437,5.54687 z m 17.02734,8.32813 0,-17.1875 5.90625,0 q 2.01563,0 3.0625,0.25 1.48438,0.34375 2.51563,1.23437 1.35937,1.14063 2.03125,2.9375 0.6875,1.78125 0.6875,4.07813 0,1.95312 -0.46875,3.46875 -0.45313,1.51562 -1.17188,2.51562 -0.70312,0.98438 -1.5625,1.54688 -0.84375,0.5625 -2.04687,0.85937 -1.20313,0.29688 -2.76563,0.29688 l -6.1875,0 z m 2.2
6563,-2.03125 3.67187,0 q 1.70313,0 2.65625,-0.3125 0.96875,-0.3125 1.54688,-0.89063 0.8125,-0.8125 1.26562,-2.17187 0.45313,-1.375 0.45313,-3.3125 0,-2.70313 -0.89063,-4.14063 -0.89062,-1.45312 -2.15625,-1.9375 -0.90625,-0.35937 -2.9375,-0.35937 l -3.60937,0 0,13.125 z m 15.0664,2.03125 0,-17.1875 6.46875,0 q 1.71875,0 2.625,0.17187 1.26563,0.20313 2.10938,0.79688 0.85937,0.59375 1.375,1.67187 0.53125,1.0625 0.53125,2.32813 0,2.20312 -1.40625,3.71875 -1.39063,1.51562 -5.03125,1.51562 l -4.40625,0 0,6.98438 -2.26563,0 z m 2.26563,-9.01563 4.4375,0 q 2.20312,0 3.125,-0.8125 0.9375,-0.82812 0.9375,-2.3125 0,-1.07812 -0.54688,-1.84375 -0.54687,-0.76562 -1.4375,-1.01562 -0.57812,-0.15625 -2.125,-0.15625 l -4.39062,0 0,6.14062 z m 18.51953,9.01563 6.59375,-17.1875 2.45313,0 7.03125,17.1875 -2.59375,0 -2,-5.20313 -7.1875,0 -1.89063,5.20313 -2.40625,0 z m 4.95313,-7.0625 5.82812,0 -1.79687,-4.75 q -0.8125,-2.17188 -1.21875,-3.5625 -0.32813,1.65625 -0.92188,3.28125 l -1.89062,5.03125 z m 12
.94531,7.0625 0,-17.1875 6.46875,0 q 1.71875,0 2.625,0.17187 1.26562,0.20313 2.10937,0.79688 0.85938,0.59375 1.375,1.67187 0.53125,1.0625 0.53125,2.32813 0,2.20312 -1.40625,3.71875 -1.39062,1.51562 -5.03125,1.51562 l -4.40625,0 0,6.98438 -2.26562,0 z m 2.26562,-9.01563 4.4375,0 q 2.20313,0 3.125,-0.8125 0.9375,-0.82812 0.9375,-2.3125 0,-1.07812 -0.54687,-1.84375 -0.54688,-0.76562 -1.4375,-1.01562 -0.57813,-0.15625 -2.125,-0.15625 l -4.39063,0 0,6.14062 z m 14.11719,9.01563 0,-17.1875 2.28125,0 0,17.1875 -2.28125,0 z" id="path21" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 180.98209,233.30977 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17188,0 -2.17188,-0.64063 -0.98437,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48438,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98437,-0.64063 2.20312,-0.64063 0.89063,0 1.57813,0.375 0.70312,0.375 1.14062,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54687,0 z m -5.28125,-4.92188 q 0,1.89063 0.79687,2.82813 0.8125,0.9375 1.89063,0.9375 1.09375,0 1.85937,-0.89063 0.76563,-0.89062 0.76563,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92188,-0.95312 -1.10937,0 -1.85937,0.90625 -0.75,0.90625 -0.75,2.85937 z m 16.01634,1.75 1.71875,0.21875 q -0.40625,1.5 -1.51562,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42188,-1.32813 -1.26562,-1.32812 -1.26562,-3.73437 0,-2.48438 1.26562,-3.85938 1.28125,-1.375 3.32813,-1.375 1.98437,0 3.23437,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92187,2.48437 0.82813,0.85938 2.0625,0.85938
0.90625,0 1.54688,-0.46875 0.65625,-0.48438 1.04687,-1.54688 z m -5.48437,-2.70312 5.5,0 q -0.10938,-1.23438 -0.625,-1.85938 -0.79688,-0.96875 -2.07813,-0.96875 -1.14062,0 -1.9375,0.78125 -0.78125,0.76563 -0.85937,2.04688 z m 9.51634,5.875 0,-8.54688 -1.48438,0 0,-1.3125 1.48438,0 0,-1.04687 q 0,-0.98438 0.17187,-1.46875 0.23438,-0.65625 0.84375,-1.04688 0.60938,-0.40625 1.70313,-0.40625 0.70312,0 1.5625,0.15625 l -0.25,1.46875 q -0.51563,-0.0937 -0.98438,-0.0937 -0.76562,0 -1.07812,0.32813 -0.3125,0.3125 -0.3125,1.20312 l 0,0.90625 1.92187,0 0,1.3125 -1.92187,0 0,8.54688 -1.65625,0 z m 4.79268,-11.6875 0,-1.90625 1.67187,0 0,1.90625 -1.67187,0 z m 0,11.6875 0,-9.85938 1.67187,0 0,9.85938 -1.67187,0 z m 4.12919,0 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32813 0.75,0.3125 1.10938,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01563 -0.20312,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.296
87 -1.17188,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76562,0.67188 -0.76562,2.57813 l 0,5.375 -1.67188,0 z m 17.12572,-3.17188 1.71875,0.21875 q -0.40625,1.5 -1.51562,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42188,-1.32813 -1.26562,-1.32812 -1.26562,-3.73437 0,-2.48438 1.26562,-3.85938 1.28125,-1.375 3.32813,-1.375 1.98437,0 3.23437,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92187,2.48437 0.82813,0.85938 2.0625,0.85938 0.90625,0 1.54688,-0.46875 0.65625,-0.48438 1.04687,-1.54688 z m -5.48437,-2.70312 5.5,0 q -0.10938,-1.23438 -0.625,-1.85938 -0.79688,-0.96875 -2.07813,-0.96875 -1.14062,0 -1.9375,0.78125 -0.78125,0.76563 -0.85937,2.04688 z m 15.50071,5.875 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17187,0 -2.17187,-0.64063 -0.98438,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48437,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98438,-0.64063 2.20313,-0.64063 0.89062,0 1.57812,0.375 0.70313,0.375 1.1406
3,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54688,0 z m -5.28125,-4.92188 q 0,1.89063 0.79688,2.82813 0.8125,0.9375 1.89062,0.9375 1.09375,0 1.85938,-0.89063 0.76562,-0.89062 0.76562,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92187,-0.95312 -1.10938,0 -1.85938,0.90625 -0.75,0.90625 -0.75,2.85937 z m 14.46527,-6.76562 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 4.1292,0 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32813 0.75,0.3125 1.10938,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01563 -0.20312,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17188,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76562,0.67188 -0.76562,2.57813 l 0,5.375 -1.67188,0 z m 14.93401,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26562,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29687,1.32813 1.29687,3.67188 0,1.90625 -0.57812,3 -0.5625,1.0
7812 -1.65625,1.6875 -1.07813,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82812,2.82813 0.82813,0.9375 2.07813,0.9375 1.25,0 2.0625,-0.9375 0.82812,-0.95313 0.82812,-2.89063 0,-1.82812 -0.82812,-2.76562 -0.82813,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07813,0.9375 -0.82812,0.9375 -0.82812,2.82812 z m 15.6726,4.92188 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17187,0 -2.17187,-0.64063 -0.98438,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48437,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98438,-0.64063 2.20313,-0.64063 0.89062,0 1.57812,0.375 0.70313,0.375 1.14063,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54688,0 z m -5.28125,-4.92188 q 0,1.89063 0.79688,2.82813 0.8125,0.9375 1.89062,0.9375 1.09375,0 1.85938,-0.89063 0.76562,-0.89062 0.76562,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92187,-0.95312 -1.10938,0 -1.85938,0.90625 -0.75,0.90625 -0.75,2.85937 z m 9.26633,8.70313 0,-13
.64063 1.53125,0 0,1.28125 q 0.53125,-0.75 1.20313,-1.125 0.6875,-0.375 1.64062,-0.375 1.26563,0 2.23438,0.65625 0.96875,0.64063 1.45312,1.82813 0.5,1.1875 0.5,2.59375 0,1.51562 -0.54687,2.73437 -0.54688,1.20313 -1.57813,1.84375 -1.03125,0.64063 -2.17187,0.64063 -0.84375,0 -1.51563,-0.34375 -0.65625,-0.35938 -1.07812,-0.89063 l 0,4.79688 -1.67188,0 z m 1.51563,-8.65625 q 0,1.90625 0.76562,2.8125 0.78125,0.90625 1.875,0.90625 1.10938,0 1.89063,-0.9375 0.79687,-0.9375 0.79687,-2.92188 0,-1.875 -0.78125,-2.8125 -0.76562,-0.9375 -1.84375,-0.9375 -1.0625,0 -1.89062,1 -0.8125,1 -0.8125,2.89063 z m 7.32885,8.65625 0,-1.21875 11.0625,0 0,1.21875 -11.0625,0 z m 18.34445,-5 q -0.9375,0.79687 -1.79687,1.125 -0.85938,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32813,-1.32813 0.32812,-0.59375 0.85937,-0.95312 0.53125,-0.35938 1.20313,-0.54688 0.5,-0.14062 1.48437,-0.25 2.03125,-0.25 2.98438,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.
4375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.23438 q 0.23438,-1.04687 0.73438,-1.6875 0.51562,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26562,0 2.04687,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51563,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10937,0.60938 0.4375,1.17188 l -1.75,0 q -0.26563,-0.51563 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35937 -2.73438,0.625 -1.03125,0.14062 -1.45312,0.32812 -0.42188,0.1875 -0.65625,0.54688 -0.23438,0.35937 -0.23438,0.79687 0,0.67188 0.5,1.125 0.51563,0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10937,-1.15625 0.26563,-0.57813 0.26563,-1.67188 l 0,-0.60937 z m 4.07886,8.71875 0,-13.64063 1.53125,0 0,1.28125 q 0.53125,-0.75 1.20312,-1.125 0.6875,-0.375 1.64063,-0.375 1.26562,0 2.23437,0.65625 0.96875,0.64063 1.45313,1.82813 0.5,1.1875 0.5,2.59375 0,1.51562 -0.54688,2.73437 -0.54687,1.20
313 -1.57812,1.84375 -1.03125,0.64063 -2.17188,0.64063 -0.84375,0 -1.51562,-0.34375 -0.65625,-0.35938 -1.07813,-0.89063 l 0,4.79688 -1.67187,0 z m 1.51562,-8.65625 q 0,1.90625 0.76563,2.8125 0.78125,0.90625 1.875,0.90625 1.10937,0 1.89062,-0.9375 0.79688,-0.9375 0.79688,-2.92188 0,-1.875 -0.78125,-2.8125 -0.76563,-0.9375 -1.84375,-0.9375 -1.0625,0 -1.89063,1 -0.8125,1 -0.8125,2.89063 z m 8.8757,-6.8125 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 4.59797,0 0,-1.90625 1.90625,0 0,1.90625 -1.90625,0 z m 4.71453,0 0,-13.59375 1.67188,0 0,4.875 q 1.17187,-1.35938 2.95312,-1.35938 1.09375,0 1.89063,0.4375 0.8125,0.42188 1.15625,1.1875 0.35937,0.76563 0.35937,2.20313 l 0,6.25 -1.67187,0 0,-6.25 q 0,-1.25 -0.54688,-1.8125 -0.54687,-0.57813 -1.53125,-0.57813 -0.75,0 -1.40625,0.39063 -0.64062,0.375 -0.92187,1.04687 -0.28125,0.65625 -0.28125,1.8125 l 0,5.39063 -1.67188,0 z" id="path23" inkscape:connector-curvature="0" style="fill:#00000
0;fill-rule:nonzero"/>
+ <path d="m 344.91077,448.9134 272.9134,0 0,69.95276 -272.9134,0 z" id="path25" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 344.91077,448.9134 272.9134,0 0,69.95276 -272.9134,0 z" id="path27" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 403.04715,476.60977 8.79687,-22.90625 3.26563,0 9.375,22.90625 -3.45313,0 -2.67187,-6.9375 -9.57813,0 -2.51562,6.9375 -3.21875,0 z m 6.60937,-9.40625 7.76563,0 -2.39063,-6.34375 q -1.09375,-2.89062 -1.625,-4.75 -0.4375,2.20313 -1.23437,4.375 l -2.51563,6.71875 z m 16.89063,15.76563 0,-22.95313 2.5625,0 0,2.15625 q 0.90625,-1.26562 2.04687,-1.89062 1.14063,-0.64063 2.76563,-0.64063 2.125,0 3.75,1.09375 1.625,1.09375 2.45312,3.09375 0.82813,1.98438 0.82813,4.35938 0,2.54687 -0.92188,4.59375 -0.90625,2.03125 -2.65625,3.125 -1.73437,1.07812 -3.65625,1.07812 -1.40625,0 -2.53125,-0.59375 -1.10937,-0.59375 -1.82812,-1.5 l 0,8.07813 -2.8125,0 z m 2.54687,-14.5625 q 0,3.20312 1.29688,4.73437 1.29687,1.53125 3.14062,1.53125 1.875,0 3.20313,-1.57812 1.34375,-1.59375 1.34375,-4.92188 0,-3.17187 -1.3125,-4.75 -1.29688,-1.57812 -3.10938,-1.57812 -1.79687,0 -3.1875,1.6875 -1.375,1.67187 -1.375,4.875 z m 15.25,14.5625 0,-22.95313 2.5625,0 0,2.15625 q 0.90625,-1.26562 2.04688,-1.89062
1.14062,-0.64063 2.76562,-0.64063 2.125,0 3.75,1.09375 1.625,1.09375 2.45313,3.09375 0.82812,1.98438 0.82812,4.35938 0,2.54687 -0.92187,4.59375 -0.90625,2.03125 -2.65625,3.125 -1.73438,1.07812 -3.65625,1.07812 -1.40625,0 -2.53125,-0.59375 -1.10938,-0.59375 -1.82813,-1.5 l 0,8.07813 -2.8125,0 z m 2.54688,-14.5625 q 0,3.20312 1.29687,4.73437 1.29688,1.53125 3.14063,1.53125 1.875,0 3.20312,-1.57812 1.34375,-1.59375 1.34375,-4.92188 0,-3.17187 -1.3125,-4.75 -1.29687,-1.57812 -3.10937,-1.57812 -1.79688,0 -3.1875,1.6875 -1.375,1.67187 -1.375,4.875 z m 15.1875,8.20312 0,-22.90625 2.8125,0 0,22.90625 -2.8125,0 z m 7.1875,-19.67187 0,-3.23438 2.8125,0 0,3.23438 -2.8125,0 z m 0,19.67187 0,-16.59375 2.8125,0 0,16.59375 -2.8125,0 z m 17.92187,-6.07812 2.76563,0.35937 q -0.45313,2.85938 -2.32813,4.48438 -1.85937,1.60937 -4.57812,1.60937 -3.40625,0 -5.48438,-2.21875 -2.0625,-2.23437 -2.0625,-6.39062 0,-2.6875 0.89063,-4.70313 0.89062,-2.01562 2.70312,-3.01562 1.82813,-1.01563 3.96875,-1.01563 2.
70313,0 4.42188,1.375 1.71875,1.35938 2.20312,3.875 l -2.73437,0.42188 q -0.39063,-1.67188 -1.39063,-2.51563 -0.98437,-0.84375 -2.39062,-0.84375 -2.125,0 -3.45313,1.53125 -1.32812,1.51563 -1.32812,4.8125 0,3.34375 1.28125,4.85938 1.28125,1.51562 3.34375,1.51562 1.65625,0 2.76562,-1.01562 1.10938,-1.01563 1.40625,-3.125 z m 16,4.03125 q -1.5625,1.32812 -3.01562,1.875 -1.4375,0.54687 -3.09375,0.54687 -2.73438,0 -4.20313,-1.32812 -1.46875,-1.34375 -1.46875,-3.42188 0,-1.21875 0.54688,-2.21875 0.5625,-1.01562 1.45312,-1.625 0.90625,-0.60937 2.03125,-0.92187 0.82813,-0.21875 2.5,-0.42188 3.40625,-0.40625 5.01563,-0.96875 0.0156,-0.57812 0.0156,-0.73437 0,-1.71875 -0.79687,-2.42188 -1.07813,-0.95312 -3.20313,-0.95312 -1.98437,0 -2.9375,0.70312 -0.9375,0.6875 -1.39062,2.45313 l -2.75,-0.375 q 0.375,-1.76563 1.23437,-2.84375 0.85938,-1.09375 2.48438,-1.67188 1.625,-0.59375 3.76562,-0.59375 2.125,0 3.45313,0.5 1.32812,0.5 1.95312,1.26563 0.625,0.75 0.875,1.90625 0.14063,0.71875 0.14063,2.593
75 l 0,3.75 q 0,3.92187 0.17187,4.96875 0.1875,1.03125 0.71875,1.98437 l -2.9375,0 q -0.4375,-0.875 -0.5625,-2.04687 z m -0.23437,-6.28125 q -1.53125,0.625 -4.59375,1.0625 -1.73438,0.25 -2.45313,0.5625 -0.71875,0.3125 -1.10937,0.92187 -0.39063,0.59375 -0.39063,1.32813 0,1.125 0.84375,1.875 0.85938,0.75 2.5,0.75 1.625,0 2.89063,-0.70313 1.26562,-0.71875 1.85937,-1.95312 0.45313,-0.95313 0.45313,-2.8125 l 0,-1.03125 z m 13.34372,5.8125 0.40625,2.48437 q -1.1875,0.25 -2.125,0.25 -1.53125,0 -2.375,-0.48437 -0.84372,-0.48438 -1.18747,-1.26563 -0.34375,-0.79687 -0.34375,-3.32812 l 0,-9.54688 -2.0625,0 0,-2.1875 2.0625,0 0,-4.10937 2.79684,-1.6875 0,5.79687 2.82813,0 0,2.1875 -2.82813,0 0,9.70313 q 0,1.20312 0.14063,1.54687 0.15625,0.34375 0.48437,0.54688 0.34375,0.20312 0.96875,0.20312 0.46875,0 1.23438,-0.10937 z m 2.76562,-17.15625 0,-3.23438 2.8125,0 0,3.23438 -2.8125,0 z m 0,19.67187 0,-16.59375 2.8125,0 0,16.59375 -2.8125,0 z m 6.04688,-8.29687 q 0,-4.60938 2.5625,-6.82813 2.14062,-1
.84375 5.21875,-1.84375 3.42187,0 5.59375,2.25 2.17187,2.23438 2.17187,6.1875 0,3.20313 -0.96875,5.04688 -0.95312,1.82812 -2.79687,2.84375 -1.82813,1.01562 -4,1.01562 -3.48438,0 -5.64063,-2.23437 -2.14062,-2.23438 -2.14062,-6.4375 z m 2.89062,0 q 0,3.1875 1.39063,4.78125 1.39062,1.57812 3.5,1.57812 2.09375,0 3.48437,-1.59375 1.39063,-1.59375 1.39063,-4.85937 0,-3.07813 -1.40625,-4.65625 -1.39063,-1.59375 -3.46875,-1.59375 -2.10938,0 -3.5,1.57812 -1.39063,1.57813 -1.39063,4.76563 z m 15.95313,8.29687 0,-16.59375 2.53125,0 0,2.35938 q 1.82812,-2.73438 5.28125,-2.73438 1.5,0 2.75,0.54688 1.26562,0.53125 1.89062,1.40625 0.625,0.875 0.875,2.07812 0.15625,0.78125 0.15625,2.73438 l 0,10.20312 -2.8125,0 0,-10.09375 q 0,-1.71875 -0.32812,-2.5625 -0.32813,-0.85937 -1.17188,-1.35937 -0.82812,-0.51563 -1.95312,-0.51563 -1.79688,0 -3.10938,1.14063 -1.29687,1.14062 -1.29687,4.32812 l 0,9.0625 -2.8125,0 z" id="path29" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 389.4456,514.60974 0,-22.90622 8.59375,0 q 2.625,0 4.20313,0.70312 1.59375,0.6875 2.48437,2.14063 0.90625,1.4375 0.90625,3.01562 0,1.46875 -0.79687,2.76563 -0.79688,1.29687 -2.40625,2.09375 2.07812,0.60937 3.1875,2.07812 1.125,1.46875 1.125,3.46875 0,1.60938 -0.6875,3 -0.67188,1.37497 -1.67188,2.12497 -1,0.75 -2.51562,1.14063 -1.5,0.375 -3.6875,0.375 l -8.73438,0 z m 3.03125,-13.28122 4.95313,0 q 2.01562,0 2.89062,-0.26562 1.15625,-0.34375 1.73438,-1.14063 0.59375,-0.79687 0.59375,-2 0,-1.14062 -0.54688,-2 -0.54687,-0.875 -1.5625,-1.1875 -1.01562,-0.32812 -3.48437,-0.32812 l -4.57813,0 0,6.92187 z m 0,10.57813 5.70313,0 q 1.46875,0 2.0625,-0.10938 1.04687,-0.1875 1.75,-0.625 0.70312,-0.4375 1.15625,-1.26562 0.45312,-0.84375 0.45312,-1.9375 0,-1.28125 -0.65625,-2.21875 -0.65625,-0.95313 -1.82812,-1.32813 -1.15625,-0.39062 -3.34375,-0.39062 l -5.29688,0 0,7.875 z m 18.09375,-16.96875 0,-3.23438 2.8125,0 0,3.23438 -2.8125,0 z m 0,19.67184 0,-16.59372 2.8125,0 0,16.59372
-2.8125,0 z m 7.09375,0 0,-16.59372 2.53125,0 0,2.35937 q 1.82813,-2.73437 5.28125,-2.73437 1.5,0 2.75,0.54687 1.26563,0.53125 1.89063,1.40625 0.625,0.875 0.875,2.07813 0.15625,0.78125 0.15625,2.73437 l 0,10.2031 -2.8125,0 0,-10.09372 q 0,-1.71875 -0.32813,-2.5625 -0.32812,-0.85938 -1.17187,-1.35938 -0.82813,-0.51562 -1.95313,-0.51562 -1.79687,0 -3.10937,1.14062 -1.29688,1.14063 -1.29688,4.32813 l 0,9.06247 -2.8125,0 z m 28.625,-2.04688 q -1.5625,1.32813 -3.01562,1.875 -1.4375,0.54688 -3.09375,0.54688 -2.73438,0 -4.20313,-1.32813 -1.46875,-1.34375 -1.46875,-3.42184 0,-1.21875 0.54688,-2.21875 0.5625,-1.01563 1.45312,-1.625 0.90625,-0.60938 2.03125,-0.92188 0.82813,-0.21875 2.5,-0.42187 3.40625,-0.40625 5.01563,-0.96875 0.0156,-0.57813 0.0156,-0.73438 0,-1.71875 -0.79687,-2.42187 -1.07813,-0.95313 -3.20313,-0.95313 -1.98437,0 -2.9375,0.70313 -0.9375,0.6875 -1.39062,2.45312 l -2.75,-0.375 q 0.375,-1.76562 1.23437,-2.84375 0.85938,-1.09375 2.48438,-1.67187 1.625,-0.59375 3.76562,-0.593
75 2.125,0 3.45313,0.5 1.32812,0.5 1.95312,1.26562 0.625,0.75 0.875,1.90625 0.14063,0.71875 0.14063,2.59375 l 0,3.75 q 0,3.92188 0.17187,4.96872 0.1875,1.03125 0.71875,1.98438 l -2.9375,0 q -0.4375,-0.875 -0.5625,-2.04688 z m -0.23437,-6.28122 q -1.53125,0.625 -4.59375,1.0625 -1.73438,0.25 -2.45313,0.5625 -0.71875,0.3125 -1.10937,0.92188 -0.39063,0.59375 -0.39063,1.32812 0,1.125 0.84375,1.87497 0.85938,0.75 2.5,0.75 1.625,0 2.89063,-0.70312 1.26562,-0.71872 1.85937,-1.9531 0.45313,-0.95312 0.45313,-2.8125 l 0,-1.03125 z m 7.17187,8.3281 0,-16.59372 2.53125,0 0,2.51562 q 0.96875,-1.76562 1.78125,-2.32812 0.82813,-0.5625 1.8125,-0.5625 1.42188,0 2.89063,0.90625 l -0.96875,2.60937 q -1.03125,-0.60937 -2.0625,-0.60937 -0.92188,0 -1.65625,0.5625 -0.73438,0.54687 -1.04688,1.53125 -0.46875,1.5 -0.46875,3.28125 l 0,8.68747 -2.8125,0 z m 10.5625,6.39062 -0.3125,-2.64062 q 0.92188,0.25 1.60938,0.25 0.9375,0 1.5,-0.3125 0.5625,-0.3125 0.92187,-0.875 0.26563,-0.42188 0.85938,-2.09375 0.0781,-0.
23438 0.25,-0.6875 l -6.29688,-16.62497 3.03125,0 3.45313,9.60937 q 0.67187,1.82813 1.20312,3.84375 0.48438,-1.9375 1.15625,-3.78125 l 3.54688,-9.67187 2.8125,0 -6.3125,16.87497 q -1.01563,2.73437 -1.57813,3.76562 -0.75,1.39063 -1.71875,2.03125 -0.96875,0.65625 -2.3125,0.65625 -0.8125,0 -1.8125,-0.34375 z m 25.89063,-6.39062 0,-22.90622 3.03125,0 0,22.90622 -3.03125,0 z m 8.01562,0 0,-16.59372 2.51563,0 0,2.32812 q 0.78125,-1.21875 2.07812,-1.95312 1.29688,-0.75 2.95313,-0.75 1.84375,0 3.01562,0.76562 1.1875,0.76563 1.67188,2.14063 1.96875,-2.90625 5.12496,-2.90625 2.46875,0 3.79688,1.375 1.32812,1.35937 1.32812,4.20312 l 0,11.3906 -2.79687,0 0,-10.4531 q 0,-1.6875 -0.28125,-2.42187 -0.26563,-0.75 -0.98438,-1.20313 -0.71875,-0.45312 -1.6875,-0.45312 -1.75,0 -2.90621,1.17187 -1.15625,1.15625 -1.15625,3.71875 l 0,9.6406 -2.8125,0 0,-10.78122 q 0,-1.875 -0.6875,-2.8125 -0.6875,-0.9375 -2.25,-0.9375 -1.1875,0 -2.20313,0.625 -1,0.625 -1.45312,1.82812 -0.45313,1.20313 -0.45313,3.46875 l 0
,8.60935 -2.8125,0 z m 37.48434,-2.04688 q -1.5625,1.32813 -3.01562,1.875 -1.4375,0.54688 -3.09375,0.54688 -2.73438,0 -4.20313,-1.32813 -1.46875,-1.34375 -1.46875,-3.42184 0,-1.21875 0.54688,-2.21875 0.5625,-1.01563 1.45312,-1.625 0.90625,-0.60938 2.03125,-0.92188 0.82813,-0.21875 2.5,-0.42187 3.40625,-0.40625 5.01563,-0.96875 0.0156,-0.57813 0.0156,-0.73438 0,-1.71875 -0.79687,-2.42187 -1.07813,-0.95313 -3.20313,-0.95313 -1.98437,0 -2.9375,0.70313 -0.9375,0.6875 -1.39062,2.45312 l -2.75,-0.375 q 0.375,-1.76562 1.23437,-2.84375 0.85938,-1.09375 2.48438,-1.67187 1.625,-0.59375 3.76562,-0.59375 2.125,0 3.45313,0.5 1.32812,0.5 1.95312,1.26562 0.625,0.75 0.875,1.90625 0.14063,0.71875 0.14063,2.59375 l 0,3.75 q 0,3.92188 0.17187,4.96872 0.1875,1.03125 0.71875,1.98438 l -2.9375,0 q -0.4375,-0.875 -0.5625,-2.04688 z m -0.23437,-6.28122 q -1.53125,0.625 -4.59375,1.0625 -1.73438,0.25 -2.45313,0.5625 -0.71875,0.3125 -1.10937,0.92188 -0.39063,0.59375 -0.39063,1.32812 0,1.125 0.84375,1.87497 0.
85938,0.75 2.5,0.75 1.625,0 2.89063,-0.70312 1.26562,-0.71872 1.85937,-1.9531 0.45313,-0.95312 0.45313,-2.8125 l 0,-1.03125 z m 6.6875,9.7031 2.73437,0.40625 q 0.17188,1.26562 0.95313,1.84375 1.04687,0.78125 2.85937,0.78125 1.95313,0 3.01563,-0.78125 1.0625,-0.78125 1.4375,-2.1875 0.21875,-0.85938 0.20312,-3.60938 -1.84375,2.17188 -4.59375,2.17188 -3.42187,0 -5.29687,-2.46875 -1.875,-2.46872 -1.875,-5.92185 0,-2.375 0.85937,-4.375 0.85938,-2.01562 2.48438,-3.10937 1.64062,-1.09375 3.84375,-1.09375 2.9375,0 4.84375,2.375 l 0,-2 2.59375,0 0,14.34372 q 0,3.875 -0.79688,5.48437 -0.78125,1.625 -2.5,2.5625 -1.70312,0.9375 -4.20312,0.9375 -2.96875,0 -4.79688,-1.34375 -1.82812,-1.32812 -1.76562,-4.01562 z m 2.32812,-9.96872 q 0,3.26562 1.29688,4.76562 1.29687,1.49997 3.25,1.49997 1.9375,0 3.25,-1.48434 1.3125,-1.5 1.3125,-4.6875 0,-3.04688 -1.35938,-4.59375 -1.34375,-1.54688 -3.25,-1.54688 -1.875,0 -3.1875,1.53125 -1.3125,1.51563 -1.3125,4.51563 z m 27.34375,3.25 2.90625,0.35937 q -0.6875,2
.54685 -2.54687,3.9531 -1.85938,1.40625 -4.75,1.40625 -3.64063,0 -5.78125,-2.23438 -2.125,-2.24997 -2.125,-6.29684 0,-4.1875 2.15625,-6.5 2.15625,-2.3125 5.59375,-2.3125 3.32812,0 5.4375,2.26562 2.10937,2.26563 2.10937,6.375 0,0.25 -0.0156,0.75 l -12.375,0 q 0.15625,2.73438 1.54687,4.1875 1.39063,1.4531 3.46875,1.4531 1.54688,0 2.64063,-0.81247 1.09375,-0.8125 1.73437,-2.59375 z m -9.23437,-4.54688 9.26562,0 q -0.1875,-2.09375 -1.0625,-3.14062 -1.34375,-1.625 -3.48437,-1.625 -1.9375,0 -3.26563,1.29687 -1.3125,1.29688 -1.45312,3.46875 z" id="path31" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 150.6285,592.45667 172.7874,0 0,123.4331 -172.7874,0 z" id="path33" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 150.6285,592.45667 172.7874,0 0,123.4331 -172.7874,0 z" id="path35" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 164.80345,665.89325 0,-22.90625 8.64062,0 q 2.28125,0 3.48438,0.21875 1.6875,0.28125 2.82812,1.07812 1.14063,0.78125 1.82813,2.20313 0.70312,1.42187 0.70312,3.125 0,2.92187 -1.85937,4.95312 -1.85938,2.01563 -6.71875,2.01563 l -5.875,0 0,9.3125 -3.03125,0 z m 3.03125,-12.01563 5.92187,0 q 2.9375,0 4.17188,-1.09375 1.23437,-1.09375 1.23437,-3.07812 0,-1.4375 -0.73437,-2.45313 -0.71875,-1.03125 -1.90625,-1.35937 -0.76563,-0.20313 -2.82813,-0.20313 l -5.85937,0 0,8.1875 z m 17.89062,12.01563 0,-22.90625 2.8125,0 0,22.90625 -2.8125,0 z m 18,-2.04688 q -1.5625,1.32813 -3.01562,1.875 -1.4375,0.54688 -3.09375,0.54688 -2.73438,0 -4.20313,-1.32813 -1.46875,-1.34375 -1.46875,-3.42187 0,-1.21875 0.54688,-2.21875 0.5625,-1.01563 1.45312,-1.625 0.90625,-0.60938 2.03125,-0.92188 0.82813,-0.21875 2.5,-0.42187 3.40625,-0.40625 5.01563,-0.96875 0.0156,-0.57813 0.0156,-0.73438 0,-1.71875 -0.79687,-2.42187 -1.07813,-0.95313 -3.20313,-0.95313 -1.98437,0 -2.9375,0.70313 -0.9375,0.6875 -1.3
9062,2.45312 l -2.75,-0.375 q 0.375,-1.76562 1.23437,-2.84375 0.85938,-1.09375 2.48438,-1.67187 1.625,-0.59375 3.76562,-0.59375 2.125,0 3.45313,0.5 1.32812,0.5 1.95312,1.26562 0.625,0.75 0.875,1.90625 0.14063,0.71875 0.14063,2.59375 l 0,3.75 q 0,3.92188 0.17187,4.96875 0.1875,1.03125 0.71875,1.98438 l -2.9375,0 q -0.4375,-0.875 -0.5625,-2.04688 z m -0.23437,-6.28125 q -1.53125,0.625 -4.59375,1.0625 -1.73438,0.25 -2.45313,0.5625 -0.71875,0.3125 -1.10937,0.92188 -0.39063,0.59375 -0.39063,1.32812 0,1.125 0.84375,1.875 0.85938,0.75 2.5,0.75 1.625,0 2.89063,-0.70312 1.26562,-0.71875 1.85937,-1.95313 0.45313,-0.95312 0.45313,-2.8125 l 0,-1.03125 z m 13.34375,5.8125 0.40625,2.48438 q -1.1875,0.25 -2.125,0.25 -1.53125,0 -2.375,-0.48438 -0.84375,-0.48437 -1.1875,-1.26562 -0.34375,-0.79688 -0.34375,-3.32813 l 0,-9.54687 -2.0625,0 0,-2.1875 2.0625,0 0,-4.10938 2.79687,-1.6875 0,5.79688 2.82813,0 0,2.1875 -2.82813,0 0,9.70312 q 0,1.20313 0.14063,1.54688 0.15625,0.34375 0.48437,0.54687 0.34375,0
.20313 0.96875,0.20313 0.46875,0 1.23438,-0.10938 z m 3.42187,2.51563 0,-14.40625 -2.48437,0 0,-2.1875 2.48437,0 0,-1.76563 q 0,-1.67187 0.29688,-2.48437 0.40625,-1.09375 1.42187,-1.76563 1.03125,-0.6875 2.875,-0.6875 1.1875,0 2.625,0.28125 l -0.42187,2.45313 q -0.875,-0.15625 -1.65625,-0.15625 -1.28125,0 -1.8125,0.54687 -0.53125,0.54688 -0.53125,2.04688 l 0,1.53125 3.23437,0 0,2.1875 -3.23437,0 0,14.40625 -2.79688,0 z m 7.17188,-8.29688 q 0,-4.60937 2.5625,-6.82812 2.14062,-1.84375 5.21875,-1.84375 3.42187,0 5.59375,2.25 2.17187,2.23437 2.17187,6.1875 0,3.20312 -0.96875,5.04687 -0.95312,1.82813 -2.79687,2.84375 -1.82813,1.01563 -4,1.01563 -3.48438,0 -5.64063,-2.23438 -2.14062,-2.23437 -2.14062,-6.4375 z m 2.89062,0 q 0,3.1875 1.39063,4.78125 1.39062,1.57813 3.5,1.57813 2.09375,0 3.48437,-1.59375 1.39063,-1.59375 1.39063,-4.85938 0,-3.07812 -1.40625,-4.65625 -1.39063,-1.59375 -3.46875,-1.59375 -2.10938,0 -3.5,1.57813 -1.39063,1.57812 -1.39063,4.76562 z m 15.92188,8.29688 0,-16.59375
2.53125,0 0,2.51562 q 0.96875,-1.76562 1.78125,-2.32812 0.82812,-0.5625 1.8125,-0.5625 1.42187,0 2.89062,0.90625 l -0.96875,2.60937 q -1.03125,-0.60937 -2.0625,-0.60937 -0.92187,0 -1.65625,0.5625 -0.73437,0.54687 -1.04687,1.53125 -0.46875,1.5 -0.46875,3.28125 l 0,8.6875 -2.8125,0 z m 10.68748,0 0,-16.59375 2.51563,0 0,2.32812 q 0.78125,-1.21875 2.07812,-1.95312 1.29688,-0.75 2.95313,-0.75 1.84375,0 3.01562,0.76562 1.1875,0.76563 1.67188,2.14063 1.96875,-2.90625 5.125,-2.90625 2.46875,0 3.79687,1.375 1.32816,1.35937 1.32816,4.20312 l 0,11.39063 -2.79691,0 0,-10.45313 q 0,-1.6875 -0.28125,-2.42187 -0.26562,-0.75 -0.98437,-1.20313 -0.71875,-0.45312 -1.6875,-0.45312 -1.75,0 -2.90625,1.17187 -1.15625,1.15625 -1.15625,3.71875 l 0,9.64063 -2.8125,0 0,-10.78125 q 0,-1.875 -0.6875,-2.8125 -0.6875,-0.9375 -2.25,-0.9375 -1.1875,0 -2.20313,0.625 -1,0.625 -1.45312,1.82812 -0.45313,1.20313 -0.45313,3.46875 l 0,8.60938 -2.8125,0 z m 33.39066,0 8.79688,-22.90625 3.26562,0 9.375,22.90625 -3.45312,0
-2.67188,-6.9375 -9.57812,0 -2.51563,6.9375 -3.21875,0 z m 6.60938,-9.40625 7.76562,0 -2.39062,-6.34375 q -1.09375,-2.89063 -1.625,-4.75 -0.4375,2.20312 -1.23438,4.375 l -2.51562,6.71875 z" id="path37" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 394.6285,592.45667 172.78738,0 0,123.4331 -172.78738,0 z" id="path39" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 394.6285,592.45667 172.78738,0 0,123.4331 -172.78738,0 z" id="path41" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 408.80344,665.89325 0,-22.90625 8.64063,0 q 2.28125,0 3.48437,0.21875 1.6875,0.28125 2.82813,1.07812 1.14062,0.78125 1.82812,2.20313 0.70313,1.42187 0.70313,3.125 0,2.92187 -1.85938,4.95312 -1.85937,2.01563 -6.71875,2.01563 l -5.875,0 0,9.3125 -3.03125,0 z m 3.03125,-12.01563 5.92188,0 q 2.9375,0 4.17187,-1.09375 1.23438,-1.09375 1.23438,-3.07812 0,-1.4375 -0.73438,-2.45313 -0.71875,-1.03125 -1.90625,-1.35937 -0.76562,-0.20313 -2.82812,-0.20313 l -5.85938,0 0,8.1875 z m 17.89063,12.01563 0,-22.90625 2.8125,0 0,22.90625 -2.8125,0 z m 18,-2.04688 q -1.5625,1.32813 -3.01563,1.875 -1.4375,0.54688 -3.09375,0.54688 -2.73437,0 -4.20312,-1.32813 -1.46875,-1.34375 -1.46875,-3.42187 0,-1.21875 0.54687,-2.21875 0.5625,-1.01563 1.45313,-1.625 0.90625,-0.60938 2.03125,-0.92188 0.82812,-0.21875 2.5,-0.42187 3.40625,-0.40625 5.01562,-0.96875 0.0156,-0.57813 0.0156,-0.73438 0,-1.71875 -0.79688,-2.42187 -1.07812,-0.95313 -3.20312,-0.95313 -1.98438,0 -2.9375,0.70313 -0.9375,0.6875 -1.3
9063,2.45312 l -2.75,-0.375 q 0.375,-1.76562 1.23438,-2.84375 0.85937,-1.09375 2.48437,-1.67187 1.625,-0.59375 3.76563,-0.59375 2.125,0 3.45312,0.5 1.32813,0.5 1.95313,1.26562 0.625,0.75 0.875,1.90625 0.14062,0.71875 0.14062,2.59375 l 0,3.75 q 0,3.92188 0.17188,4.96875 0.1875,1.03125 0.71875,1.98438 l -2.9375,0 q -0.4375,-0.875 -0.5625,-2.04688 z m -0.23438,-6.28125 q -1.53125,0.625 -4.59375,1.0625 -1.73437,0.25 -2.45312,0.5625 -0.71875,0.3125 -1.10938,0.92188 -0.39062,0.59375 -0.39062,1.32812 0,1.125 0.84375,1.875 0.85937,0.75 2.5,0.75 1.625,0 2.89062,-0.70312 1.26563,-0.71875 1.85938,-1.95313 0.45312,-0.95312 0.45312,-2.8125 l 0,-1.03125 z m 13.34375,5.8125 0.40625,2.48438 q -1.1875,0.25 -2.125,0.25 -1.53125,0 -2.375,-0.48438 -0.84375,-0.48437 -1.1875,-1.26562 -0.34375,-0.79688 -0.34375,-3.32813 l 0,-9.54687 -2.0625,0 0,-2.1875 2.0625,0 0,-4.10938 2.79688,-1.6875 0,5.79688 2.82812,0 0,2.1875 -2.82812,0 0,9.70312 q 0,1.20313 0.14062,1.54688 0.15625,0.34375 0.48438,0.54687 0.34375,0
.20313 0.96875,0.20313 0.46875,0 1.23437,-0.10938 z m 3.42188,2.51563 0,-14.40625 -2.48438,0 0,-2.1875 2.48438,0 0,-1.76563 q 0,-1.67187 0.29687,-2.48437 0.40625,-1.09375 1.42188,-1.76563 1.03125,-0.6875 2.875,-0.6875 1.1875,0 2.625,0.28125 l -0.42188,2.45313 q -0.875,-0.15625 -1.65625,-0.15625 -1.28125,0 -1.8125,0.54687 -0.53125,0.54688 -0.53125,2.04688 l 0,1.53125 3.23438,0 0,2.1875 -3.23438,0 0,14.40625 -2.79687,0 z m 7.17187,-8.29688 q 0,-4.60937 2.5625,-6.82812 2.14063,-1.84375 5.21875,-1.84375 3.42188,0 5.59375,2.25 2.17188,2.23437 2.17188,6.1875 0,3.20312 -0.96875,5.04687 -0.95313,1.82813 -2.79688,2.84375 -1.82812,1.01563 -4,1.01563 -3.48437,0 -5.64062,-2.23438 -2.14063,-2.23437 -2.14063,-6.4375 z m 2.89063,0 q 0,3.1875 1.39062,4.78125 1.39063,1.57813 3.5,1.57813 2.09375,0 3.48438,-1.59375 1.39062,-1.59375 1.39062,-4.85938 0,-3.07812 -1.40625,-4.65625 -1.39062,-1.59375 -3.46875,-1.59375 -2.10937,0 -3.5,1.57813 -1.39062,1.57812 -1.39062,4.76562 z m 15.92187,8.29688 0,-16.59375
2.53125,0 0,2.51562 q 0.96875,-1.76562 1.78125,-2.32812 0.82813,-0.5625 1.8125,-0.5625 1.42188,0 2.89063,0.90625 l -0.96875,2.60937 q -1.03125,-0.60937 -2.0625,-0.60937 -0.92188,0 -1.65625,0.5625 -0.73438,0.54687 -1.04688,1.53125 -0.46875,1.5 -0.46875,3.28125 l 0,8.6875 -2.8125,0 z m 10.6875,0 0,-16.59375 2.51563,0 0,2.32812 q 0.78125,-1.21875 2.07812,-1.95312 1.29688,-0.75 2.95313,-0.75 1.84375,0 3.01562,0.76562 1.18753,0.76563 1.67191,2.14063 1.96875,-2.90625 5.125,-2.90625 2.46875,0 3.79687,1.375 1.32813,1.35937 1.32813,4.20312 l 0,11.39063 -2.79688,0 0,-10.45313 q 0,-1.6875 -0.28125,-2.42187 -0.26562,-0.75 -0.98437,-1.20313 -0.71875,-0.45312 -1.6875,-0.45312 -1.75,0 -2.90625,1.17187 -1.15625,1.15625 -1.15625,3.71875 l 0,9.64063 -2.81253,0 0,-10.78125 q 0,-1.875 -0.6875,-2.8125 -0.6875,-0.9375 -2.25,-0.9375 -1.1875,0 -2.20313,0.625 -1,0.625 -1.45312,1.82812 -0.45313,1.20313 -0.45313,3.46875 l 0,8.60938 -2.8125,0 z m 35.78128,0 0,-22.90625 8.59375,0 q 2.625,0 4.20313,0.70312 1.59
375,0.6875 2.48437,2.14063 0.90625,1.4375 0.90625,3.01562 0,1.46875 -0.79687,2.76563 -0.79688,1.29687 -2.40625,2.09375 2.07812,0.60937 3.1875,2.07812 1.125,1.46875 1.125,3.46875 0,1.60938 -0.6875,3 -0.67188,1.375 -1.67188,2.125 -1,0.75 -2.51562,1.14063 -1.5,0.375 -3.6875,0.375 l -8.73438,0 z m 3.03125,-13.28125 4.95313,0 q 2.01562,0 2.89062,-0.26563 1.15625,-0.34375 1.73438,-1.14062 0.59375,-0.79688 0.59375,-2 0,-1.14063 -0.54688,-2 -0.54687,-0.875 -1.5625,-1.1875 -1.01562,-0.32813 -3.48437,-0.32813 l -4.57813,0 0,6.92188 z m 0,10.57812 5.70313,0 q 1.46875,0 2.0625,-0.10937 1.04687,-0.1875 1.75,-0.625 0.70312,-0.4375 1.15625,-1.26563 0.45312,-0.84375 0.45312,-1.9375 0,-1.28125 -0.65625,-2.21875 -0.65625,-0.95312 -1.82812,-1.32812 -1.15625,-0.39063 -3.34375,-0.39063 l -5.29688,0 0,7.875 z" id="path43" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 638.6285,592.45667 172.78741,0 0,123.4331 -172.78741,0 z" id="path45" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 638.6285,592.45667 172.78741,0 0,123.4331 -172.78741,0 z" id="path47" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 651.92065,665.89325 0,-22.90625 8.64063,0 q 2.28125,0 3.48437,0.21875 1.6875,0.28125 2.82813,1.07812 1.14062,0.78125 1.82812,2.20313 0.70313,1.42187 0.70313,3.125 0,2.92187 -1.85938,4.95312 -1.85937,2.01563 -6.71875,2.01563 l -5.875,0 0,9.3125 -3.03125,0 z m 3.03125,-12.01563 5.92188,0 q 2.9375,0 4.17187,-1.09375 1.23438,-1.09375 1.23438,-3.07812 0,-1.4375 -0.73438,-2.45313 -0.71875,-1.03125 -1.90625,-1.35937 -0.76562,-0.20313 -2.82812,-0.20313 l -5.85938,0 0,8.1875 z m 17.89063,12.01563 0,-22.90625 2.8125,0 0,22.90625 -2.8125,0 z m 18,-2.04688 q -1.5625,1.32813 -3.01563,1.875 -1.4375,0.54688 -3.09375,0.54688 -2.73437,0 -4.20312,-1.32813 -1.46875,-1.34375 -1.46875,-3.42187 0,-1.21875 0.54687,-2.21875 0.5625,-1.01563 1.45313,-1.625 0.90625,-0.60938 2.03125,-0.92188 0.82812,-0.21875 2.5,-0.42187 3.40625,-0.40625 5.01562,-0.96875 0.0156,-0.57813 0.0156,-0.73438 0,-1.71875 -0.79688,-2.42187 -1.07812,-0.95313 -3.20312,-0.95313 -1.98438,0 -2.9375,0.70313 -0.9375,0.6875 -1.3
9063,2.45312 l -2.75,-0.375 q 0.375,-1.76562 1.23438,-2.84375 0.85937,-1.09375 2.48437,-1.67187 1.625,-0.59375 3.76563,-0.59375 2.125,0 3.45312,0.5 1.32813,0.5 1.95313,1.26562 0.625,0.75 0.875,1.90625 0.14062,0.71875 0.14062,2.59375 l 0,3.75 q 0,3.92188 0.17188,4.96875 0.1875,1.03125 0.71875,1.98438 l -2.9375,0 q -0.4375,-0.875 -0.5625,-2.04688 z m -0.23438,-6.28125 q -1.53125,0.625 -4.59375,1.0625 -1.73437,0.25 -2.45312,0.5625 -0.71875,0.3125 -1.10938,0.92188 -0.39062,0.59375 -0.39062,1.32812 0,1.125 0.84375,1.875 0.85937,0.75 2.5,0.75 1.625,0 2.89062,-0.70312 1.26563,-0.71875 1.85938,-1.95313 0.45312,-0.95312 0.45312,-2.8125 l 0,-1.03125 z m 13.34375,5.8125 0.40625,2.48438 q -1.1875,0.25 -2.125,0.25 -1.53125,0 -2.375,-0.48438 -0.84375,-0.48437 -1.1875,-1.26562 -0.34375,-0.79688 -0.34375,-3.32813 l 0,-9.54687 -2.0625,0 0,-2.1875 2.0625,0 0,-4.10938 2.79688,-1.6875 0,5.79688 2.82812,0 0,2.1875 -2.82812,0 0,9.70312 q 0,1.20313 0.14062,1.54688 0.15625,0.34375 0.48438,0.54687 0.34375,0
.20313 0.96875,0.20313 0.46875,0 1.23437,-0.10938 z m 3.42188,2.51563 0,-14.40625 -2.48438,0 0,-2.1875 2.48438,0 0,-1.76563 q 0,-1.67187 0.29687,-2.48437 0.40625,-1.09375 1.42188,-1.76563 1.03125,-0.6875 2.875,-0.6875 1.1875,0 2.625,0.28125 l -0.42188,2.45313 q -0.875,-0.15625 -1.65625,-0.15625 -1.28125,0 -1.8125,0.54687 -0.53125,0.54688 -0.53125,2.04688 l 0,1.53125 3.23438,0 0,2.1875 -3.23438,0 0,14.40625 -2.79687,0 z m 7.17187,-8.29688 q 0,-4.60937 2.5625,-6.82812 2.14063,-1.84375 5.21875,-1.84375 3.42188,0 5.59375,2.25 2.17188,2.23437 2.17188,6.1875 0,3.20312 -0.96875,5.04687 -0.95313,1.82813 -2.79688,2.84375 -1.82812,1.01563 -4,1.01563 -3.48437,0 -5.64062,-2.23438 -2.14063,-2.23437 -2.14063,-6.4375 z m 2.89063,0 q 0,3.1875 1.39062,4.78125 1.39063,1.57813 3.5,1.57813 2.09375,0 3.48438,-1.59375 1.39062,-1.59375 1.39062,-4.85938 0,-3.07812 -1.40625,-4.65625 -1.39062,-1.59375 -3.46875,-1.59375 -2.10937,0 -3.5,1.57813 -1.39062,1.57812 -1.39062,4.76562 z m 15.92187,8.29688 0,-16.59375
2.53125,0 0,2.51562 q 0.96875,-1.76562 1.78125,-2.32812 0.82813,-0.5625 1.8125,-0.5625 1.42188,0 2.89063,0.90625 l -0.96875,2.60937 q -1.03125,-0.60937 -2.0625,-0.60937 -0.92188,0 -1.65625,0.5625 -0.73438,0.54687 -1.04688,1.53125 -0.46875,1.5 -0.46875,3.28125 l 0,8.6875 -2.8125,0 z m 10.6875,0 0,-16.59375 2.51563,0 0,2.32812 q 0.78125,-1.21875 2.07812,-1.95312 1.29688,-0.75 2.95313,-0.75 1.84375,0 3.01562,0.76562 1.1875,0.76563 1.67188,2.14063 1.96875,-2.90625 5.125,-2.90625 2.46875,0 3.79687,1.375 1.32813,1.35937 1.32813,4.20312 l 0,11.39063 -2.79688,0 0,-10.45313 q 0,-1.6875 -0.28125,-2.42187 -0.26562,-0.75 -0.98437,-1.20313 -0.71875,-0.45312 -1.6875,-0.45312 -1.75,0 -2.90625,1.17187 -1.15625,1.15625 -1.15625,3.71875 l 0,9.64063 -2.8125,0 0,-10.78125 q 0,-1.875 -0.6875,-2.8125 -0.6875,-0.9375 -2.25,-0.9375 -1.1875,0 -2.20313,0.625 -1,0.625 -1.45312,1.82812 -0.45313,1.20313 -0.45313,3.46875 l 0,8.60938 -2.8125,0 z m 52.25,-8.03125 3.03125,0.76562 q -0.95312,3.73438 -3.4375,5.70313
-2.46875,1.95312 -6.04687,1.95312 -3.70313,0 -6.03125,-1.5 -2.3125,-1.51562 -3.53125,-4.375 -1.20313,-2.85937 -1.20313,-6.14062 0,-3.57813 1.35938,-6.23438 1.375,-2.67187 3.89062,-4.04687 2.53125,-1.39063 5.5625,-1.39063 3.4375,0 5.78125,1.75 2.34375,1.75 3.26563,4.92188 l -2.98438,0.70312 q -0.79687,-2.5 -2.3125,-3.64062 -1.51562,-1.14063 -3.8125,-1.14063 -2.64062,0 -4.42187,1.26563 -1.76563,1.26562 -2.48438,3.40625 -0.71875,2.125 -0.71875,4.39062 0,2.92188 0.84375,5.10938 0.85938,2.17187 2.65625,3.25 1.79688,1.07812 3.89063,1.07812 2.54687,0 4.3125,-1.46875 1.76562,-1.46875 2.39062,-4.35937 z" id="path49" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 249.82939,157.58665 7.88976,0 0,-42.61417 15.77954,0 0,42.61417 7.88977,0 -15.77954,15.77953 z" id="path51" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 249.82939,157.58665 7.88976,0 0,-42.61417 15.77954,0 0,42.61417 7.88977,0 -15.77954,15.77953 z" id="path53" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="M 481.36746,518.86615 237.02099,592.47241" id="path55" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="M 481.36746,518.86615 242.76599,590.74182" id="path57" inkscape:connector-curvature="0" style="fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 242.28958,589.1603 -3.86882,2.8905 4.82166,0.27259 z" id="path59" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt"/>
+ <path d="m 481.36746,518.86615 -0.34647,73.60626" id="path61" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 481.36746,518.86615 -0.31821,67.60638" id="path63" inkscape:connector-curvature="0" style="fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 479.39752,586.4647 1.63037,4.54584 1.67307,-4.53028 z" id="path65" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt"/>
+ <path d="m 481.36746,518.86615 243.65353,73.60626" id="path67" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="M 481.36746,518.86615 719.2774,590.7373" id="path69" inkscape:connector-curvature="0" style="fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 718.7997,592.3185 4.8219,-0.2688 -3.86658,-2.89349 z" id="path71" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt"/>
+ <path d="m 344.91077,314.28482 272.9134,0 0,69.95276 -272.9134,0 z" id="path73" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 344.91077,314.28482 272.9134,0 0,69.95276 -272.9134,0 z" id="path75" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 390.62137,335.80118 6.59375,-17.1875 2.45313,0 7.03125,17.1875 -2.59375,0 -2,-5.20313 -7.1875,0 -1.89063,5.20313 -2.40625,0 z m 4.95313,-7.0625 5.82812,0 -1.79687,-4.75 q -0.8125,-2.17188 -1.21875,-3.5625 -0.32813,1.65625 -0.92188,3.28125 l -1.89062,5.03125 z m 12.85156,7.0625 0,-17.1875 6.4375,0 q 1.96875,0 3.15625,0.53125 1.1875,0.51562 1.85937,1.60937 0.6875,1.07813 0.6875,2.26563 0,1.09375 -0.60937,2.07812 -0.59375,0.96875 -1.79688,1.5625 1.5625,0.45313 2.39063,1.5625 0.84375,1.09375 0.84375,2.59375 0,1.20313 -0.51563,2.25 -0.5,1.03125 -1.25,1.59375 -0.75,0.5625 -1.89062,0.85938 -1.125,0.28125 -2.76563,0.28125 l -6.54687,0 z m 2.26562,-9.96875 3.71875,0 q 1.51563,0 2.17188,-0.1875 0.85937,-0.26563 1.29687,-0.85938 0.4375,-0.59375 0.4375,-1.5 0,-0.85937 -0.40625,-1.5 -0.40625,-0.65625 -1.17187,-0.89062 -0.76563,-0.25 -2.60938,-0.25 l -3.4375,0 0,5.1875 z m 0,7.9375 4.28125,0 q 1.09375,0 1.54688,-0.0781 0.78125,-0.14062 1.3125,-0.46875 0.53125,-0.32812 0.85937,-0.95
312 0.34375,-0.625 0.34375,-1.45313 0,-0.95312 -0.5,-1.65625 -0.48437,-0.71875 -1.35937,-1 -0.875,-0.29687 -2.51563,-0.29687 l -3.96875,0 0,5.90625 z m 14.21094,2.03125 0,-17.1875 2.28125,0 0,17.1875 -2.28125,0 z m 12.17969,-5.51563 2.14062,-0.1875 q 0.15625,1.28125 0.70313,2.10938 0.5625,0.82812 1.73437,1.34375 1.17188,0.5 2.64063,0.5 1.29687,0 2.29687,-0.375 1,-0.39063 1.48438,-1.0625 0.48437,-0.6875 0.48437,-1.48438 0,-0.79687 -0.46875,-1.40625 -0.46875,-0.60937 -1.54687,-1.01562 -0.6875,-0.26563 -3.0625,-0.82813 -2.35938,-0.57812 -3.3125,-1.07812 -1.23438,-0.64063 -1.84375,-1.59375 -0.59375,-0.96875 -0.59375,-2.14063 0,-1.3125 0.73437,-2.4375 0.75,-1.125 2.15625,-1.70312 1.42188,-0.59375 3.15625,-0.59375 1.90625,0 3.35938,0.60937 1.46875,0.60938 2.25,1.8125 0.79687,1.1875 0.84375,2.70313 l -2.17188,0.17187 q -0.17187,-1.64062 -1.1875,-2.46875 -1.01562,-0.82812 -3,-0.82812 -2.0625,0 -3.01562,0.76562 -0.9375,0.75 -0.9375,1.8125 0,0.92188 0.67187,1.51563 0.65625,0.60937 3.42188,1.2
3437 2.78125,0.625 3.8125,1.09375 1.5,0.6875 2.20312,1.75 0.71875,1.0625 0.71875,2.4375 0,1.375 -0.78125,2.59375 -0.78125,1.20313 -2.25,1.89063 -1.46875,0.67187 -3.3125,0.67187 -2.32812,0 -3.90625,-0.67187 -1.57812,-0.6875 -2.48437,-2.04688 -0.89063,-1.375 -0.9375,-3.09375 z m 16.50781,10.28125 0,-17.21875 1.92187,0 0,1.625 q 0.6875,-0.95312 1.53125,-1.42187 0.85938,-0.48438 2.07813,-0.48438 1.59375,0 2.8125,0.82813 1.21875,0.8125 1.84375,2.3125 0.625,1.5 0.625,3.28125 0,1.90625 -0.6875,3.4375 -0.6875,1.53125 -2,2.34375 -1.29688,0.8125 -2.73438,0.8125 -1.0625,0 -1.90625,-0.4375 -0.82812,-0.45313 -1.375,-1.14063 l 0,6.0625 -2.10937,0 z m 1.92187,-10.92187 q 0,2.40625 0.96875,3.5625 0.96875,1.14062 2.35938,1.14062 1.40625,0 2.40625,-1.1875 1,-1.1875 1,-3.6875 0,-2.375 -0.98438,-3.5625 -0.96875,-1.1875 -2.32812,-1.1875 -1.35938,0 -2.39063,1.26563 -1.03125,1.25 -1.03125,3.65625 z m 19.95704,2.14062 2.17187,0.28125 q -0.51562,1.90625 -1.90625,2.96875 -1.39062,1.04688 -3.5625,1.04688 -2.7
3437,0 -4.34375,-1.67188 -1.59375,-1.6875 -1.59375,-4.73437 0,-3.14063 1.60938,-4.875 1.625,-1.73438 4.20312,-1.73438 2.5,0 4.07813,1.70313 1.59375,1.70312 1.59375,4.78125 0,0.1875 -0.0156,0.5625 l -9.28125,0 q 0.10938,2.04687 1.15625,3.14062 1.04688,1.09375 2.60938,1.09375 1.15625,0 1.96875,-0.60937 0.82812,-0.60938 1.3125,-1.95313 z m -6.9375,-3.40625 6.95312,0 q -0.14062,-1.5625 -0.79687,-2.35937 -1,-1.21875 -2.60938,-1.21875 -1.45312,0 -2.45312,0.98437 -0.98438,0.96875 -1.09375,2.59375 z m 19.8789,2.85938 2.07813,0.26562 q -0.34375,2.15625 -1.75,3.375 -1.39063,1.20313 -3.4375,1.20313 -2.54688,0 -4.10938,-1.67188 -1.54687,-1.67187 -1.54687,-4.78125 0,-2.01562 0.67187,-3.53125 0.67188,-1.51562 2.03125,-2.26562 1.35938,-0.76563 2.96875,-0.76563 2.03125,0 3.3125,1.03125 1.29688,1.03125 1.65625,2.90625 l -2.04687,0.32813 q -0.29688,-1.26563 -1.04688,-1.89063 -0.73437,-0.64062 -1.79687,-0.64062 -1.59375,0 -2.59375,1.15625 -0.98438,1.14062 -0.98438,3.60937 0,2.5 0.95313,3.64063 0.96875
,1.14062 2.51562,1.14062 1.23438,0 2.0625,-0.76562 0.84375,-0.76563 1.0625,-2.34375 z m 3.89063,-10.1875 0,-2.4375 2.10937,0 0,2.4375 -2.10937,0 z m 0,14.75 0,-12.45313 2.10937,0 0,12.45313 -2.10937,0 z m 5.83203,0 0,-10.8125 -1.875,0 0,-1.64063 1.875,0 0,-1.3125 q 0,-1.26562 0.21875,-1.875 0.29687,-0.8125 1.0625,-1.3125 0.78125,-0.51562 2.15625,-0.51562 0.89062,0 1.96875,0.20312 l -0.3125,1.84375 q -0.65625,-0.125 -1.25,-0.125 -0.95313,0 -1.35938,0.42188 -0.39062,0.40625 -0.39062,1.53125 l 0,1.14062 2.42187,0 0,1.64063 -2.42187,0 0,10.8125 -2.09375,0 z m 6.16797,-14.75 0,-2.4375 2.10937,0 0,2.4375 -2.10937,0 z m 0,14.75 0,-12.45313 2.10937,0 0,12.45313 -2.10937,0 z m 13.44137,-4.5625 2.07813,0.26562 q -0.34375,2.15625 -1.75,3.375 -1.39063,1.20313 -3.4375,1.20313 -2.54688,0 -4.10935,-1.67188 -1.54687,-1.67187 -1.54687,-4.78125 0,-2.01562 0.67187,-3.53125 0.67188,-1.51562 2.03125,-2.26562 1.35935,-0.76563 2.96872,-0.76563 2.03125,0 3.3125,1.03125 1.29688,1.03125 1.65625,2.90625 l -2.
04687,0.32813 q -0.29688,-1.26563 -1.04688,-1.89063 -0.73437,-0.64062 -1.79687,-0.64062 -1.59375,0 -2.59375,1.15625 -0.98435,1.14062 -0.98435,3.60937 0,2.5 0.9531,3.64063 0.96875,1.14062 2.51562,1.14062 1.23438,0 2.0625,-0.76562 0.84375,-0.76563 1.0625,-2.34375 z m 12,3.03125 q -1.17187,0.98437 -2.26562,1.40625 -1.07813,0.40625 -2.3125,0.40625 -2.04688,0 -3.15625,-1 -1.09375,-1 -1.09375,-2.5625 0,-0.92188 0.40625,-1.67188 0.42187,-0.75 1.09375,-1.20312 0.67187,-0.46875 1.51562,-0.70313 0.625,-0.15625 1.875,-0.3125 2.5625,-0.3125 3.76563,-0.73437 0.0156,-0.42188 0.0156,-0.54688 0,-1.28125 -0.60937,-1.8125 -0.79688,-0.71875 -2.39063,-0.71875 -1.5,0 -2.20312,0.53125 -0.70313,0.51563 -1.04688,1.84375 l -2.0625,-0.28125 q 0.28125,-1.32812 0.92188,-2.14062 0.64062,-0.8125 1.85937,-1.25 1.21875,-0.45313 2.82813,-0.45313 1.59375,0 2.59375,0.375 1,0.375 1.46875,0.95313 0.46875,0.5625 0.65625,1.4375 0.0937,0.53125 0.0937,1.9375 l 0,2.8125 q 0,2.9375 0.14062,3.71875 0.14063,0.78125 0.53125,1.5
l -2.20312,0 q -0.32813,-0.65625 -0.42188,-1.53125 z m -0.17187,-4.71875 q -1.15625,0.46875 -3.45313,0.79687 -1.29687,0.1875 -1.84375,0.42188 -0.53125,0.23437 -0.82812,0.6875 -0.28125,0.45312 -0.28125,1 0,0.84375 0.625,1.40625 0.64062,0.5625 1.875,0.5625 1.21875,0 2.17187,-0.53125 0.95313,-0.53125 1.39063,-1.45313 0.34375,-0.71875 0.34375,-2.10937 l 0,-0.78125 z m 10.0039,4.35937 0.3125,1.85938 q -0.89062,0.20312 -1.59375,0.20312 -1.15625,0 -1.79687,-0.35937 -0.625,-0.375 -0.89063,-0.96875 -0.25,-0.59375 -0.25,-2.48438 l 0,-7.17187 -1.54687,0 0,-1.64063 1.54687,0 0,-3.07812 2.09375,-1.26563 0,4.34375 2.125,0 0,1.64063 -2.125,0 0,7.28125 q 0,0.90625 0.10938,1.17187 0.125,0.25 0.375,0.40625 0.25,0.14063 0.71875,0.14063 0.34375,0 0.92187,-0.0781 z m 2.07422,-12.85937 0,-2.4375 2.10938,0 0,2.4375 -2.10938,0 z m 0,14.75 0,-12.45313 2.10938,0 0,12.45313 -2.10938,0 z m 4.53516,-6.21875 q 0,-3.46875 1.92187,-5.125 1.60938,-1.39063 3.92188,-1.39063 2.5625,0 4.1875,1.6875 1.625,1.6875 1.625,
4.64063 0,2.40625 -0.71875,3.78125 -0.71875,1.375 -2.09375,2.14062 -1.375,0.76563 -3,0.76563 -2.625,0 -4.23438,-1.67188 -1.60937,-1.6875 -1.60937,-4.82812 z m 2.17187,0 q 0,2.39062 1.03125,3.57812 1.04688,1.1875 2.64063,1.1875 1.5625,0 2.60937,-1.1875 1.04688,-1.20312 1.04688,-3.65625 0,-2.3125 -1.0625,-3.5 -1.04688,-1.1875 -2.59375,-1.1875 -1.59375,0 -2.64063,1.1875 -1.03125,1.1875 -1.03125,3.57813 z m 11.95703,6.21875 0,-12.45313 1.90625,0 0,1.78125 q 1.375,-2.0625 3.95313,-2.0625 1.125,0 2.0625,0.40625 0.95312,0.40625 1.42187,1.0625 0.46875,0.65625 0.65625,1.5625 0.125,0.57813 0.125,2.04688 l 0,7.65625 -2.10937,0 0,-7.57813 q 0,-1.28125 -0.25,-1.92187 -0.25,-0.64063 -0.875,-1.01563 -0.625,-0.39062 -1.46875,-0.39062 -1.34375,0 -2.32813,0.85937 -0.98437,0.85938 -0.98437,3.25 l 0,6.79688 -2.10938,0 z" id="path77" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 384.18185,354.91556 1.79687,0.45313 q -0.5625,2.21875 -2.03125,3.39062 -1.46875,1.15625 -3.59375,1.15625 -2.20312,0 -3.57812,-0.89062 -1.375,-0.90625 -2.09375,-2.59375 -0.71875,-1.70313 -0.71875,-3.65625 0,-2.125 0.79687,-3.70313 0.8125,-1.57812 2.3125,-2.39062 1.5,-0.82813 3.29688,-0.82813 2.04687,0 3.4375,1.04688 1.39062,1.03125 1.9375,2.90625 l -1.76563,0.42187 q -0.46875,-1.48437 -1.375,-2.15625 -0.90625,-0.6875 -2.26562,-0.6875 -1.5625,0 -2.625,0.75 -1.04688,0.75 -1.48438,2.03125 -0.42187,1.26563 -0.42187,2.60938 0,1.73437 0.5,3.03125 0.51562,1.28125 1.57812,1.92187 1.07813,0.64063 2.3125,0.64063 1.51563,0 2.5625,-0.85938 1.04688,-0.875 1.42188,-2.59375 z m 2.92609,-0.15625 q 0,-2.73437 1.53125,-4.0625 1.26562,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29687,1.32813 1.29687,3.67188 0,1.90625 -0.57812,3 -0.5625,1.07812 -1.65625,1.6875 -1.07813,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063
0.82812,2.82813 0.82813,0.9375 2.07813,0.9375 1.25,0 2.0625,-0.9375 0.82812,-0.95313 0.82812,-2.89063 0,-1.82812 -0.82812,-2.76562 -0.82813,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07813,0.9375 -0.82812,0.9375 -0.82812,2.82812 z m 9.28195,4.92188 0,-9.85938 1.5,0 0,1.39063 q 0.45312,-0.71875 1.21875,-1.15625 0.78125,-0.45313 1.76562,-0.45313 1.09375,0 1.79688,0.45313 0.70312,0.45312 0.98437,1.28125 1.17188,-1.73438 3.04688,-1.73438 1.46875,0 2.25,0.8125 0.79687,0.8125 0.79687,2.5 l 0,6.76563 -1.67187,0 0,-6.20313 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45312 -0.59375,-0.71875 -0.42188,-0.26562 -1,-0.26562 -1.03125,0 -1.71875,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67188,0 0,-6.40625 q 0,-1.10938 -0.40625,-1.65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70312,0 -1.3125,0.375 -0.59375,0.35937 -0.85937,1.07812 -0.26563,0.71875 -0.26563,2.0625 l 0,5.10938 -1.67187,0 z m 15.5408,0 0,-9.85938 1.5,0 0,1.39063 q 0.45313,-0.71875 1.21875,-1.15625 0.78125,-0.45313 1.76563,-0.45313 1.09375,0 1
.79687,0.45313 0.70313,0.45312 0.98438,1.28125 1.17187,-1.73438 3.04687,-1.73438 1.46875,0 2.25,0.8125 0.79688,0.8125 0.79688,2.5 l 0,6.76563 -1.67188,0 0,-6.20313 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45312 -0.59375,-0.71875 -0.42187,-0.26562 -1,-0.26562 -1.03125,0 -1.71875,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67187,0 0,-6.40625 q 0,-1.10938 -0.40625,-1.65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70313,0 -1.3125,0.375 -0.59375,0.35937 -0.85938,1.07812 -0.26562,0.71875 -0.26562,2.0625 l 0,5.10938 -1.67188,0 z m 14.9158,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26563,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29688,1.32813 1.29688,3.67188 0,1.90625 -0.57813,3 -0.5625,1.07812 -1.65625,1.6875 -1.07812,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82813,2.82813 0.82812,0.9375 2.07812,0.9375 1.25,0 2.0625,-0.9375 0.82813,-0.95313 0.82813,-2.89063 0,-1.82812 -0.82813,-2.76562 -0.82812,-0.9375 -2.0625,
-0.9375 -1.25,0 -2.07812,0.9375 -0.82813,0.9375 -0.82813,2.82812 z m 9.28198,4.92188 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32813 0.75,0.3125 1.10938,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01563 -0.20312,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17188,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76562,0.67188 -0.76562,2.57813 l 0,5.375 -1.67188,0 z m 19.21528,-1.5 0.23437,1.48437 q -0.70312,0.14063 -1.26562,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70313,-0.75 -0.20312,-0.46875 -0.20312,-1.98438 l 0,-5.65625 -1.23438,0 0,-1.3125 1.23438,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29688,0.32812 0.20312,0.125 0.57812,0.125 0.26563,0 0.73438,-0.0781 z m 1.44891,5.29687 -0.17188,-1.5625 q 0.54688,0.14063 0.95313,0.14063 0.54687,0 0.875,-0.1875 0.34375,-0.1875 0.5625,-0.51563 0.15625,-0.25 0.5,-1.25
0.0469,-0.14062 0.15625,-0.40625 l -3.73438,-9.875 1.79688,0 2.04687,5.71875 q 0.40625,1.07813 0.71875,2.28125 0.28125,-1.15625 0.6875,-2.25 l 2.09375,-5.75 1.67188,0 -3.75,10.03125 q -0.59375,1.625 -0.9375,2.23438 -0.4375,0.82812 -1.01563,1.20312 -0.57812,0.39063 -1.375,0.39063 -0.48437,0 -1.07812,-0.20313 z m 9.40625,-0.0156 0,-13.64063 1.53125,0 0,1.28125 q 0.53125,-0.75 1.20312,-1.125 0.6875,-0.375 1.64063,-0.375 1.26562,0 2.23437,0.65625 0.96875,0.64063 1.45313,1.82813 0.5,1.1875 0.5,2.59375 0,1.51562 -0.54688,2.73437 -0.54687,1.20313 -1.57812,1.84375 -1.03125,0.64063 -2.17188,0.64063 -0.84375,0 -1.51562,-0.34375 -0.65625,-0.35938 -1.07813,-0.89063 l 0,4.79688 -1.67187,0 z m 1.51562,-8.65625 q 0,1.90625 0.76563,2.8125 0.78125,0.90625 1.875,0.90625 1.10937,0 1.89062,-0.9375 0.79688,-0.9375 0.79688,-2.92188 0,-1.875 -0.78125,-2.8125 -0.76563,-0.9375 -1.84375,-0.9375 -1.0625,0 -1.89063,1 -0.8125,1 -0.8125,2.89063 z m 15.61011,1.70312 1.71875,0.21875 q -0.40625,1.5 -1.51562,2.34375
-1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42188,-1.32813 -1.26562,-1.32812 -1.26562,-3.73437 0,-2.48438 1.26562,-3.85938 1.28125,-1.375 3.32813,-1.375 1.98437,0 3.23437,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92187,2.48437 0.82813,0.85938 2.0625,0.85938 0.90625,0 1.54688,-0.46875 0.65625,-0.48438 1.04687,-1.54688 z m -5.48437,-2.70312 5.5,0 q -0.10938,-1.23438 -0.625,-1.85938 -0.79688,-0.96875 -2.07813,-0.96875 -1.14062,0 -1.9375,0.78125 -0.78125,0.76563 -0.85937,2.04688 z m 15.5007,5.875 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17188,0 -2.17188,-0.64063 -0.98437,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48438,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98437,-0.64063 2.20312,-0.64063 0.89063,0 1.57813,0.375 0.70312,0.375 1.14062,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54687,0 z m -5.28125,-4.92188 q 0,1.89063 0.79687,2.82813 0.8125,0.9375 1.89063,0.9375 1.09375,0 1.85937,-0.89063 0.76563,-0.890
62 0.76563,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92188,-0.95312 -1.10937,0 -1.85937,0.90625 -0.75,0.90625 -0.75,2.85937 z m 16.01636,1.75 1.71875,0.21875 q -0.40625,1.5 -1.51563,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42187,-1.32813 -1.26563,-1.32812 -1.26563,-3.73437 0,-2.48438 1.26563,-3.85938 1.28125,-1.375 3.32812,-1.375 1.98438,0 3.23438,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92188,2.48437 0.82812,0.85938 2.0625,0.85938 0.90625,0 1.54687,-0.46875 0.65625,-0.48438 1.04688,-1.54688 z m -5.48438,-2.70312 5.5,0 q -0.10937,-1.23438 -0.625,-1.85938 -0.79687,-0.96875 -2.07812,-0.96875 -1.14063,0 -1.9375,0.78125 -0.78125,0.76563 -0.85938,2.04688 z m 9.51633,5.875 0,-8.54688 -1.48438,0 0,-1.3125 1.48438,0 0,-1.04687 q 0,-0.98438 0.17187,-1.46875 0.23438,-0.65625 0.84375,-1.04688 0.60938,-0.40625 1.70313,-0.40625 0.70312,0 1.5625,0.15625 l -0.25,1.46875 q -0.51563,-0.0937 -0.98438,-0.0937 -0.76562,0 -1.
07812,0.32813 -0.3125,0.3125 -0.3125,1.20312 l 0,0.90625 1.92187,0 0,1.3125 -1.92187,0 0,8.54688 -1.65625,0 z m 4.10516,-2.9375 1.65625,-0.26563 q 0.14063,1 0.76563,1.53125 0.64062,0.51563 1.78125,0.51563 1.15625,0 1.70312,-0.46875 0.5625,-0.46875 0.5625,-1.09375 0,-0.5625 -0.48437,-0.89063 -0.34375,-0.21875 -1.70313,-0.5625 -1.84375,-0.46875 -2.5625,-0.79687 -0.70312,-0.34375 -1.07812,-0.9375 -0.35938,-0.60938 -0.35938,-1.32813 0,-0.65625 0.29688,-1.21875 0.3125,-0.5625 0.82812,-0.9375 0.39063,-0.28125 1.0625,-0.48437 0.67188,-0.20313 1.4375,-0.20313 1.17188,0 2.04688,0.34375 0.875,0.32813 1.28125,0.90625 0.42187,0.5625 0.57812,1.51563 l -1.625,0.21875 q -0.10937,-0.75 -0.65625,-1.17188 -0.53125,-0.4375 -1.5,-0.4375 -1.15625,0 -1.64062,0.39063 -0.48438,0.375 -0.48438,0.875 0,0.32812 0.20313,0.59375 0.20312,0.26562 0.64062,0.4375 0.25,0.0937 1.46875,0.4375 1.76563,0.46875 2.46875,0.76562 0.70313,0.29688 1.09375,0.875 0.40625,0.57813 0.40625,1.4375 0,0.82813 -0.48437,1.57813 -0.48438
,0.73437 -1.40625,1.14062 -0.92188,0.39063 -2.07813,0.39063 -1.92187,0 -2.9375,-0.79688 -1,-0.79687 -1.28125,-2.35937 z m 10.4375,2.9375 0,-1.90625 1.90625,0 0,1.90625 q 0,1.04687 -0.375,1.6875 -0.375,0.65625 -1.17187,1 l -0.46875,-0.71875 q 0.53125,-0.21875 0.78125,-0.67188 0.25,-0.45312 0.28125,-1.29687 l -0.95313,0 z m 16.67914,-3.17188 1.71875,0.21875 q -0.40625,1.5 -1.51563,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42187,-1.32813 -1.26563,-1.32812 -1.26563,-3.73437 0,-2.48438 1.26563,-3.85938 1.28125,-1.375 3.32812,-1.375 1.98438,0 3.23438,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92188,2.48437 0.82812,0.85938 2.0625,0.85938 0.90625,0 1.54687,-0.46875 0.65625,-0.48438 1.04688,-1.54688 z m -5.48438,-2.70312 5.5,0 q -0.10937,-1.23438 -0.625,-1.85938 -0.79687,-0.96875 -2.07812,-0.96875 -1.14063,0 -1.9375,0.78125 -0.78125,0.76563 -0.85938,2.04688 z m 12.76636,4.375 0.23438,1.48437 q -0.70313,0.14063 -1.26563,0.14063 -0.906
25,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70312,-0.75 -0.20313,-0.46875 -0.20313,-1.98438 l 0,-5.65625 -1.23437,0 0,-1.3125 1.23437,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29687,0.32812 0.20313,0.125 0.57813,0.125 0.26562,0 0.73437,-0.0781 z m 7.96454,-2.10938 1.64062,0.21875 q -0.26562,1.6875 -1.375,2.65625 -1.10937,0.95313 -2.73437,0.95313 -2.01563,0 -3.25,-1.3125 -1.21875,-1.32813 -1.21875,-3.79688 0,-1.59375 0.51562,-2.78125 0.53125,-1.20312 1.60938,-1.79687 1.09375,-0.60938 2.35937,-0.60938 1.60938,0 2.625,0.8125 1.01563,0.8125 1.3125,2.3125 l -1.625,0.25 q -0.23437,-1 -0.82812,-1.5 -0.59375,-0.5 -1.42188,-0.5 -1.26562,0 -2.0625,0.90625 -0.78125,0.90625 -0.78125,2.85938 0,1.98437 0.76563,2.89062 0.76562,0.89063 1.98437,0.89063 0.98438,0 1.64063,-0.59375 0.65625,-0.60938 0.84375,-1.85938 z m 3.35937,3.60938 0,-1.90625 1.90625,0 0,1.90625 -1.90625,0 z m 16.33533,-1.21875 q -0.9375,0.79687 -1.79687,1.125 -0.85938
,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32813,-1.32813 0.32812,-0.59375 0.85937,-0.95312 0.53125,-0.35938 1.20313,-0.54688 0.5,-0.14062 1.48437,-0.25 2.03125,-0.25 2.98438,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.23438 q 0.23438,-1.04687 0.73438,-1.6875 0.51562,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26562,0 2.04687,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51563,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10937,0.60938 0.4375,1.17188 l -1.75,0 q -0.26563,-0.51563 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35937 -2.73438,0.625 -1.03125,0.14062 -1.45312,0.32812 -0.42188,0.1875 -0.65625,0.54688 -0.23438,0.35937 -0.23438,0.79687 0,0.67188 0.5,1.125 0.51563,0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10937,-1.156
25 0.26563,-0.57813 0.26563,-1.67188 l 0,-0.60937 z m 3.40698,2 1.65625,-0.26563 q 0.14062,1 0.76562,1.53125 0.64063,0.51563 1.78125,0.51563 1.15625,0 1.70313,-0.46875 0.5625,-0.46875 0.5625,-1.09375 0,-0.5625 -0.48438,-0.89063 -0.34375,-0.21875 -1.70312,-0.5625 -1.84375,-0.46875 -2.5625,-0.79687 -0.70313,-0.34375 -1.07813,-0.9375 -0.35937,-0.60938 -0.35937,-1.32813 0,-0.65625 0.29687,-1.21875 0.3125,-0.5625 0.82813,-0.9375 0.39062,-0.28125 1.0625,-0.48437 0.67187,-0.20313 1.4375,-0.20313 1.17187,0 2.04687,0.34375 0.875,0.32813 1.28125,0.90625 0.42188,0.5625 0.57813,1.51563 l -1.625,0.21875 q -0.10938,-0.75 -0.65625,-1.17188 -0.53125,-0.4375 -1.5,-0.4375 -1.15625,0 -1.64063,0.39063 -0.48437,0.375 -0.48437,0.875 0,0.32812 0.20312,0.59375 0.20313,0.26562 0.64063,0.4375 0.25,0.0937 1.46875,0.4375 1.76562,0.46875 2.46875,0.76562 0.70312,0.29688 1.09375,0.875 0.40625,0.57813 0.40625,1.4375 0,0.82813 -0.48438,1.57813 -0.48437,0.73437 -1.40625,1.14062 -0.92187,0.39063 -2.07812,0.39063 -1.9
2188,0 -2.9375,-0.79688 -1,-0.79687 -1.28125,-2.35937 z" id="path79" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 364.10455,380.46243 q -0.9375,0.79687 -1.79687,1.125 -0.85938,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32813,-1.32813 0.32812,-0.59375 0.85937,-0.95312 0.53125,-0.35938 1.20313,-0.54688 0.5,-0.14062 1.48437,-0.25 2.03125,-0.25 2.98438,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.23438 q 0.23438,-1.04687 0.73438,-1.6875 0.51562,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26562,0 2.04687,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51563,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10937,0.60938 0.4375,1.17188 l -1.75,0 q -0.26563,-0.51563 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35937 -2.73438,0.625 -1.03125,0.14062 -1.45312,0.32812 -0.42188,0.1875 -0.65625,0.54688 -0.23438,0.35937 -0.23438,0.79687 0,0.67188 0.5,1.125 0.51563,
0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10937,-1.15625 0.26563,-0.57813 0.26563,-1.67188 l 0,-0.60937 z m 3.78195,5.75 1.60937,0.25 q 0.10938,0.75 0.57813,1.09375 0.60937,0.45312 1.6875,0.45312 1.17187,0 1.79687,-0.46875 0.625,-0.45312 0.85938,-1.28125 0.125,-0.51562 0.10937,-2.15625 -1.09375,1.29688 -2.71875,1.29688 -2.03125,0 -3.15625,-1.46875 -1.10937,-1.46875 -1.10937,-3.51563 0,-1.40625 0.51562,-2.59375 0.51563,-1.20312 1.48438,-1.84375 0.96875,-0.65625 2.26562,-0.65625 1.75,0 2.875,1.40625 l 0,-1.1875 1.54688,0 0,8.51563 q 0,2.3125 -0.46875,3.26562 -0.46875,0.96875 -1.48438,1.51563 -1.01562,0.5625 -2.5,0.5625 -1.76562,0 -2.85937,-0.79688 -1.07813,-0.79687 -1.03125,-2.39062 z m 1.375,-5.92188 q 0,1.95313 0.76562,2.84375 0.78125,0.89063 1.9375,0.89063 1.14063,0 1.92188,-0.89063 0.78125,-0.89062 0.78125,-2.78125 0,-1.8125 -0.8125,-2.71875 -0.79688,-0.92187 -1.92188,-0.92187 -1.10937,0 -1.89062,0.90625 -0.78125,0.89062 -0.78125,2.67187 z m 9.28198,5.10938 0
,-9.85938 1.5,0 0,1.5 q 0.57812,-1.04687 1.0625,-1.375 0.48437,-0.34375 1.07812,-0.34375 0.84375,0 1.71875,0.54688 l -0.57812,1.54687 q -0.60938,-0.35937 -1.23438,-0.35937 -0.54687,0 -0.98437,0.32812 -0.42188,0.32813 -0.60938,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67187,0 z m 12.9783,-3.17188 1.71875,0.21875 q -0.40625,1.5 -1.51562,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42188,-1.32813 -1.26562,-1.32812 -1.26562,-3.73437 0,-2.48438 1.26562,-3.85938 1.28125,-1.375 3.32813,-1.375 1.98437,0 3.23437,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92187,2.48437 0.82813,0.85938 2.0625,0.85938 0.90625,0 1.54688,-0.46875 0.65625,-0.48438 1.04687,-1.54688 z m -5.48437,-2.70312 5.5,0 q -0.10938,-1.23438 -0.625,-1.85938 -0.79688,-0.96875 -2.07813,-0.96875 -1.14062,0 -1.9375,0.78125 -0.78125,0.76563 -0.85937,2.04688 z m 15.86007,2.70312 1.71875,0.21875 q -0.40625,1.5 -1.51562,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15
625,0 -3.42188,-1.32813 -1.26562,-1.32812 -1.26562,-3.73437 0,-2.48438 1.26562,-3.85938 1.28125,-1.375 3.32813,-1.375 1.98437,0 3.23437,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92187,2.48437 0.82813,0.85938 2.0625,0.85938 0.90625,0 1.54688,-0.46875 0.65625,-0.48438 1.04687,-1.54688 z m -5.48437,-2.70312 5.5,0 q -0.10938,-1.23438 -0.625,-1.85938 -0.79688,-0.96875 -2.07813,-0.96875 -1.14062,0 -1.9375,0.78125 -0.78125,0.76563 -0.85937,2.04688 z m 15.50073,5.875 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17187,0 -2.17187,-0.64063 -0.98438,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48437,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98438,-0.64063 2.20313,-0.64063 0.89062,0 1.57812,0.375 0.70313,0.375 1.14063,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54688,0 z m -5.28125,-4.92188 q 0,1.89063 0.79688,2.82813 0.8125,0.9375 1.89062,0.9375 1.09375,0 1.85938,-0.89063 0.76562,-0.89062 0.76562,-2.73437 0,-2.01563 -0.7812
5,-2.95313 -0.78125,-0.95312 -1.92187,-0.95312 -1.10938,0 -1.85938,0.90625 -0.75,0.90625 -0.75,2.85937 z m 18.1059,3.42188 0.23437,1.48437 q -0.70312,0.14063 -1.26562,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70313,-0.75 -0.20312,-0.46875 -0.20312,-1.98438 l 0,-5.65625 -1.23438,0 0,-1.3125 1.23438,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29688,0.32812 0.20312,0.125 0.57812,0.125 0.26563,0 0.73438,-0.0781 z m 0.90203,-3.42188 q 0,-2.73437 1.53125,-4.0625 1.26563,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29688,1.32813 1.29688,3.67188 0,1.90625 -0.57813,3 -0.5625,1.07812 -1.65625,1.6875 -1.07812,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82813,2.82813 0.82812,0.9375 2.07812,0.9375 1.25,0 2.0625,-0.9375 0.82813,-0.95313 0.82813,-2.89063 0,-1.82812 -0.82813,-2.76562 -0.82812,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07812,0.9375 -0.8
2813,0.9375 -0.82813,2.82812 z m 16.01215,4.92188 -1.54687,0 0,-13.59375 1.65625,0 0,4.84375 q 1.0625,-1.32813 2.70312,-1.32813 0.90625,0 1.71875,0.375 0.8125,0.35938 1.32813,1.03125 0.53125,0.65625 0.82812,1.59375 0.29688,0.9375 0.29688,2 0,2.53125 -1.25,3.92188 -1.25,1.375 -3,1.375 -1.75,0 -2.73438,-1.45313 l 0,1.23438 z m -0.0156,-5 q 0,1.76562 0.46875,2.5625 0.79687,1.28125 2.14062,1.28125 1.09375,0 1.89063,-0.9375 0.79687,-0.95313 0.79687,-2.84375 0,-1.92188 -0.76562,-2.84375 -0.76563,-0.92188 -1.84375,-0.92188 -1.09375,0 -1.89063,0.95313 -0.79687,0.95312 -0.79687,2.75 z m 8.76635,8.79687 -0.17187,-1.5625 q 0.54687,0.14063 0.95312,0.14063 0.54688,0 0.875,-0.1875 0.34375,-0.1875 0.5625,-0.51563 0.15625,-0.25 0.5,-1.25 0.0469,-0.14062 0.15625,-0.40625 l -3.73437,-9.875 1.79687,0 2.04688,5.71875 q 0.40625,1.07813 0.71875,2.28125 0.28125,-1.15625 0.6875,-2.25 l 2.09375,-5.75 1.67187,0 -3.75,10.03125 q -0.59375,1.625 -0.9375,2.23438 -0.4375,0.82812 -1.01562,1.20312 -0.57813,0.39063
-1.375,0.39063 -0.48438,0 -1.07813,-0.20313 z m 14.58954,-0.0156 0,-13.64063 1.53125,0 0,1.28125 q 0.53125,-0.75 1.20313,-1.125 0.6875,-0.375 1.64062,-0.375 1.26563,0 2.23438,0.65625 0.96875,0.64063 1.45312,1.82813 0.5,1.1875 0.5,2.59375 0,1.51562 -0.54687,2.73437 -0.54688,1.20313 -1.57813,1.84375 -1.03125,0.64063 -2.17187,0.64063 -0.84375,0 -1.51563,-0.34375 -0.65625,-0.35938 -1.07812,-0.89063 l 0,4.79688 -1.67188,0 z m 1.51563,-8.65625 q 0,1.90625 0.76562,2.8125 0.78125,0.90625 1.875,0.90625 1.10938,0 1.89063,-0.9375 0.79687,-0.9375 0.79687,-2.92188 0,-1.875 -0.78125,-2.8125 -0.76562,-0.9375 -1.84375,-0.9375 -1.0625,0 -1.89062,1 -0.8125,1 -0.8125,2.89063 z m 8.82885,4.875 0,-13.59375 1.67188,0 0,13.59375 -1.67188,0 z m 10.61356,-1.21875 q -0.9375,0.79687 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32812,-1.32813 0.32813,-0.59375 0.85938,-0.95312 0.53125,-0.35938 1.20312,-0.54688 0.5,-0.14062 1.48438,-0.25
2.03125,-0.25 2.98437,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.4375 -0.64062,-0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.23438 q 0.23437,-1.04687 0.73437,-1.6875 0.51563,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26563,0 2.04688,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51562,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10938,0.60938 0.4375,1.17188 l -1.75,0 q -0.26562,-0.51563 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35937 -2.73437,0.625 -1.03125,0.14062 -1.45313,0.32812 -0.42187,0.1875 -0.65625,0.54688 -0.23437,0.35937 -0.23437,0.79687 0,0.67188 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57813 0.26562,-1.67188 l 0,-0.60937 z m 7.73511,3.4375 0.23438,1.48437 q -0.70313,0.14063 -1.26563,0.14063 -0.90625,0 -1.40625,-0.28125 -0.5,-0.29688 -0.70312,-0.75 -0.20313,-0.46875 -0.20313,-
1.98438 l 0,-5.65625 -1.23437,0 0,-1.3125 1.23437,0 0,-2.4375 1.65625,-1 0,3.4375 1.6875,0 0,1.3125 -1.6875,0 0,5.75 q 0,0.71875 0.0781,0.92188 0.0937,0.20312 0.29687,0.32812 0.20313,0.125 0.57813,0.125 0.26562,0 0.73437,-0.0781 z m 1.93329,1.5 0,-8.54688 -1.48437,0 0,-1.3125 1.48437,0 0,-1.04687 q 0,-0.98438 0.17188,-1.46875 0.23437,-0.65625 0.84375,-1.04688 0.60937,-0.40625 1.70312,-0.40625 0.70313,0 1.5625,0.15625 l -0.25,1.46875 q -0.51562,-0.0937 -0.98437,-0.0937 -0.76563,0 -1.07813,0.32813 -0.3125,0.3125 -0.3125,1.20312 l 0,0.90625 1.92188,0 0,1.3125 -1.92188,0 0,8.54688 -1.65625,0 z m 4.15207,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26562,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29687,1.32813 1.29687,3.67188 0,1.90625 -0.57812,3 -0.5625,1.07812 -1.65625,1.6875 -1.07813,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82812,2.82813 0.82813,0.9375 2.07813,0.9375 1.25,0 2.0625,-0.9375 0.82812,-0.95313 0.
82812,-2.89063 0,-1.82812 -0.82812,-2.76562 -0.82813,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07813,0.9375 -0.82812,0.9375 -0.82812,2.82812 z m 9.26633,4.92188 0,-9.85938 1.5,0 0,1.5 q 0.57812,-1.04687 1.0625,-1.375 0.48437,-0.34375 1.07812,-0.34375 0.84375,0 1.71875,0.54688 l -0.57812,1.54687 q -0.60938,-0.35937 -1.23438,-0.35937 -0.54687,0 -0.98437,0.32812 -0.42188,0.32813 -0.60938,0.90625 -0.28125,0.89063 -0.28125,1.95313 l 0,5.15625 -1.67187,0 z m 6.22827,0 0,-9.85938 1.5,0 0,1.39063 q 0.45312,-0.71875 1.21875,-1.15625 0.78125,-0.45313 1.76562,-0.45313 1.09375,0 1.79688,0.45313 0.70312,0.45312 0.98437,1.28125 1.17188,-1.73438 3.04688,-1.73438 1.46875,0 2.25,0.8125 0.79687,0.8125 0.79687,2.5 l 0,6.76563 -1.67187,0 0,-6.20313 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45312 -0.59375,-0.71875 -0.42188,-0.26562 -1,-0.26562 -1.03125,0 -1.71875,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67188,0 0,-6.40625 q 0,-1.10938 -0.40625,-1.65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70312,0 -1.3125
,0.375 -0.59375,0.35937 -0.85937,1.07812 -0.26563,0.71875 -0.26563,2.0625 l 0,5.10938 -1.67187,0 z m 14.86896,-2.9375 1.65625,-0.26563 q 0.14062,1 0.76562,1.53125 0.64063,0.51563 1.78125,0.51563 1.15625,0 1.70313,-0.46875 0.5625,-0.46875 0.5625,-1.09375 0,-0.5625 -0.48438,-0.89063 -0.34375,-0.21875 -1.70312,-0.5625 -1.84375,-0.46875 -2.5625,-0.79687 -0.70313,-0.34375 -1.07813,-0.9375 -0.35937,-0.60938 -0.35937,-1.32813 0,-0.65625 0.29687,-1.21875 0.3125,-0.5625 0.82813,-0.9375 0.39062,-0.28125 1.0625,-0.48437 0.67187,-0.20313 1.4375,-0.20313 1.17187,0 2.04687,0.34375 0.875,0.32813 1.28125,0.90625 0.42188,0.5625 0.57813,1.51563 l -1.625,0.21875 q -0.10938,-0.75 -0.65625,-1.17188 -0.53125,-0.4375 -1.5,-0.4375 -1.15625,0 -1.64063,0.39063 -0.48437,0.375 -0.48437,0.875 0,0.32812 0.20312,0.59375 0.20313,0.26562 0.64063,0.4375 0.25,0.0937 1.46875,0.4375 1.76562,0.46875 2.46875,0.76562 0.70312,0.29688 1.09375,0.875 0.40625,0.57813 0.40625,1.4375 0,0.82813 -0.48438,1.57813 -0.48437,0.73437 -
1.40625,1.14062 -0.92187,0.39063 -2.07812,0.39063 -1.92188,0 -2.9375,-0.79688 -1,-0.79687 -1.28125,-2.35937 z m 13.90203,2.9375 5.23438,-13.59375 1.9375,0 5.5625,13.59375 -2.04688,0 -1.59375,-4.125 -5.6875,0 -1.48437,4.125 -1.92188,0 z m 3.92188,-5.57813 4.60937,0 -1.40625,-3.78125 q -0.65625,-1.70312 -0.96875,-2.8125 -0.26562,1.3125 -0.73437,2.59375 l -1.5,4 z m 10.24048,5.57813 0,-1.90625 1.90625,0 0,1.90625 q 0,1.04687 -0.375,1.6875 -0.375,0.65625 -1.17188,1 l -0.46875,-0.71875 q 0.53125,-0.21875 0.78125,-0.67188 0.25,-0.45312 0.28125,-1.29687 l -0.95312,0 z m 10.0697,0 0,-13.59375 5.10938,0 q 1.54687,0 2.48437,0.40625 0.95313,0.40625 1.48438,1.26562 0.53125,0.85938 0.53125,1.79688 0,0.875 -0.46875,1.65625 -0.46875,0.76562 -1.4375,1.23437 1.23437,0.35938 1.89062,1.23438 0.67188,0.875 0.67188,2.0625 0,0.95312 -0.40625,1.78125 -0.39063,0.8125 -0.98438,1.26562 -0.59375,0.4375 -1.5,0.67188 -0.89062,0.21875 -2.1875,0.21875 l -5.1875,0 z m 1.79688,-7.89063 2.9375,0 q 1.20312,0 1.71875,
-0.15625 0.6875,-0.20312 1.03125,-0.67187 0.35937,-0.46875 0.35937,-1.1875 0,-0.67188 -0.32812,-1.1875 -0.32813,-0.51563 -0.9375,-0.70313 -0.59375,-0.20312 -2.0625,-0.20312 l -2.71875,0 0,4.10937 z m 0,6.28125 3.39062,0 q 0.875,0 1.21875,-0.0625 0.625,-0.10937 1.04688,-0.35937 0.42187,-0.26563 0.6875,-0.76563 0.26562,-0.5 0.26562,-1.14062 0,-0.76563 -0.39062,-1.32813 -0.39063,-0.5625 -1.07813,-0.78125 -0.6875,-0.23437 -1.98437,-0.23437 l -3.15625,0 0,4.67187 z m 10.9436,1.60938 0,-1.90625 1.90625,0 0,1.90625 q 0,1.04687 -0.375,1.6875 -0.375,0.65625 -1.17188,1 l -0.46875,-0.71875 q 0.53125,-0.21875 0.78125,-0.67188 0.25,-0.45312 0.28125,-1.29687 l -0.95312,0 z m 19.85095,-4.76563 1.79688,0.45313 q -0.5625,2.21875 -2.03125,3.39062 -1.46875,1.15625 -3.59375,1.15625 -2.20313,0 -3.57813,-0.89062 -1.375,-0.90625 -2.09375,-2.59375 -0.71875,-1.70313 -0.71875,-3.65625 0,-2.125 0.79688,-3.70313 0.8125,-1.57812 2.3125,-2.39062 1.5,-0.82813 3.29687,-0.82813 2.04688,0 3.4375,1.04688 1.39063,1.03
125 1.9375,2.90625 l -1.76562,0.42187 q -0.46875,-1.48437 -1.375,-2.15625 -0.90625,-0.6875 -2.26563,-0.6875 -1.5625,0 -2.625,0.75 -1.04687,0.75 -1.48437,2.03125 -0.42188,1.26563 -0.42188,2.60938 0,1.73437 0.5,3.03125 0.51563,1.28125 1.57813,1.92187 1.07812,0.64063 2.3125,0.64063 1.51562,0 2.5625,-0.85938 1.04687,-0.875 1.42187,-2.59375 z" id="path81" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 473.8294,429.58664 7.88974,0 0,-42.61417 15.77954,0 0,42.61417 7.88977,0 -15.77954,15.77954 z" id="path83" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 473.8294,429.58664 7.88974,0 0,-42.61417 15.77954,0 0,42.61417 7.88977,0 -15.77954,15.77954 z" id="path85" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 576.91077,40.913387 272.9134,0 0,69.952763 -272.9134,0 z" id="path87" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 576.91077,40.913387 272.9134,0 0,69.952763 -272.9134,0 z" id="path89" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 635.0471,87.609764 8.79687,-22.90625 3.26563,0 9.375,22.90625 -3.45313,0 -2.67187,-6.9375 -9.57813,0 -2.51562,6.9375 -3.21875,0 z m 6.60937,-9.40625 7.76563,0 -2.39063,-6.34375 q -1.09375,-2.890625 -1.625,-4.75 -0.4375,2.203125 -1.23437,4.375 l -2.51563,6.71875 z m 16.89063,15.765625 0,-22.953125 2.5625,0 0,2.15625 q 0.90625,-1.265625 2.04687,-1.890625 1.14063,-0.640625 2.76563,-0.640625 2.125,0 3.75,1.09375 1.625,1.09375 2.45312,3.09375 0.82813,1.984375 0.82813,4.359375 0,2.546875 -0.92188,4.59375 -0.90625,2.03125 -2.65625,3.125 -1.73437,1.078125 -3.65625,1.078125 -1.40625,0 -2.53125,-0.59375 -1.10937,-0.59375 -1.82812,-1.5 l 0,8.078125 -2.8125,0 z m 2.54687,-14.5625 q 0,3.203125 1.29688,4.734375 1.29687,1.53125 3.14062,1.53125 1.875,0 3.20313,-1.578125 1.34375,-1.59375 1.34375,-4.921875 0,-3.171875 -1.3125,-4.75 -1.29688,-1.578125 -3.10938,-1.578125 -1.79687,0 -3.1875,1.6875 -1.375,1.671875 -1.375,4.875 z m 15.25,14.5625 0,-22.953125 2.5625,0 0,2.15625 q 0.90625,-1.
265625 2.04688,-1.890625 1.14062,-0.640625 2.76562,-0.640625 2.125,0 3.75,1.09375 1.625,1.09375 2.45313,3.09375 0.82812,1.984375 0.82812,4.359375 0,2.546875 -0.92187,4.59375 -0.90625,2.03125 -2.65625,3.125 -1.73438,1.078125 -3.65625,1.078125 -1.40625,0 -2.53125,-0.59375 -1.10938,-0.59375 -1.82813,-1.5 l 0,8.078125 -2.8125,0 z m 2.54688,-14.5625 q 0,3.203125 1.29687,4.734375 1.29688,1.53125 3.14063,1.53125 1.875,0 3.20312,-1.578125 1.34375,-1.59375 1.34375,-4.921875 0,-3.171875 -1.3125,-4.75 -1.29687,-1.578125 -3.10937,-1.578125 -1.79688,0 -3.1875,1.6875 -1.375,1.671875 -1.375,4.875 z m 15.1875,8.203125 0,-22.90625 2.8125,0 0,22.90625 -2.8125,0 z m 7.1875,-19.671875 0,-3.234375 2.8125,0 0,3.234375 -2.8125,0 z m 0,19.671875 0,-16.59375 2.8125,0 0,16.59375 -2.8125,0 z m 17.92187,-6.078125 2.76563,0.359375 q -0.45313,2.859375 -2.32813,4.484375 -1.85937,1.609375 -4.57812,1.609375 -3.40625,0 -5.48438,-2.21875 -2.0625,-2.234375 -2.0625,-6.390625 0,-2.6875 0.89063,-4.703125 0.89062,-2.01562
5 2.70312,-3.015625 1.82813,-1.015625 3.96875,-1.015625 2.70313,0 4.42188,1.375 1.71875,1.359375 2.20312,3.875 l -2.73437,0.421875 q -0.39063,-1.671875 -1.39063,-2.515625 -0.98437,-0.84375 -2.39062,-0.84375 -2.125,0 -3.45313,1.53125 -1.32812,1.515625 -1.32812,4.8125 0,3.34375 1.28125,4.859375 1.28125,1.515625 3.34375,1.515625 1.65625,0 2.76562,-1.015625 1.10938,-1.015625 1.40625,-3.125 z m 16,4.03125 q -1.5625,1.328125 -3.01562,1.875 -1.4375,0.546875 -3.09375,0.546875 -2.73438,0 -4.20313,-1.328125 -1.46875,-1.34375 -1.46875,-3.421875 0,-1.21875 0.54688,-2.21875 0.5625,-1.015625 1.45312,-1.625 0.90625,-0.609375 2.03125,-0.921875 0.82813,-0.21875 2.5,-0.421875 3.40625,-0.40625 5.01563,-0.96875 0.0156,-0.578125 0.0156,-0.734375 0,-1.71875 -0.79687,-2.421875 -1.07813,-0.953125 -3.20313,-0.953125 -1.98437,0 -2.9375,0.703125 -0.9375,0.6875 -1.39062,2.453125 l -2.75,-0.375 q 0.375,-1.765625 1.23437,-2.84375 0.85938,-1.09375 2.48438,-1.671875 1.625,-0.59375 3.76562,-0.59375 2.125,0 3.45313,
0.5 1.32812,0.5 1.95312,1.265625 0.625,0.75 0.875,1.90625 0.14063,0.71875 0.14063,2.59375 l 0,3.75 q 0,3.921875 0.17187,4.96875 0.1875,1.03125 0.71875,1.984375 l -2.9375,0 q -0.4375,-0.875 -0.5625,-2.046875 z m -0.23437,-6.28125 q -1.53125,0.625 -4.59375,1.0625 -1.73438,0.25 -2.45313,0.5625 -0.71875,0.3125 -1.10937,0.921875 -0.39063,0.59375 -0.39063,1.328125 0,1.125 0.84375,1.875 0.85938,0.75 2.5,0.75 1.625,0 2.89063,-0.703125 1.26562,-0.71875 1.85937,-1.953125 0.45313,-0.953125 0.45313,-2.8125 l 0,-1.03125 z m 13.34375,5.8125 0.40625,2.484375 q -1.1875,0.25 -2.125,0.25 -1.53125,0 -2.375,-0.484375 -0.84375,-0.484375 -1.1875,-1.265625 -0.34375,-0.796875 -0.34375,-3.328125 l 0,-9.546875 -2.0625,0 0,-2.1875 2.0625,0 0,-4.109375 2.79687,-1.6875 0,5.796875 2.82813,0 0,2.1875 -2.82813,0 0,9.703125 q 0,1.203125 0.14063,1.546875 0.15625,0.34375 0.48437,0.546875 0.34375,0.203125 0.96875,0.203125 0.46875,0 1.23438,-0.109375 z m 2.76562,-17.15625 0,-3.234375 2.8125,0 0,3.234375 -2.8125,0 z m 0
,19.671875 0,-16.59375 2.8125,0 0,16.59375 -2.8125,0 z m 6.04688,-8.296875 q 0,-4.609375 2.5625,-6.828125 2.14062,-1.84375 5.21875,-1.84375 3.42187,0 5.59375,2.25 2.17187,2.234375 2.17187,6.1875 0,3.203125 -0.96875,5.046875 -0.95312,1.828125 -2.79687,2.84375 -1.82813,1.015625 -4,1.015625 -3.48438,0 -5.64063,-2.234375 -2.14062,-2.234375 -2.14062,-6.4375 z m 2.89062,0 q 0,3.1875 1.39063,4.78125 1.39062,1.578125 3.5,1.578125 2.09375,0 3.48437,-1.59375 1.39063,-1.59375 1.39063,-4.859375 0,-3.078125 -1.40625,-4.65625 -1.39063,-1.59375 -3.46875,-1.59375 -2.10938,0 -3.5,1.578125 -1.39063,1.578125 -1.39063,4.765625 z m 15.95313,8.296875 0,-16.59375 2.53125,0 0,2.359375 q 1.82812,-2.734375 5.28125,-2.734375 1.5,0 2.75,0.546875 1.26562,0.53125 1.89062,1.40625 0.625,0.875 0.875,2.078125 0.15625,0.78125 0.15625,2.734375 l 0,10.203125 -2.8125,0 0,-10.09375 q 0,-1.71875 -0.32812,-2.5625 -0.32813,-0.859375 -1.17188,-1.359375 -0.82812,-0.515625 -1.95312,-0.515625 -1.79688,0 -3.10938,1.140625 -1.296
87,1.140625 -1.29687,4.328125 l 0,9.0625 -2.8125,0 z" id="path91" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 576.91077,176.91339 272.9134,0 0,69.95274 -272.9134,0 z" id="path93" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 576.91077,176.91339 272.9134,0 0,69.95274 -272.9134,0 z" id="path95" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 665.844,201.05476 q 0,-4.26563 2.29688,-6.6875 2.29687,-2.42188 5.9375,-2.42188 2.375,0 4.28125,1.14063 1.92187,1.125 2.92187,3.17187 1,2.03125 1,4.60938 0,2.60937 -1.0625,4.67187 -1.04687,2.0625 -2.98437,3.125 -1.9375,1.0625 -4.17188,1.0625 -2.42187,0 -4.34375,-1.17187 -1.90625,-1.17188 -2.89062,-3.20313 -0.98438,-2.03125 -0.98438,-4.29687 z m 2.34375,0.0469 q 0,3.09375 1.67188,4.89063 1.67187,1.78125 4.1875,1.78125 2.57812,0 4.23437,-1.79688 1.65625,-1.8125 1.65625,-5.125 0,-2.09375 -0.71875,-3.65625 -0.70312,-1.57812 -2.07812,-2.4375 -1.35938,-0.85937 -3.04688,-0.85937 -2.42187,0 -4.17187,1.65625 -1.73438,1.65625 -1.73438,5.54687 z m 17.02734,8.32813 0,-17.1875 5.90625,0 q 2.01563,0 3.0625,0.25 1.48438,0.34375 2.51563,1.23437 1.35937,1.14063 2.03125,2.9375 0.6875,1.78125 0.6875,4.07813 0,1.95312 -0.46875,3.46875 -0.45313,1.51562 -1.17188,2.51562 -0.70312,0.98438 -1.5625,1.54688 -0.84375,0.5625 -2.04687,0.85937 -1.20313,0.29688 -2.76563,0.29688 l -6.1875,0 z m 2.265
63,-2.03125 3.67187,0 q 1.70313,0 2.65625,-0.3125 0.96875,-0.3125 1.54688,-0.89063 0.8125,-0.8125 1.26562,-2.17187 0.45313,-1.375 0.45313,-3.3125 0,-2.70313 -0.89063,-4.14063 -0.89062,-1.45312 -2.15625,-1.9375 -0.90625,-0.35937 -2.9375,-0.35937 l -3.60937,0 0,13.125 z m 15.06641,2.03125 0,-17.1875 6.46875,0 q 1.71875,0 2.625,0.17187 1.26562,0.20313 2.10937,0.79688 0.85938,0.59375 1.375,1.67187 0.53125,1.0625 0.53125,2.32813 0,2.20312 -1.40625,3.71875 -1.39062,1.51562 -5.03125,1.51562 l -4.40625,0 0,6.98438 -2.26562,0 z m 2.26562,-9.01563 4.4375,0 q 2.20313,0 3.125,-0.8125 0.9375,-0.82812 0.9375,-2.3125 0,-1.07812 -0.54687,-1.84375 -0.54688,-0.76562 -1.4375,-1.01562 -0.57813,-0.15625 -2.125,-0.15625 l -4.39063,0 0,6.14062 z m 18.51953,9.01563 6.59375,-17.1875 2.45313,0 7.03125,17.1875 -2.59375,0 -2,-5.20313 -7.1875,0 -1.89063,5.20313 -2.40625,0 z m 4.95313,-7.0625 5.82812,0 -1.79687,-4.75 q -0.8125,-2.17188 -1.21875,-3.5625 -0.32813,1.65625 -0.92188,3.28125 l -1.89062,5.03125 z m 12.
94531,7.0625 0,-17.1875 6.46875,0 q 1.71875,0 2.625,0.17187 1.26562,0.20313 2.10937,0.79688 0.85938,0.59375 1.375,1.67187 0.53125,1.0625 0.53125,2.32813 0,2.20312 -1.40625,3.71875 -1.39062,1.51562 -5.03125,1.51562 l -4.40625,0 0,6.98438 -2.26562,0 z m 2.26562,-9.01563 4.4375,0 q 2.20313,0 3.125,-0.8125 0.9375,-0.82812 0.9375,-2.3125 0,-1.07812 -0.54687,-1.84375 -0.54688,-0.76562 -1.4375,-1.01562 -0.57813,-0.15625 -2.125,-0.15625 l -4.39063,0 0,6.14062 z m 14.11719,9.01563 0,-17.1875 2.28125,0 0,17.1875 -2.28125,0 z" id="path97" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 636.98206,233.30977 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17187,0 -2.17187,-0.64063 -0.98438,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48437,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98438,-0.64063 2.20313,-0.64063 0.89062,0 1.57812,0.375 0.70313,0.375 1.14063,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54688,0 z m -5.28125,-4.92188 q 0,1.89063 0.79688,2.82813 0.8125,0.9375 1.89062,0.9375 1.09375,0 1.85938,-0.89063 0.76562,-0.89062 0.76562,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92187,-0.95312 -1.10938,0 -1.85938,0.90625 -0.75,0.90625 -0.75,2.85937 z m 16.01636,1.75 1.71875,0.21875 q -0.40625,1.5 -1.51563,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42187,-1.32813 -1.26563,-1.32812 -1.26563,-3.73437 0,-2.48438 1.26563,-3.85938 1.28125,-1.375 3.32812,-1.375 1.98438,0 3.23438,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92188,2.48437 0.82812,0.85938 2.0625,0.85938
0.90625,0 1.54687,-0.46875 0.65625,-0.48438 1.04688,-1.54688 z m -5.48438,-2.70312 5.5,0 q -0.10937,-1.23438 -0.625,-1.85938 -0.79687,-0.96875 -2.07812,-0.96875 -1.14063,0 -1.9375,0.78125 -0.78125,0.76563 -0.85938,2.04688 z m 9.51636,5.875 0,-8.54688 -1.48438,0 0,-1.3125 1.48438,0 0,-1.04687 q 0,-0.98438 0.17187,-1.46875 0.23438,-0.65625 0.84375,-1.04688 0.60938,-0.40625 1.70313,-0.40625 0.70312,0 1.5625,0.15625 l -0.25,1.46875 q -0.51563,-0.0937 -0.98438,-0.0937 -0.76562,0 -1.07812,0.32813 -0.3125,0.3125 -0.3125,1.20312 l 0,0.90625 1.92187,0 0,1.3125 -1.92187,0 0,8.54688 -1.65625,0 z m 4.79266,-11.6875 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 4.12921,0 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32813 0.75,0.3125 1.10938,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01563 -0.20312,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.296
87 -1.17188,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76562,0.67188 -0.76562,2.57813 l 0,5.375 -1.67188,0 z m 17.12574,-3.17188 1.71875,0.21875 q -0.40625,1.5 -1.51563,2.34375 -1.09375,0.82813 -2.8125,0.82813 -2.15625,0 -3.42187,-1.32813 -1.26563,-1.32812 -1.26563,-3.73437 0,-2.48438 1.26563,-3.85938 1.28125,-1.375 3.32812,-1.375 1.98438,0 3.23438,1.34375 1.25,1.34375 1.25,3.79688 0,0.14062 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92188,2.48437 0.82812,0.85938 2.0625,0.85938 0.90625,0 1.54687,-0.46875 0.65625,-0.48438 1.04688,-1.54688 z m -5.48438,-2.70312 5.5,0 q -0.10937,-1.23438 -0.625,-1.85938 -0.79687,-0.96875 -2.07812,-0.96875 -1.14063,0 -1.9375,0.78125 -0.78125,0.76563 -0.85938,2.04688 z m 15.50067,5.875 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17187,0 -2.17187,-0.64063 -0.98438,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48437,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98438,-0.64063 2.20313,-0.64063 0.89062,0 1.57812,0.375 0.70313,0.375 1.1406
3,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54688,0 z m -5.28125,-4.92188 q 0,1.89063 0.79688,2.82813 0.8125,0.9375 1.89062,0.9375 1.09375,0 1.85938,-0.89063 0.76562,-0.89062 0.76562,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92187,-0.95312 -1.10938,0 -1.85938,0.90625 -0.75,0.90625 -0.75,2.85937 z m 14.46527,-6.76562 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 4.12921,0 0,-9.85938 1.5,0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32813 0.75,0.3125 1.10938,0.84375 0.375,0.51562 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01563 -0.20312,-1.51563 -0.1875,-0.51562 -0.6875,-0.8125 -0.5,-0.29687 -1.17188,-0.29687 -1.0625,0 -1.84375,0.67187 -0.76562,0.67188 -0.76562,2.57813 l 0,5.375 -1.67188,0 z m 14.93403,-4.92188 q 0,-2.73437 1.53125,-4.0625 1.26562,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29687,1.32813 1.29687,3.67188 0,1.90625 -0.57812,3 -0.5625,1.
07812 -1.65625,1.6875 -1.07813,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32813 -1.28125,-1.32812 -1.28125,-3.8125 z m 1.71875,0 q 0,1.89063 0.82812,2.82813 0.82813,0.9375 2.07813,0.9375 1.25,0 2.0625,-0.9375 0.82812,-0.95313 0.82812,-2.89063 0,-1.82812 -0.82812,-2.76562 -0.82813,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07813,0.9375 -0.82812,0.9375 -0.82812,2.82812 z m 15.6726,4.92188 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17187,0 -2.17187,-0.64063 -0.98438,-0.65625 -1.53125,-1.8125 -0.53125,-1.17187 -0.53125,-2.6875 0,-1.46875 0.48437,-2.67187 0.5,-1.20313 1.46875,-1.84375 0.98438,-0.64063 2.20313,-0.64063 0.89062,0 1.57812,0.375 0.70313,0.375 1.14063,0.98438 l 0,-4.875 1.65625,0 0,13.59375 -1.54688,0 z m -5.28125,-4.92188 q 0,1.89063 0.79688,2.82813 0.8125,0.9375 1.89062,0.9375 1.09375,0 1.85938,-0.89063 0.76562,-0.89062 0.76562,-2.73437 0,-2.01563 -0.78125,-2.95313 -0.78125,-0.95312 -1.92187,-0.95312 -1.10938,0 -1.85938,0.90625 -0.75,0.90625 -0.75,2.85937 z m 9.26636,8.70313 0,-1
3.64063 1.53125,0 0,1.28125 q 0.53125,-0.75 1.20312,-1.125 0.6875,-0.375 1.64063,-0.375 1.26562,0 2.23437,0.65625 0.96875,0.64063 1.45313,1.82813 0.5,1.1875 0.5,2.59375 0,1.51562 -0.54688,2.73437 -0.54687,1.20313 -1.57812,1.84375 -1.03125,0.64063 -2.17188,0.64063 -0.84375,0 -1.51562,-0.34375 -0.65625,-0.35938 -1.07813,-0.89063 l 0,4.79688 -1.67187,0 z m 1.51562,-8.65625 q 0,1.90625 0.76563,2.8125 0.78125,0.90625 1.875,0.90625 1.10937,0 1.89062,-0.9375 0.79688,-0.9375 0.79688,-2.92188 0,-1.875 -0.78125,-2.8125 -0.76563,-0.9375 -1.84375,-0.9375 -1.0625,0 -1.89063,1 -0.8125,1 -0.8125,2.89063 z m 7.3288,8.65625 0,-1.21875 11.0625,0 0,1.21875 -11.0625,0 z m 18.34448,-5 q -0.9375,0.79687 -1.79687,1.125 -0.85938,0.3125 -1.84375,0.3125 -1.60938,0 -2.48438,-0.78125 -0.875,-0.79688 -0.875,-2.03125 0,-0.73438 0.32813,-1.32813 0.32812,-0.59375 0.85937,-0.95312 0.53125,-0.35938 1.20313,-0.54688 0.5,-0.14062 1.48437,-0.25 2.03125,-0.25 2.98438,-0.57812 0,-0.34375 0,-0.4375 0,-1.01563 -0.46875,-1.
4375 -0.64063,-0.5625 -1.90625,-0.5625 -1.17188,0 -1.73438,0.40625 -0.5625,0.40625 -0.82812,1.46875 l -1.64063,-0.23438 q 0.23438,-1.04687 0.73438,-1.6875 0.51562,-0.64062 1.46875,-0.98437 0.96875,-0.35938 2.25,-0.35938 1.26562,0 2.04687,0.29688 0.78125,0.29687 1.15625,0.75 0.375,0.45312 0.51563,1.14062 0.0937,0.42188 0.0937,1.53125 l 0,2.23438 q 0,2.32812 0.0937,2.95312 0.10937,0.60938 0.4375,1.17188 l -1.75,0 q -0.26563,-0.51563 -0.32813,-1.21875 z m -0.14062,-3.71875 q -0.90625,0.35937 -2.73438,0.625 -1.03125,0.14062 -1.45312,0.32812 -0.42188,0.1875 -0.65625,0.54688 -0.23438,0.35937 -0.23438,0.79687 0,0.67188 0.5,1.125 0.51563,0.4375 1.48438,0.4375 0.96875,0 1.71875,-0.42187 0.75,-0.4375 1.10937,-1.15625 0.26563,-0.57813 0.26563,-1.67188 l 0,-0.60937 z m 4.07886,8.71875 0,-13.64063 1.53125,0 0,1.28125 q 0.53125,-0.75 1.20312,-1.125 0.6875,-0.375 1.64063,-0.375 1.26562,0 2.23437,0.65625 0.96875,0.64063 1.45313,1.82813 0.5,1.1875 0.5,2.59375 0,1.51562 -0.54688,2.73437 -0.54687,1.20
313 -1.57812,1.84375 -1.03125,0.64063 -2.17188,0.64063 -0.84375,0 -1.51562,-0.34375 -0.65625,-0.35938 -1.07813,-0.89063 l 0,4.79688 -1.67187,0 z m 1.51562,-8.65625 q 0,1.90625 0.76563,2.8125 0.78125,0.90625 1.875,0.90625 1.10937,0 1.89062,-0.9375 0.79688,-0.9375 0.79688,-2.92188 0,-1.875 -0.78125,-2.8125 -0.76563,-0.9375 -1.84375,-0.9375 -1.0625,0 -1.89063,1 -0.8125,1 -0.8125,2.89063 z m 8.87573,-6.8125 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85938 1.67188,0 0,9.85938 -1.67188,0 z m 4.5979,0 0,-1.90625 1.90625,0 0,1.90625 -1.90625,0 z m 4.7146,0 0,-13.59375 1.67188,0 0,4.875 q 1.17187,-1.35938 2.95312,-1.35938 1.09375,0 1.89063,0.4375 0.8125,0.42188 1.15625,1.1875 0.35937,0.76563 0.35937,2.20313 l 0,6.25 -1.67187,0 0,-6.25 q 0,-1.25 -0.54688,-1.8125 -0.54687,-0.57813 -1.53125,-0.57813 -0.75,0 -1.40625,0.39063 -0.64062,0.375 -0.92187,1.04687 -0.28125,0.65625 -0.28125,1.8125 l 0,5.39063 -1.67188,0 z" id="path99" inkscape:connector-curvature="0" style="fill:#000000
;fill-rule:nonzero"/>
+ <path d="m 705.8294,157.58665 7.88977,0 0,-42.61417 15.77948,0 0,42.61417 7.88977,0 -15.77948,15.77953 z" id="path101" inkscape:connector-curvature="0" style="fill:#cfe2f3;fill-rule:nonzero"/>
+ <path d="m 705.8294,157.58665 7.88977,0 0,-42.61417 15.77948,0 0,42.61417 7.88977,0 -15.77948,15.77953 z" id="path103" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 257.36746,246.86613 224,67.43309" id="path105" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 257.36746,246.86613 218.25467,65.70351" id="path107" inkscape:connector-curvature="0" style="fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 475.14603,314.15128 4.82159,-0.27347 -3.86935,-2.88977 z" id="path109" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt"/>
+ <path d="M 713.36743,246.86613 481.36746,314.29922" id="path111" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 713.36743,246.86613 -226.2384,65.75844" id="path113" inkscape:connector-curvature="0" style="fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 486.668,311.03848 -3.89673,2.85269 4.81876,0.31949 z" id="path115" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt"/>
+ <path d="m 113.82153,246.87665 c -6.43608,0 -11.65355,-0.86955 -11.65355,-1.94218 l 0,-97.61171 c 0,-1.07264 -5.217471,-1.94217 -11.653545,-1.94217 l 0,0 c 6.436073,0 11.653545,-0.86956 11.653545,-1.94219 l 0,-97.611708 0,0 c 0,-1.072636 5.21747,-1.942181 11.65355,-1.942181 z" id="path117" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 113.82153,246.87665 c -6.43608,0 -11.65355,-0.86955 -11.65355,-1.94218 l 0,-97.61171 c 0,-1.07264 -5.217471,-1.94217 -11.653545,-1.94217 l 0,0 c 6.436073,0 11.653545,-0.86956 11.653545,-1.94219 l 0,-97.611708 0,0 c 0,-1.072636 5.21747,-1.942181 11.65355,-1.942181" id="path119" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 113.82153,246.87665 c -6.43608,0 -11.65355,-0.86955 -11.65355,-1.94218 l 0,-97.61171 c 0,-1.07264 -5.217471,-1.94217 -11.653545,-1.94217 l 0,0 c 6.436073,0 11.653545,-0.86956 11.653545,-1.94219 l 0,-97.611708 0,0 c 0,-1.072636 5.21747,-1.942181 11.65355,-1.942181" id="path121" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 858.51447,246.87665 c 6.43603,0 11.6535,-0.86955 11.6535,-1.94218 l 0,-97.61171 c 0,-1.07264 5.21747,-1.94217 11.65357,-1.94217 l 0,0 c -6.4361,0 -11.65357,-0.86956 -11.65357,-1.94219 l 0,-97.611708 0,0 c 0,-1.072636 -5.21747,-1.942181 -11.6535,-1.942181 z" id="path123" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 858.51447,246.87665 c 6.43603,0 11.6535,-0.86955 11.6535,-1.94218 l 0,-97.61171 c 0,-1.07264 5.21747,-1.94217 11.65357,-1.94217 l 0,0 c -6.4361,0 -11.65357,-0.86956 -11.65357,-1.94219 l 0,-97.611708 0,0 c 0,-1.072636 -5.21747,-1.942181 -11.6535,-1.942181" id="path125" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 858.51447,246.87665 c 6.43603,0 11.6535,-0.86955 11.6535,-1.94218 l 0,-97.61171 c 0,-1.07264 5.21747,-1.94217 11.65357,-1.94217 l 0,0 c -6.4361,0 -11.65357,-0.86956 -11.65357,-1.94219 l 0,-97.611708 0,0 c 0,-1.072636 -5.21747,-1.942181 -11.6535,-1.942181" id="path127" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round"/>
+ <path d="m 61.603676,248.12073 0,-203.21259 45.259844,0 0,203.21259 z" id="path129" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 88.523674,188.58908 -13.59375,0 0,-5.125 q 0,-1.35938 0.125,-2.07813 0.171875,-1 0.640625,-1.67187 0.46875,-0.67188 1.3125,-1.07813 0.84375,-0.42187 1.84375,-0.42187 1.734375,0 2.9375,1.10937 1.203125,1.09375 1.203125,3.98438 l 0,3.48437 5.53125,0 0,1.79688 z m -7.140625,-1.79688 0,-3.51562 q 0,-1.75 -0.640625,-2.46875 -0.65625,-0.73438 -1.828125,-0.73438 -0.859375,0 -1.46875,0.4375 -0.609375,0.42188 -0.796875,1.125 -0.125,0.45313 -0.125,1.67188 l 0,3.48437 4.859375,0 z m 7.140625,-10.39669 -13.59375,0 0,-1.67188 13.59375,0 0,1.67188 z m -1.21875,-10.61357 q 0.796875,0.9375 1.125,1.79687 0.3125,0.85938 0.3125,1.84375 0,1.60938 -0.78125,2.48438 -0.796875,0.875 -2.03125,0.875 -0.734375,0 -1.328125,-0.32813 -0.59375,-0.32812 -0.953125,-0.85937 -0.359375,-0.53125 -0.546875,-1.20313 -0.140625,-0.5 -0.25,-1.48437 -0.25,-2.03125 -0.578125,-2.98438 -0.34375,0 -0.4375,0 -1.015625,0 -1.4375,0.46875 -0.5625,0.64063 -0.5625,1.90625 0,1.17188 0.40625,1.73438 0.40625,0.5625 1.46875
,0.82812 l -0.234375,1.64063 q -1.046875,-0.23438 -1.6875,-0.73438 -0.640625,-0.51562 -0.984375,-1.46875 -0.359375,-0.96875 -0.359375,-2.25 0,-1.26562 0.296875,-2.04687 0.296875,-0.78125 0.75,-1.15625 0.453125,-0.375 1.140625,-0.51563 0.421875,-0.0937 1.53125,-0.0937 l 2.234375,0 q 2.328125,0 2.953125,-0.0937 0.609375,-0.10937 1.171875,-0.4375 l 0,1.75 q -0.515625,0.26563 -1.21875,0.32813 z m -3.71875,0.14062 q 0.359375,0.90625 0.625,2.73438 0.140625,1.03125 0.328125,1.45312 0.1875,0.42188 0.546875,0.65625 0.359375,0.23438 0.796875,0.23438 0.671875,0 1.125,-0.5 0.4375,-0.51563 0.4375,-1.48438 0,-0.96875 -0.421875,-1.71875 -0.4375,-0.75 -1.15625,-1.10937 -0.578125,-0.26563 -1.671875,-0.26563 l -0.609375,0 z m 3.4375,-7.73509 1.484375,-0.23438 q 0.140625,0.70313 0.140625,1.26563 0,0.90625 -0.28125,1.40625 -0.296875,0.5 -0.75,0.70312 -0.46875,0.20313 -1.984375,0.20313 l -5.65625,0 0,1.23437 -1.3125,0 0,-1.23437 -2.4375,0 -1,-1.65625 3.4375,0 0,-1.6875 1.3125,0 0,1.6875 5.75,0 q 0.71875
,0 0.921875,-0.0781 0.203125,-0.0937 0.328125,-0.29687 0.125,-0.20313 0.125,-0.57813 0,-0.26562 -0.07813,-0.73437 z m 1.5,-1.9333 -8.546875,0 0,1.48437 -1.3125,0 0,-1.48437 -1.046875,0 q -0.984375,0 -1.46875,-0.17188 -0.65625,-0.23437 -1.046875,-0.84375 -0.40625,-0.60937 -0.40625,-1.70312 0,-0.70313 0.15625,-1.5625 l 1.46875,0.25 q -0.09375,0.51562 -0.09375,0.98437 0,0.76563 0.328125,1.07813 0.3125,0.3125 1.203125,0.3125 l 0.90625,0 0,-1.92188 1.3125,0 0,1.92188 8.546875,0 0,1.65625 z m -4.921875,-4.15206 q -2.734375,0 -4.0625,-1.53125 -1.09375,-1.26562 -1.09375,-3.09375 0,-2.03125 1.34375,-3.3125 1.328125,-1.29687 3.671875,-1.29687 1.90625,0 3,0.57812 1.078125,0.5625 1.6875,1.65625 0.59375,1.07813 0.59375,2.375 0,2.0625 -1.328125,3.34375 -1.328125,1.28125 -3.8125,1.28125 z m 0,-1.71875 q 1.890625,0 2.828125,-0.82812 0.9375,-0.82813 0.9375,-2.07813 0,-1.25 -0.9375,-2.0625 -0.953125,-0.82812 -2.890625,-0.82812 -1.828125,0 -2.765625,0.82812 -0.9375,0.82813 -0.9375,2.0625 0,1.25 0.9375
,2.07813 0.9375,0.82812 2.828125,0.82812 z m 4.921875,-9.26634 -9.859375,0 0,-1.5 1.5,0 q -1.046875,-0.57813 -1.375,-1.0625 -0.34375,-0.48438 -0.34375,-1.07813 0,-0.84375 0.546875,-1.71875 l 1.546875,0.57813 q -0.359375,0.60937 -0.359375,1.23437 0,0.54688 0.328125,0.98438 0.328125,0.42187 0.90625,0.60937 0.890625,0.28125 1.953125,0.28125 l 5.15625,0 0,1.67188 z m 0,-6.2283 -9.859375,0 0,-1.5 1.390625,0 q -0.71875,-0.45313 -1.15625,-1.21875 -0.453125,-0.78125 -0.453125,-1.76563 0,-1.09375 0.453125,-1.79687 0.453125,-0.70313 1.28125,-0.98438 -1.734375,-1.17187 -1.734375,-3.04687 0,-1.46875 0.8125,-2.25 0.8125,-0.79688 2.5,-0.79688 l 6.765625,0 0,1.67188 -6.203125,0 q -1,0 -1.4375,0.15625 -0.453125,0.15625 -0.71875,0.59375 -0.265625,0.42187 -0.265625,1 0,1.03125 0.6875,1.71875 0.6875,0.6875 2.21875,0.6875 l 5.71875,0 0,1.67187 -6.40625,0 q -1.109375,0 -1.65625,0.40625 -0.5625,0.40625 -0.5625,1.34375 0,0.70313 0.375,1.3125 0.359375,0.59375 1.078125,0.85938 0.71875,0.26562 2.0625,0.26562
l 5.109375,0 0,1.67188 z m 0,-19.44285 -13.59375,-5.23438 0,-1.9375 13.59375,-5.5625 0,2.04688 -4.125,1.59375 0,5.6875 4.125,1.48437 0,1.92188 z m -5.578125,-3.92188 0,-4.60937 -3.78125,1.40625 q -1.703125,0.65625 -2.8125,0.96875 1.3125,0.26562 2.59375,0.73437 l 4,1.5 z" id="path131" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 914.8635,44.90814 0,203.21259 -45.25983,0 0,-203.21259 z" id="path133" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 887.94354,104.43979 13.59375,0 0,5.125 q 0,1.35938 -0.125,2.07813 -0.17188,1 -0.64063,1.67187 -0.46875,0.67188 -1.3125,1.07813 -0.84375,0.42187 -1.84375,0.42187 -1.73437,0 -2.9375,-1.10937 -1.20312,-1.09375 -1.20312,-3.98438 l 0,-3.48437 -5.53125,0 0,-1.79688 z m 7.14062,1.79688 0,3.51562 q 0,1.75 0.64063,2.46875 0.65625,0.73438 1.82812,0.73438 0.85938,0 1.46875,-0.4375 0.60938,-0.42188 0.79688,-1.125 0.125,-0.45313 0.125,-1.67188 l 0,-3.48437 -4.85938,0 z m -7.14062,10.39669 13.59375,0 0,1.67188 -13.59375,0 0,-1.67188 z m 1.21875,10.61357 q -0.79688,-0.9375 -1.125,-1.79687 -0.3125,-0.85938 -0.3125,-1.84375 0,-1.60938 0.78125,-2.48438 0.79687,-0.875 2.03125,-0.875 0.73437,0 1.32812,0.32813 0.59375,0.32812 0.95313,0.85937 0.35937,0.53125 0.54687,1.20313 0.14063,0.5 0.25,1.48437 0.25,2.03125 0.57813,2.98438 0.34375,0 0.4375,0 1.01562,0 1.4375,-0.46875 0.5625,-0.64063 0.5625,-1.90625 0,-1.17188 -0.40625,-1.73438 -0.40625,-0.5625 -1.46875,-0.82812 l 0.23437,-1.64063 q 1.0
4688,0.23438 1.6875,0.73438 0.64063,0.51562 0.98438,1.46875 0.35937,0.96875 0.35937,2.25 0,1.26562 -0.29687,2.04687 -0.29688,0.78125 -0.75,1.15625 -0.45313,0.375 -1.14063,0.51563 -0.42187,0.0937 -1.53125,0.0937 l -2.23437,0 q -2.32813,0 -2.95313,0.0937 -0.60937,0.10937 -1.17187,0.4375 l 0,-1.75 q 0.51562,-0.26563 1.21875,-0.32813 z m 3.71875,-0.14062 q -0.35938,-0.90625 -0.625,-2.73438 -0.14063,-1.03125 -0.32813,-1.45312 -0.1875,-0.42188 -0.54687,-0.65625 -0.35938,-0.23438 -0.79688,-0.23438 -0.67187,0 -1.125,0.5 -0.4375,0.51563 -0.4375,1.48438 0,0.96875 0.42188,1.71875 0.4375,0.75 1.15625,1.10937 0.57812,0.26563 1.67187,0.26563 l 0.60938,0 z m -3.4375,7.73509 -1.48438,0.23438 q -0.14062,-0.70313 -0.14062,-1.26563 0,-0.90625 0.28125,-1.40625 0.29687,-0.5 0.75,-0.70312 0.46875,-0.20313 1.98437,-0.20313 l 5.65625,0 0,-1.23437 1.3125,0 0,1.23437 2.4375,0 1,1.65625 -3.4375,0 0,1.6875 -1.3125,0 0,-1.6875 -5.75,0 q -0.71875,0 -0.92187,0.0781 -0.20313,0.0937 -0.32813,0.29687 -0.125,0.20313
-0.125,0.57813 0,0.26562 0.0781,0.73437 z m -1.5,1.9333 8.54687,0 0,-1.48437 1.3125,0 0,1.48437 1.04688,0 q 0.98437,0 1.46875,0.17188 0.65625,0.23437 1.04687,0.84375 0.40625,0.60937 0.40625,1.70312 0,0.70313 -0.15625,1.5625 l -1.46875,-0.25 q 0.0937,-0.51562 0.0937,-0.98437 0,-0.76563 -0.32812,-1.07813 -0.3125,-0.3125 -1.20313,-0.3125 l -0.90625,0 0,1.92188 -1.3125,0 0,-1.92188 -8.54687,0 0,-1.65625 z m 4.92187,4.15206 q 2.73438,0 4.0625,1.53125 1.09375,1.26562 1.09375,3.09375 0,2.03125 -1.34375,3.3125 -1.32812,1.29687 -3.67187,1.29687 -1.90625,0 -3,-0.57812 -1.07813,-0.5625 -1.6875,-1.65625 -0.59375,-1.07813 -0.59375,-2.375 0,-2.0625 1.32812,-3.34375 1.32813,-1.28125 3.8125,-1.28125 z m 0,1.71875 q -1.89062,0 -2.82812,0.82812 -0.9375,0.82813 -0.9375,2.07813 0,1.25 0.9375,2.0625 0.95312,0.82812 2.89062,0.82812 1.82813,0 2.76563,-0.82812 0.9375,-0.82813 0.9375,-2.0625 0,-1.25 -0.9375,-2.07813 -0.9375,-0.82812 -2.82813,-0.82812 z m -4.92187,9.26634 9.85937,0 0,1.5 -1.5,0 q 1.04688,0.5
7813 1.375,1.0625 0.34375,0.48438 0.34375,1.07813 0,0.84375 -0.54687,1.71875 l -1.54688,-0.57813 q 0.35938,-0.60937 0.35938,-1.23437 0,-0.54688 -0.32813,-0.98438 -0.32812,-0.42187 -0.90625,-0.60937 -0.89062,-0.28125 -1.95312,-0.28125 l -5.15625,0 0,-1.67188 z m 0,6.2283 9.85937,0 0,1.5 -1.39062,0 q 0.71875,0.45313 1.15625,1.21875 0.45312,0.78125 0.45312,1.76563 0,1.09375 -0.45312,1.79687 -0.45313,0.70313 -1.28125,0.98438 1.73437,1.17187 1.73437,3.04687 0,1.46875 -0.8125,2.25 -0.8125,0.79688 -2.5,0.79688 l -6.76562,0 0,-1.67188 6.20312,0 q 1,0 1.4375,-0.15625 0.45313,-0.15625 0.71875,-0.59375 0.26563,-0.42187 0.26563,-1 0,-1.03125 -0.6875,-1.71875 -0.6875,-0.6875 -2.21875,-0.6875 l -5.71875,0 0,-1.67187 6.40625,0 q 1.10937,0 1.65625,-0.40625 0.5625,-0.40625 0.5625,-1.34375 0,-0.70313 -0.375,-1.3125 -0.35938,-0.59375 -1.07813,-0.85938 -0.71875,-0.26562 -2.0625,-0.26562 l -5.10937,0 0,-1.67188 z m 0,20.86473 13.59375,0 0,5.10938 q 0,1.54687 -0.40625,2.48437 -0.40625,0.95313 -1.26563,1.
48438 -0.85937,0.53125 -1.79687,0.53125 -0.875,0 -1.65625,-0.46875 -0.76563,-0.46875 -1.23438,-1.4375 -0.35937,1.23437 -1.23437,1.89062 -0.875,0.67188 -2.0625,0.67188 -0.95313,0 -1.78125,-0.40625 -0.8125,-0.39063 -1.26563,-0.98438 -0.4375,-0.59375 -0.67187,-1.5 -0.21875,-0.89062 -0.21875,-2.1875 l 0,-5.1875 z m 7.89062,1.79688 0,2.9375 q 0,1.20312 0.15625,1.71875 0.20313,0.6875 0.67188,1.03125 0.46875,0.35937 1.1875,0.35937 0.67187,0 1.1875,-0.32812 0.51562,-0.32813 0.70312,-0.9375 0.20313,-0.59375 0.20313,-2.0625 l 0,-2.71875 -4.10938,0 z m -6.28125,0 0,3.39062 q 0,0.875 0.0625,1.21875 0.10938,0.625 0.35938,1.04688 0.26562,0.42187 0.76562,0.6875 0.5,0.26562 1.14063,0.26562 0.76562,0 1.32812,-0.39062 0.5625,-0.39063 0.78125,-1.07813 0.23438,-0.6875 0.23438,-1.98437 l 0,-3.15625 -4.67188,0 z" id="path135" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="M 79.543304,410.05774 880.4566,411.44357" id="path137" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="M 79.543304,410.05774 880.4566,411.44357" id="path139" inkscape:connector-curvature="0" style="fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:4, 12"/>
+ <path d="m 79.47507,364.26248 201.92126,0 0,33.82675 -201.92126,0 z" id="path141" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 99.64694,383.33023 1.79688,0.45312 q -0.5625,2.21875 -2.031255,3.39063 -1.46875,1.15625 -3.59375,1.15625 -2.203125,0 -3.578125,-0.89063 -1.375,-0.90625 -2.09375,-2.59375 -0.71875,-1.70312 -0.71875,-3.65625 0,-2.125 0.796875,-3.70312 0.8125,-1.57813 2.3125,-2.39063 1.5,-0.82812 3.296875,-0.82812 2.046875,0 3.4375,1.04687 1.39063,1.03125 1.9375,2.90625 l -1.765625,0.42188 q -0.46875,-1.48438 -1.375,-2.15625 -0.90625,-0.6875 -2.265625,-0.6875 -1.5625,0 -2.625,0.75 -1.046875,0.75 -1.484375,2.03125 -0.421875,1.26562 -0.421875,2.60937 0,1.73438 0.5,3.03125 0.515625,1.28125 1.578125,1.92188 1.078125,0.64062 2.3125,0.64062 1.515625,0 2.5625,-0.85937 1.046875,-0.875 1.421875,-2.59375 z m 2.92607,-0.15625 q 0,-2.73438 1.53125,-4.0625 1.26563,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29688,1.32812 1.29688,3.67187 0,1.90625 -0.57813,3 -0.5625,1.07813 -1.65625,1.6875 -1.07812,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32812 -1.28125,-1.32813 -1.28125,-3.8125 z m 1.718
75,0 q 0,1.89062 0.82813,2.82812 0.82812,0.9375 2.07812,0.9375 1.25,0 2.0625,-0.9375 0.82813,-0.95312 0.82813,-2.89062 0,-1.82813 -0.82813,-2.76563 -0.82812,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07812,0.9375 -0.82813,0.9375 -0.82813,2.82813 z m 9.28197,4.92187 0,-9.85937 1.5,0 0,1.39062 q 0.45312,-0.71875 1.21875,-1.15625 0.78125,-0.45312 1.76562,-0.45312 1.09375,0 1.79688,0.45312 0.70312,0.45313 0.98437,1.28125 1.17188,-1.73437 3.04688,-1.73437 1.46875,0 2.25,0.8125 0.79687,0.8125 0.79687,2.5 l 0,6.76562 -1.67187,0 0,-6.20312 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45313 -0.59375,-0.71875 -0.42188,-0.26563 -1,-0.26563 -1.03125,0 -1.71875,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67188,0 0,-6.40625 q 0,-1.10937 -0.40625,-1.65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70312,0 -1.3125,0.375 -0.59375,0.35938 -0.85937,1.07813 -0.26563,0.71875 -0.26563,2.0625 l 0,5.10937 -1.67187,0 z m 15.5408,3.78125 0,-13.64062 1.53125,0 0,1.28125 q 0.53125,-0.75 1.20313,-1.125 0.6875,-0.375 1.64062,
-0.375 1.26563,0 2.23438,0.65625 0.96875,0.64062 1.45312,1.82812 0.5,1.1875 0.5,2.59375 0,1.51563 -0.54687,2.73438 -0.54688,1.20312 -1.57813,1.84375 -1.03125,0.64062 -2.17187,0.64062 -0.84375,0 -1.51563,-0.34375 -0.65625,-0.35937 -1.07812,-0.89062 l 0,4.79687 -1.67188,0 z m 1.51563,-8.65625 q 0,1.90625 0.76562,2.8125 0.78125,0.90625 1.875,0.90625 1.10938,0 1.89063,-0.9375 0.79687,-0.9375 0.79687,-2.92187 0,-1.875 -0.78125,-2.8125 -0.76562,-0.9375 -1.84375,-0.9375 -1.0625,0 -1.89062,1 -0.8125,1 -0.8125,2.89062 z m 8.87571,-6.8125 0,-1.90625 1.67188,0 0,1.90625 -1.67188,0 z m 0,11.6875 0,-9.85937 1.67188,0 0,9.85937 -1.67188,0 z m 4.09795,0 0,-13.59375 1.67187,0 0,13.59375 -1.67187,0 z m 10.92607,-3.17187 1.71875,0.21875 q -0.40625,1.5 -1.51563,2.34375 -1.09375,0.82812 -2.8125,0.82812 -2.15625,0 -3.42187,-1.32812 -1.26563,-1.32813 -1.26563,-3.73438 0,-2.48437 1.26563,-3.85937 1.28125,-1.375 3.32812,-1.375 1.98438,0 3.23438,1.34375 1.25,1.34375 1.25,3.79687 0,0.14063 -0.0156,0.4375 l -
7.34375,0 q 0.0937,1.625 0.92188,2.48438 0.82812,0.85937 2.0625,0.85937 0.90625,0 1.54687,-0.46875 0.65625,-0.48437 1.04688,-1.54687 z m -5.48438,-2.70313 5.5,0 q -0.10937,-1.23437 -0.625,-1.85937 -0.79687,-0.96875 -2.07812,-0.96875 -1.14063,0 -1.9375,0.78125 -0.78125,0.76562 -0.85938,2.04687 z m 17.96528,5.875 0,-12 -4.46875,0 0,-1.59375 10.76562,0 0,1.59375 -4.5,0 0,12 -1.79687,0 z m 7.73973,-11.6875 0,-1.90625 1.67187,0 0,1.90625 -1.67187,0 z m 0,11.6875 0,-9.85937 1.67187,0 0,9.85937 -1.67187,0 z m 4.12919,0 0,-9.85937 1.5,0 0,1.39062 q 0.45313,-0.71875 1.21875,-1.15625 0.78125,-0.45312 1.76563,-0.45312 1.09375,0 1.79687,0.45312 0.70313,0.45313 0.98438,1.28125 1.17187,-1.73437 3.04687,-1.73437 1.46875,0 2.25,0.8125 0.79688,0.8125 0.79688,2.5 l 0,6.76562 -1.67188,0 0,-6.20312 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45313 -0.59375,-0.71875 -0.42187,-0.26563 -1,-0.26563 -1.03125,0 -1.71875,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67187,0 0,-6.40625 q 0,-1.10937 -0.40625,-1.
65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70313,0 -1.3125,0.375 -0.59375,0.35938 -0.85938,1.07813 -0.26562,0.71875 -0.26562,2.0625 l 0,5.10937 -1.67188,0 z m 22.2908,-3.17187 1.71875,0.21875 q -0.40625,1.5 -1.51562,2.34375 -1.09375,0.82812 -2.8125,0.82812 -2.15625,0 -3.42188,-1.32812 -1.26562,-1.32813 -1.26562,-3.73438 0,-2.48437 1.26562,-3.85937 1.28125,-1.375 3.32813,-1.375 1.98437,0 3.23437,1.34375 1.25,1.34375 1.25,3.79687 0,0.14063 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92187,2.48438 0.82813,0.85937 2.0625,0.85937 0.90625,0 1.54688,-0.46875 0.65625,-0.48437 1.04687,-1.54687 z m -5.48437,-2.70313 5.5,0 q -0.10938,-1.23437 -0.625,-1.85937 -0.79688,-0.96875 -2.07813,-0.96875 -1.14062,0 -1.9375,0.78125 -0.78125,0.76562 -0.85937,2.04687 z" id="path143" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ <path d="m 79.47507,420.26248 201.92126,0 0,33.82675 -201.92126,0 z" id="path145" inkscape:connector-curvature="0" style="fill:#000000;fill-opacity:0;fill-rule:nonzero"/>
+ <path d="m 89.86569,444.09586 0,-13.59375 1.796875,0 0,11.98438 6.703125,0 0,1.60937 -8.5,0 z m 9.610092,-4.92187 q 0,-2.73438 1.531248,-4.0625 1.26563,-1.09375 3.09375,-1.09375 2.03125,0 3.3125,1.34375 1.29688,1.32812 1.29688,3.67187 0,1.90625 -0.57813,3 -0.5625,1.07813 -1.65625,1.6875 -1.07812,0.59375 -2.375,0.59375 -2.0625,0 -3.34375,-1.32812 -1.281248,-1.32813 -1.281248,-3.8125 z m 1.718748,0 q 0,1.89062 0.82813,2.82812 0.82812,0.9375 2.07812,0.9375 1.25,0 2.0625,-0.9375 0.82813,-0.95312 0.82813,-2.89062 0,-1.82813 -0.82813,-2.76563 -0.82812,-0.9375 -2.0625,-0.9375 -1.25,0 -2.07812,0.9375 -0.82813,0.9375 -0.82813,2.82813 z m 15.71947,3.70312 q -0.9375,0.79688 -1.79688,1.125 -0.85937,0.3125 -1.84375,0.3125 -1.60937,0 -2.48437,-0.78125 -0.875,-0.79687 -0.875,-2.03125 0,-0.73437 0.32812,-1.32812 0.32813,-0.59375 0.85938,-0.95313 0.53125,-0.35937 1.20312,-0.54687 0.5,-0.14063 1.48438,-0.25 2.03125,-0.25 2.98437,-0.57813 0,-0.34375 0,-0.4375 0,-1.01562 -0.46875,-1.4375 -0.64062,-
0.5625 -1.90625,-0.5625 -1.17187,0 -1.73437,0.40625 -0.5625,0.40625 -0.82813,1.46875 l -1.64062,-0.23437 q 0.23437,-1.04688 0.73437,-1.6875 0.51563,-0.64063 1.46875,-0.98438 0.96875,-0.35937 2.25,-0.35937 1.26563,0 2.04688,0.29687 0.78125,0.29688 1.15625,0.75 0.375,0.45313 0.51562,1.14063 0.0937,0.42187 0.0937,1.53125 l 0,2.23437 q 0,2.32813 0.0937,2.95313 0.10938,0.60937 0.4375,1.17187 l -1.75,0 q -0.26562,-0.51562 -0.32812,-1.21875 z m -0.14063,-3.71875 q -0.90625,0.35938 -2.73437,0.625 -1.03125,0.14063 -1.45313,0.32813 -0.42187,0.1875 -0.65625,0.54687 -0.23437,0.35938 -0.23437,0.79688 0,0.67187 0.5,1.125 0.51562,0.4375 1.48437,0.4375 0.96875,0 1.71875,-0.42188 0.75,-0.4375 1.10938,-1.15625 0.26562,-0.57812 0.26562,-1.67187 l 0,-0.60938 z m 10.46947,4.9375 0,-1.25 q -0.9375,1.46875 -2.75,1.46875 -1.17187,0 -2.17187,-0.64062 -0.98438,-0.65625 -1.53125,-1.8125 -0.53125,-1.17188 -0.53125,-2.6875 0,-1.46875 0.48437,-2.67188 0.5,-1.20312 1.46875,-1.84375 0.98438,-0.64062 2.20313,-0.640
62 0.89062,0 1.57812,0.375 0.70313,0.375 1.14063,0.98437 l 0,-4.875 1.65625,0 0,13.59375 -1.54688,0 z m -5.28125,-4.92187 q 0,1.89062 0.79688,2.82812 0.8125,0.9375 1.89062,0.9375 1.09375,0 1.85938,-0.89062 0.76562,-0.89063 0.76562,-2.73438 0,-2.01562 -0.78125,-2.95312 -0.78125,-0.95313 -1.92187,-0.95313 -1.10938,0 -1.85938,0.90625 -0.75,0.90625 -0.75,2.85938 z m 8.01634,5.15625 3.9375,-14.0625 1.34375,0 -3.9375,14.0625 -1.34375,0 z m 6.68331,-0.23438 0,-13.59375 6.03125,0 q 1.8125,0 2.75,0.35938 0.95312,0.35937 1.51562,1.29687 0.5625,0.92188 0.5625,2.04688 0,1.45312 -0.9375,2.45312 -0.92187,0.98438 -2.89062,1.25 0.71875,0.34375 1.09375,0.67188 0.78125,0.73437 1.48437,1.8125 l 2.375,3.70312 -2.26562,0 -1.79688,-2.82812 q -0.79687,-1.21875 -1.3125,-1.875 -0.5,-0.65625 -0.90625,-0.90625 -0.40625,-0.26563 -0.8125,-0.35938 -0.3125,-0.0781 -1.01562,-0.0781 l -2.07813,0 0,6.04687 -1.79687,0 z m 1.79687,-7.59375 3.85938,0 q 1.23437,0 1.92187,-0.25 0.70313,-0.26562 1.0625,-0.82812 0.375,-0.5
625 0.375,-1.21875 0,-0.96875 -0.70312,-1.57813 -0.70313,-0.625 -2.21875,-0.625 l -4.29688,0 0,4.5 z m 17.8792,7.59375 0,-1.45312 q -1.14063,1.67187 -3.125,1.67187 -0.85938,0 -1.625,-0.32812 -0.75,-0.34375 -1.125,-0.84375 -0.35938,-0.5 -0.51563,-1.23438 -0.0937,-0.5 -0.0937,-1.5625 l 0,-6.10937 1.67188,0 0,5.46875 q 0,1.3125 0.0937,1.76562 0.15625,0.65625 0.67187,1.03125 0.51563,0.375 1.26563,0.375 0.75,0 1.40625,-0.375 0.65625,-0.39062 0.92187,-1.04687 0.28125,-0.67188 0.28125,-1.9375 l 0,-5.28125 1.67188,0 0,9.85937 -1.5,0 z m 3.92259,0 0,-9.85937 1.5,0 0,1.40625 q 1.09375,-1.625 3.14063,-1.625 0.89062,0 1.64062,0.32812 0.75,0.3125 1.10938,0.84375 0.375,0.51563 0.53125,1.21875 0.0937,0.46875 0.0937,1.625 l 0,6.0625 -1.67188,0 0,-6 q 0,-1.01562 -0.20312,-1.51562 -0.1875,-0.51563 -0.6875,-0.8125 -0.5,-0.29688 -1.17188,-0.29688 -1.0625,0 -1.84375,0.67188 -0.76562,0.67187 -0.76562,2.57812 l 0,5.375 -1.67188,0 z m 19.2309,0 0,-12 -4.46875,0 0,-1.59375 10.76562,0 0,1.59375 -4.5,0 0,12 -
1.79687,0 z m 7.73973,-11.6875 0,-1.90625 1.67187,0 0,1.90625 -1.67187,0 z m 0,11.6875 0,-9.85937 1.67187,0 0,9.85937 -1.67187,0 z m 4.12919,0 0,-9.85937 1.5,0 0,1.39062 q 0.45313,-0.71875 1.21875,-1.15625 0.78125,-0.45312 1.76563,-0.45312 1.09375,0 1.79687,0.45312 0.70313,0.45313 0.98438,1.28125 1.17187,-1.73437 3.04687,-1.73437 1.46875,0 2.25,0.8125 0.79688,0.8125 0.79688,2.5 l 0,6.76562 -1.67188,0 0,-6.20312 q 0,-1 -0.15625,-1.4375 -0.15625,-0.45313 -0.59375,-0.71875 -0.42187,-0.26563 -1,-0.26563 -1.03125,0 -1.71875,0.6875 -0.6875,0.6875 -0.6875,2.21875 l 0,5.71875 -1.67187,0 0,-6.40625 q 0,-1.10937 -0.40625,-1.65625 -0.40625,-0.5625 -1.34375,-0.5625 -0.70313,0 -1.3125,0.375 -0.59375,0.35938 -0.85938,1.07813 -0.26562,0.71875 -0.26562,2.0625 l 0,5.10937 -1.67188,0 z m 22.29081,-3.17187 1.71875,0.21875 q -0.40625,1.5 -1.51563,2.34375 -1.09375,0.82812 -2.8125,0.82812 -2.15625,0 -3.42187,-1.32812 -1.26563,-1.32813 -1.26563,-3.73438 0,-2.48437 1.26563,-3.85937 1.28125,-1.375 3.32812,-
1.375 1.98438,0 3.23438,1.34375 1.25,1.34375 1.25,3.79687 0,0.14063 -0.0156,0.4375 l -7.34375,0 q 0.0937,1.625 0.92188,2.48438 0.82812,0.85937 2.0625,0.85937 0.90625,0 1.54687,-0.46875 0.65625,-0.48437 1.04688,-1.54687 z m -5.48438,-2.70313 5.5,0 q -0.10937,-1.23437 -0.625,-1.85937 -0.79687,-0.96875 -2.07812,-0.96875 -1.14063,0 -1.9375,0.78125 -0.78125,0.76562 -0.85938,2.04687 z" id="path147" inkscape:connector-curvature="0" style="fill:#000000;fill-rule:nonzero"/>
+ </g>
+</svg>
commit fbe74cce0bbe02430de3439b594bf712e791419a
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Thu Jun 23 12:19:12 2016 +0200
doc: implguide: reformat text to conform with current doc standards
Clean up whitespace and line length issues with current doc.
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Mike Holmes <mike.holmes(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/doc/implementers-guide/implementers-guide.adoc b/doc/implementers-guide/implementers-guide.adoc
index abd49c0..1abd884 100644
--- a/doc/implementers-guide/implementers-guide.adoc
+++ b/doc/implementers-guide/implementers-guide.adoc
@@ -11,9 +11,8 @@ Abstract
This document is intended to guide a new ODP implementation developer.
Further details about ODP may be found at http://opendataplane.org[ODP homepage]
-
:numbered:
-== The include structure ==
+== The include structure
The implementers view of the include source tree allows the common interface
definitions and documentation to be reused by all the platforms defined in the
@@ -25,7 +24,7 @@ similar structures:
----
./
├── include/
-│ ├── odp/
+│ ├── odp/
│ │ ├── api/
│ │ │ └── spec/
│ │ │ └── The Public API specification and its documentation. <1>
@@ -33,7 +32,7 @@ similar structures:
│ │ └── drv/
│ │ └── spec/
│ │ └── The Public Nic driver interface and its documentation. <5>
-│ │
+│ │
│ │
│ ├── odp_api.h This file should be the only file included by the any ODP
│ │ application. <4>
@@ -43,29 +42,29 @@ similar structures:
│
└── platform/
└── <implementation name>/
- └── include/
- ├── Internal header files seen only by the implementation.
- └── odp/
- ├── api/ <2>
- │ ├── In-line function definitions of the public API for this
- │ │ platform seen by the application.
- │ │
- │ └── plat/ <3>
- │ └── Platform specific types, enums etc as seen by the
- │ application but require overriding by the
- │ implementation.
- │
- ├── drv/ <6>
- │ ├── In-line function definitions of the nic driver interface
- │ │ for this platform seen by the application.
- │ │
- │ └── plat/ <7>
- │ └── Platform specific types, enums etc as seen by the
- │ nic driver but require overriding by the
- │ implementation.
- │
- └── com/
- └── Things common to both interfaces are placed here.
+ └── include/
+ ├── Internal header files seen only by the implementation.
+ └── odp/
+ ├── api/ <2>
+ │ ├── In-line function definitions of the public API for this
+ │ │ platform seen by the application.
+ │ │
+ │ └── plat/ <3>
+ │ └── Platform specific types, enums etc as seen by the
+ │ application but require overriding by the
+ │ implementation.
+ │
+ ├── drv/ <6>
+ │ ├── In-line function definitions of the nic driver interface
+ │ │ for this platform seen by the application.
+ │ │
+ │ └── plat/ <7>
+ │ └── Platform specific types, enums etc as seen by the
+ │ nic driver but require overriding by the
+ │ implementation.
+ │
+ └── com/
+ └── Things common to both interfaces are placed here.
----
<1> The specification, defining the ODP application programming interface (API)
@@ -114,16 +113,16 @@ After ODP installation (make install), the structure becomes as follows:
└── odp_drv.h
----
-== ODP library naming recommendations ==
+== ODP library naming recommendations
-The ODP project supports two implementations ODP-linux and ODP-DPDK. The name
-of the libraries are libodp-linux and libodp-dpdk respectively. It is
+The ODP project supports two implementations *odp-linux* and *odp-dpdk*. The
+name of the libraries are `libodp-linux` and `libodp-dpdk` respectively. It is
recommended that other implementations follow the same schema
-(odp-<implementation name>) to make the representation of the ODP
+(*odp-<implementation name>*) to make the representation of the ODP
implementations uniform in a distribution.
Additionally there is an ODP helper library to abstract OS differences.
-== The validation Suite ==
+== The validation Suite
ODP provides a comprehensive set of API validation tests that are intended to be
used by implementers during development and by application developers to verify
@@ -132,7 +131,7 @@ that a particular implementation meets their requirements.
The list of these tests is expected to grow as ODP grows.
The list of test executables is run by the automake test harness, when running
-"make check".
+`make check`.
Therefore, as required by this harness, each executable should return 0 on
success (tests passed), 77 on inconclusive, or any other values on failure.
The automake functionality shows a status line (PASSED/FAIL...) for each of the
@@ -152,56 +151,53 @@ divided in two distinct areas:
* The platform agnostic area,
* A platform dependent area (one per platform).
-=== Platform agnostic ===
+=== Platform agnostic
This grouping defines tests that are expected to be executable and succeed on
-any platform, though possibly with very different performances, depending on the
-underlying platform.
-They are written in plain C code, and may only use functions defined in the
-standard libC (C99) library (besides the ODP functions being tested, of course).
-A free C99 specification can be found at
-http://www.open-std.org/JTC1/sc22/wg14/www/docs/n1256.pdf.
-No other languages (like scripting) are allowed as their usage would make
-assumptions on the platform capability.
-
-This area is located at: 'test/validation/'
-
-The ODP API itself is ordered by module, where each module groups the set of ODP
-API functions related to the same "topic".
-Examples of modules includes "classification" (API functions dealing with ingress
-packets classification), time (functions dealing with time, excluding timers
-which have their own module), timer,...
-The complete module list can be seen at:
-http://docs.opendataplane.org/master/linux-generic-doxygen-html/modules.html[ODP Modules] +
-Within the platform agnostic area, the tests are also grouped by modules,
-matching the ODP API modules: 'test/validation/' mainly contains a list of
-directories matching each module name (as defined by the doxygen "@defgroup" or
-"@ingroup" statement present in each API ".h" file).
-
-Within each of these directories, a library (called "libtest<module>.la") and
-its associated ".h" file (called "<module>.h") defines all the test functions
+any platform, though possibly with very different performance, depending on
+the underlying platform. They are written in plain C code, and may only use
+functions defined in the standard libC (C99) library (besides the ODP
+functions being tested, of course). A free C99 specification can be found at
+the http://www.open-std.org/JTC1/sc22/wg14/www/docs/n1256.pdf[open-std.org]
+web site. No other languages (like scripting) are allowed as their usage
+would make assumptions on the platform capability.
+
+This area is located at `test/validation/` in the odp git repository.
+
+The ODP API itself is ordered by module, where each module groups the set of
+ODP API functions related to the same "topic". Examples of modules includes
+"classification" (API functions dealing with ingress packets classification),
+time (functions dealing with time, excluding timers which have their own
+module), timer,... The complete module list can be seen at:
+http://docs.opendataplane.org/master/linux-generic-doxygen-html/modules.html[ODP
+Modules] + Within the platform agnostic area, the tests are also grouped by
+modules, matching the ODP API modules: `test/validation/` mainly contains a
+list of directories matching each module name (as defined by the doxygen
+`@defgroup` or `@ingroup` statement present in each API `.h` file).
+
+Within each of these directories, a library (called `libtest<module>.la`) and
+its associated `.h` file (called `<module>.h`) defines all the test functions
for this module as well as few other functions to initialize, terminate, and
-group the tests.
-An executable called "<module>_main*", is also built. It is permissible to
-generate more than one executable to cover the functionality in the test library
-for the module.
-These executable(s) shall call all the tests for this module. +
-See <<anchor-1, Module test and naming convention>> for more details.
+group the tests. An executable called `<module>_main*`, is also built. It is
+permissible to generate more than one executable to cover the functionality in
+the test library for the module. These executable(s) shall call all the tests
+for this module. See <<anchor-1, Module test and naming convention>> for
+more details.
It is important to be aware that the tests defined for a given module
-(defined in 'test/validation/<module>') are focused to test the ODP functions
+(defined in `test/validation/<module>`) are focused to test the ODP functions
belonging to this module, but are not limited to use this module's ODP functions
only: many modules needs some interaction with some other module to be tested.
The obvious illustration of this is for module "init" whose functions are
required by all tests of all other modules (as ODP needs to be initialized to
-test anything else). +
+test anything else).
-There is a "Makefile.am" located at the top of the platform agnostic area. Its
+There is a `Makefile.am` located at the top of the platform agnostic area. Its
role is limited to the construction of the different test libraries and the
-"<module>_main*" executables. No tests are run from this area when "make check"
+`<module>_main*` executables. No tests are run from this area when `make check`
is performed.
-==== CUnit ====
+==== CUnit
Within a given test executable CUnit is used to run the different tests. The
usage of CUnit implies the following structure:
@@ -214,65 +210,58 @@ before and after the whole suite is run.
registry run by the test executable.
Moreover, two extra functions can be used to initialize/terminate the test
-executable (these are not part of CUnit). +
+executable (these are not part of CUnit).
A test executable return success (0) if every test of each suite succeed.
-More details about
-http://cunit.sourceforge.net/doc/index.html[CUnit users guide]
+More details about CUnit can be found in the
+http://cunit.sourceforge.net/doc/index.html[CUnit User's Guide]
[[anchor-1]]
-==== Module test and naming convention ====
-
+==== Module test and naming convention
* Tests, i.e. C functions which are used in CUnit test suites are named:
- *<Module>_test_+++*+++* +
- where the suffix identifies the test.
+ *<Module>_test_+++*+++* where the suffix identifies the test.
-* Test arrays, i.e. arrays of odp_testinfo_t, listing the test functions
- belonging to a suite, are called:
- *<Module>_suite+++[_*]+++* +
- where the possible suffix can be used if many suites are declared.
+* Test arrays, _i.e.,_ arrays of `odp_testinfo_t`, listing the test functions
+ belonging to a suite, are called: *<Module>_suite+++[_*]+++* where the
+ possible suffix can be used if many suites are declared.
* CUnit suite init and termination functions are called:
- *<Module>+++_suite[_*]_init()+++* and *<Module>+++_suite[_*]_term()+++* respectively. +
- where the possible extra middle pattern can be used if many suites are
- declared.
+ *<Module>+++_suite[_*]_init()+++* and *<Module>+++_suite[_*]_term()+++*
+ respectively, where the possible extra middle pattern can be used if
+ many suites are declared.
-* Suite arrays, i.e. arrays of odp_suiteinfo_t used in executables
- (CUnit registry) are called:
- *<Module>+++_suites[_*]+++* +
- where the possible suffix identifies the executable using it, if many.
+* Suite arrays, _i.e.,_ arrays of `odp_suiteinfo_t` used in executables (CUnit
+ registry) are called *<Module>+++_suites[_*]+++* where the possible suffix
+ identifies the executable using it, if any.
-* Main executable function(s), are called:
- *<Module>+++_main[_*]+++* +
- where the possible suffix identifies the executable, if many, using it.
+* Main executable function(s), are called <Module>+++_main[_*]+++* where the
+ *possible suffix identifies the executable, if any, using it.
-* Init/term functions for the whole executable are called:
- *<Module>_init*
+* Init/term functions for the whole executable are called *<Module>_init* and
*<Module>_term*
-All the above symbols are part of the generated libtest<Module>.la libraries.
-The generated main executable(s) (named <module>_+++main[_*]+++, where the
+All the above symbols are part of the generated `libtest<Module>.la` libraries.
+The generated main executable(s) (named `<module>_+++main[_*]+++`, where the
optional suffix is used to distinguish the executables belonging to the same
-module, if many) simply call(s) the related <Module>_main+++[_*]+++ from the
+module, if many) simply call(s) the related `<Module>_main+++[_*]+++` from the
library.
-=== Platform specific ===
+=== Platform specific
-These tests are located under 'platform/<platform>/test'. There is one such area
-for each platform implementing ODP.
-This location will be referred as <PLATFORM_SPECIFIC> in the rest of this
-document.
+These tests are located under `platform/<platform>/test`. There is one such
+area for each platform implementing ODP. This location will be referred as
+<PLATFORM_SPECIFIC> in the rest of this document.
-==== The normal case ====
+==== The normal case
If the considered platform needs no platform specific tests, this directory
-simply needs to contain a single Makefile.am listing each of the executables
+simply needs to contain a single `Makefile.am` listing each of the executables
(named <module>_main) built from the platform agnostic area. The executables are
listed in the automake TEST variable and will therefore be run on "make check".
For the linux-generic platform, most tested modules fall into this category:
-currently, the 'platform/linux-generic/test/Makefile.am' looks as follows:
+currently, the `platform/linux-generic/test/Makefile.am` looks as follows:
[source,am]
----
@@ -311,13 +300,13 @@ endif
With the exception for module pktio, all other modules testing just involves
calling the platform agnostic <module>_main executables (in test/validation).
-==== Using other languages ====
+==== Using other languages
The pktio module, above, is actually tested using a bash script. This script is
-needed to set up the interfaces used by the tests. The pktio_run script
-eventually calls the platform agnostic 'test/validation/pktio/pktio_main' after
+needed to set up the interfaces used by the tests. The `pktio_run` script
+eventually calls the platform agnostic `test/validation/pktio/pktio_main` after
setting up the interfaces needed by the tests.
-Notice that the path to the script, 'pktio/pktio_run', is pointing to a file
+Notice that the path to the script, `pktio/pktio_run`, is pointing to a file
within the <PLATFORM_SPECIFIC> tree so is private to this platform. Any
languages supported by the tested platform can be used there, as it will not
impact other platforms.
@@ -325,11 +314,11 @@ The platform "private" executables (such as this script), of course, must also
return one of the return code expected by the automake test harness
(0 for success, 77 for skipped, other values for errors).
-==== Defining test wrappers ====
+==== Defining test wrappers
The pktio case above is actually using a script as wrapper around the "standard"
(platform independent) test executable. Wrappers can also be defined by using
-the LOG_COMPILER variable of automake.
+the `LOG_COMPILER` variable of automake.
This is applicable in cases where the same wrapper should be used for more then
one test, as the test name is passed has parameter to the wrapper. A wrapper is
just a program expecting one argument: the test name.
@@ -339,8 +328,8 @@ filename suffix. See
https://www.gnu.org/software/automake/manual/html_node/Parallel-Test-Harnes…
for more information.
-To add a wrapper around the executed test, just add the following LOG_COMPILER
-definition line in the '<PLATFORM_SPECIFIC>/Makefile.am':
+To add a wrapper around the executed test, just add the following `LOG_COMPILER`
+definition line in the `<PLATFORM_SPECIFIC>/Makefile.am`:
[source,am]
----
@@ -374,23 +363,23 @@ exit $res
Note how the above script stores the return code of the test executable to
return it properly to the automake test harness.
-==== Defining platform specific tests ====
+==== Defining platform specific tests
Sometimes, it may be necessary to call platform specific system calls to check
-some functionality: For instance, testing odp_cpumask_* could involve checking
+some functionality: For instance, testing `odp_cpumask_*` could involve checking
the underlying system CPU mask. On linux, such a test would require using the
CPU_ISSET macro, which is linux specific. Such a test would be written in
-'<PLATFORM_SPECIFIC>/cpumask/...' The contents of this directory would be very
+`<PLATFORM_SPECIFIC>/cpumask/...` The contents of this directory would be very
similar to the contents of the platform agnostic side cpu_mask tests
-(including a Makefile.am...), but platform specific test would be written there.
-'<PLATFORM_SPECIFIC>/Makefile.am' would then trigger the building of the
-platform specific tests (by listing their module name in SUBDIRS and therefore
-calling the appropriate Makefile.am) and then it would call both the platform
+(including a `Makefile.am`), but platform specific test would be written there.
+`<PLATFORM_SPECIFIC>/Makefile.am` would then trigger the building of the
+platform specific tests (by listing their module name in `SUBDIRS` and therefore
+calling the appropriate `Makefile.am`) and then it would call both the platform
agnostic executable(s) and the platform specific test executable.
-==== Marking tests as inactive ====
+==== Marking tests as inactive
-The general policy is that a full run of the validation suite (a "make check")
+The general policy is that a full run of the validation suite (a `make check`)
must pass at all times. However a particular platform may have one or more test
cases that are known to be unimplemented either during development or
permanently, so to avoid these test cases being reported as failures it's useful
@@ -401,12 +390,12 @@ as inactive while leaving the remaining tests active. It's important that the
unwanted tests are still registered with the test framework to allow the fact
that they're not being tested to be recorded.
-The odp_cunit_update() function is intended for this purpose, it is used to
+The `odp_cunit_update()` function is intended for this purpose, it is used to
modify the properties of previously registered tests, for example to mark them
as inactive. Inactive tests are registered with the test framework but aren't
executed and will be recorded as inactive in test reports.
-In 'test/validation/foo/foo.c', define all tests for the 'foo' module:
+In `test/validation/foo/foo.c`, define all tests for the `foo` module:
[source,c]
------------------
@@ -422,8 +411,8 @@ odp_suiteinfo_t foo_suites[] = {
};
------------------
-In 'platform/<platform>/test/foo/foo_main.c', register all the tests defined in
-the 'foo' module, then mark a single specific test case as inactive:
+In `platform/<platform>/test/foo/foo_main.c`, register all the tests defined in
+the `foo` module, then mark a single specific test case as inactive:
[source,c]
------------------
@@ -451,18 +440,18 @@ int foo_main(void)
}
------------------
-So 'foo_test_a' will be executed and 'foo_test_b' is inactive.
+So `foo_test_a` will be executed and `foo_test_b` is inactive.
It's expected that early in the development cycle of a new implementation the
inactive list will be quite long, but it should shrink over time as more parts
of the API are implemented.
-==== conditionnal tests ====
+==== Conditional Tests
Some tests may require specific conditions to make sense: for instance, on
pktio, checking that sending a packet larger than the MTU is rejected only makes
sense if packets can indeed, on that ODP implementation, exceed the MTU.
-A test can be marked conditionnal as follows:
+A test can be marked conditional as follows:
[source,c]
------------------
@@ -480,7 +469,7 @@ odp_suiteinfo_t foo_suites[] = {
------------------
Foo_test_x is the usual test function. Foo_check_x is the test precondition,
-i.e. a function returning an bollean (int).
+i.e. a function returning a Boolean (int).
It is called before the test suite is started. If it returns true, the
test (foo_test_x) is run. If the precondition function (foo_check_x above)
returns false, the test is not relevant (or impossible to perform) and it will
@@ -489,7 +478,7 @@ be skipped.
=================
*Note*
-Conditionnal tests can be marked as inactive, keeping the precondition
+Conditional tests can be marked as inactive, keeping the precondition
function. Both the test and the precondition function will be skipped,
but re-activating the test is then just a matter of changing back the macro
from ODP_TEST_INFO_INACTIVE to ODP_TEST_INFO_CONDITIONAL:
@@ -497,10 +486,10 @@ from ODP_TEST_INFO_INACTIVE to ODP_TEST_INFO_CONDITIONAL:
[source,c]
------------------
...
- /* active conditionnal test */
+ /* active conditional test */
ODP_TEST_INFO_CONDITIONAL(foo_test_x, foo_check_x),
- /* inactive conditionnal test */
+ /* inactive conditional test */
ODP_TEST_INFO_INACTIVE(foo_test_y, foo_check_y),
...
------------------
-----------------------------------------------------------------------
Summary of changes:
doc/images/abi_llvm.svg | 125 +++++++
doc/images/abi_traditional.svg | 89 +++++
doc/implementers-guide/implementers-guide.adoc | 430 +++++++++++++++++--------
3 files changed, 510 insertions(+), 134 deletions(-)
create mode 100644 doc/images/abi_llvm.svg
create mode 100644 doc/images/abi_traditional.svg
hooks/post-receive
--
7 years, 10 months
- 1
- 0
[COMMIT] branch api-next updated. v1.10.1.0-59-g1e919d3
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, api-next has been updated
via 1e919d30be9ecf9683e30bba3f6109d9356b4638 (commit)
via 3e9560480627196a26d702be045ff22191b9a6c1 (commit)
via a97db1b8b46b9656f964ccf09ce28941ae062507 (commit)
via d1d06aa241b97e2f1919ee990168a21319a66143 (commit)
via c2784fbafbf8a29b6daa48429133e25b777536cf (commit)
via 9f0f2b86309aa8021ec937e7c0ee1d6f48b0d769 (commit)
via c03685af2895b20a5e8a046ea910254a96ab15c4 (commit)
via c6bf23e2794ec2a54fa1724cd9d833d84aa39270 (commit)
via 15f3c174f5a104e9749ed83797acb00660d675ad (commit)
via f9baafc4a5644973410ef6c5a1d233671bec1d17 (commit)
via 1b1da0fe917cb916232fd9aad615b68941b8f490 (commit)
via e9545afb7d521b7be5b52f7ff599824fdde8113e (commit)
via e9d434fd193e501ef9ca69f530ce4e5f9448594d (commit)
via 50078445f1a944309fb88946582a2015fd098f6b (commit)
via 8e6e5e999ce3d9edb704e18bedf6bc0ebc6ecf79 (commit)
via 1a6766a3b0b2befb065336d54fff735db62aa96f (commit)
via f606e161748d68612b1a5668ae0184ac4909738d (commit)
via a85a684948248d5e127f109622026e3bbc4be53d (commit)
via b0401d8ed43c643905c84b9a576df925d4ad06e1 (commit)
via 08487413ead04cb5fef8e813af06e5bc29207334 (commit)
via b018868aa429fd25dae1137490419784e8e569f9 (commit)
via 8d020fe812be982564465c0812468ce6194a5025 (commit)
via cb9b43cc218eb4304c508f577293d401180da0ae (commit)
from c4aefb88d31452b3add8cf16f9eef152525c3e93 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1e919d30be9ecf9683e30bba3f6109d9356b4638
Merge: c4aefb8 3e95604
Author: Maxim Uvarov <maxim.uvarov(a)linaro.org>
Date: Thu Jul 7 18:26:01 2016 +0300
Merge branch 'master' into api-next
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 1 -
configure.ac | 8 +-
example/Makefile.am | 2 +-
example/classifier/odp_classifier.c | 1 +
example/generator/odp_generator.c | 1 +
{test/validation => example/hello}/.gitignore | 1 +
example/hello/Makefile.am | 11 ++
example/hello/odp_hello.c | 107 +++++++++++++
example/ipsec/odp_ipsec.c | 1 +
example/m4/configure.m4 | 3 +-
example/packet/odp_pktio.c | 1 +
example/switch/odp_switch.c | 2 +
example/time/time_global_test.c | 1 +
example/timer/odp_timer_simple.c | 1 +
example/timer/odp_timer_test.c | 1 +
helper/Makefile.am | 2 +-
helper/chksum.c | 2 +
helper/linux.c | 1 +
platform/linux-generic/Makefile.am | 7 +-
platform/linux-generic/include/odp/api/cpumask.h | 4 -
.../include/odp/api/plat/byteorder_types.h | 33 ++--
.../include/odp/api/plat/cpumask_types.h | 10 +-
platform/linux-generic/include/odp/api/std_clib.h | 1 +
platform/linux-generic/include/odp/api/std_types.h | 10 +-
.../linux-generic/include/odp_atomic_internal.h | 1 +
.../linux-generic/include/odp_buffer_internal.h | 1 +
.../include/odp_classification_inlines.h | 50 +++---
.../include/odp_name_table_internal.h | 2 +-
.../linux-generic/include/odp_packet_internal.h | 5 +-
platform/linux-generic/include/odp_packet_socket.h | 1 +
.../include/odp_traffic_mngr_internal.h | 2 -
platform/linux-generic/include/protocols/eth.h | 113 ++++++++++++++
platform/linux-generic/include/protocols/ip.h | 168 +++++++++++++++++++++
.../linux-generic/include/protocols}/ipsec.h | 40 ++---
.../linux-generic/include/protocols}/tcp.h | 12 +-
platform/linux-generic/include/protocols/udp.h | 49 ++++++
platform/linux-generic/m4/configure.m4 | 7 +-
platform/linux-generic/odp_buffer.c | 2 +-
platform/linux-generic/odp_classification.c | 24 +--
platform/linux-generic/odp_cpumask.c | 39 +++--
platform/linux-generic/odp_hash.c | 2 +
platform/linux-generic/odp_init.c | 1 +
platform/linux-generic/odp_packet.c | 130 ++++++++--------
platform/linux-generic/odp_packet_io.c | 1 +
platform/linux-generic/odp_pkt_queue.c | 41 +++--
platform/linux-generic/odp_pool.c | 2 +-
platform/linux-generic/odp_queue.c | 7 +-
platform/linux-generic/odp_schedule_sp.c | 24 +--
platform/linux-generic/odp_shared_memory.c | 1 +
platform/linux-generic/odp_sorted_list.c | 1 +
platform/linux-generic/odp_system_info.c | 1 +
platform/linux-generic/odp_ticketlock.c | 3 -
platform/linux-generic/odp_timer.c | 1 +
platform/linux-generic/odp_timer_wheel.c | 1 +
platform/linux-generic/odp_traffic_mngr.c | 78 +++++-----
platform/linux-generic/pktio/dpdk.c | 4 +-
platform/linux-generic/pktio/loop.c | 6 +-
platform/linux-generic/pktio/netmap.c | 8 +-
platform/linux-generic/pktio/pcap.c | 6 +-
platform/linux-generic/pktio/ring.c | 11 +-
platform/linux-generic/pktio/socket.c | 8 +-
platform/linux-generic/pktio/socket_mmap.c | 22 +--
platform/linux-generic/pktio/sysfs.c | 1 +
platform/linux-generic/pktio/tap.c | 1 +
test/Makefile.am | 2 +-
test/performance/odp_l2fwd.c | 1 +
test/performance/odp_l2fwd_run.sh | 4 +-
test/performance/odp_pktio_perf.c | 1 +
test/performance/odp_scheduling.c | 1 +
.../platform/linux-generic}/.gitignore | 0
.../platform/linux-generic}/Makefile.am | 0
.../platform/linux-generic}/Makefile.inc | 0
test/platform/linux-generic/m4/configure.m4 | 5 +
.../platform/linux-generic}/pktio/.gitignore | 0
.../platform/linux-generic}/pktio/Makefile.am | 0
.../platform/linux-generic}/pktio/pktio_env | 0
.../platform/linux-generic}/pktio/pktio_run.sh | 0
.../linux-generic}/pktio/pktio_run_dpdk.sh | 0
.../linux-generic}/pktio/pktio_run_netmap.sh | 0
.../linux-generic}/pktio/pktio_run_pcap.sh | 0
.../platform/linux-generic}/pktio/pktio_run_tap.sh | 0
.../platform/linux-generic}/pktio_ipc/.gitignore | 0
.../platform/linux-generic}/pktio_ipc/Makefile.am | 0
.../platform/linux-generic}/pktio_ipc/ipc_common.c | 0
.../platform/linux-generic}/pktio_ipc/ipc_common.h | 1 +
.../platform/linux-generic}/pktio_ipc/pktio_ipc1.c | 0
.../platform/linux-generic}/pktio_ipc/pktio_ipc2.c | 0
.../linux-generic}/pktio_ipc/pktio_ipc_run.sh | 0
.../platform/linux-generic}/ring/.gitignore | 0
.../platform/linux-generic}/ring/Makefile.am | 0
.../platform/linux-generic}/ring/ring_basic.c | 0
.../platform/linux-generic}/ring/ring_main.c | 0
.../platform/linux-generic}/ring/ring_stress.c | 0
.../platform/linux-generic}/ring/ring_suites.c | 0
.../platform/linux-generic}/ring/ring_suites.h | 0
.../test => test/platform/linux-generic}/run-test | 0
.../platform/linux-generic}/shmem/.gitignore | 0
.../platform/linux-generic}/shmem/Makefile.am | 0
.../platform/linux-generic}/shmem/shmem.h | 0
.../platform/linux-generic}/shmem/shmem_common.h | 0
.../platform/linux-generic}/shmem/shmem_linux.c | 0
.../platform/linux-generic}/shmem/shmem_linux.h | 0
.../platform/linux-generic}/shmem/shmem_odp.c | 0
.../platform/linux-generic}/shmem/shmem_odp.h | 0
.../classification/odp_classification_testsuites.h | 1 +
test/validation/common/mask_common.c | 2 +
test/validation/common/odp_cunit_common.h | 1 +
test/validation/packet/packet.c | 122 ++++++++++++---
test/validation/pktio/pktio.c | 14 +-
test/validation/queue/queue.c | 158 +++++++++++++++----
test/validation/queue/queue.h | 4 +-
test/validation/traffic_mngr/traffic_mngr.c | 6 +-
112 files changed, 1043 insertions(+), 369 deletions(-)
copy {test/validation => example/hello}/.gitignore (54%)
create mode 100644 example/hello/Makefile.am
create mode 100644 example/hello/odp_hello.c
create mode 100644 platform/linux-generic/include/protocols/eth.h
create mode 100644 platform/linux-generic/include/protocols/ip.h
copy {helper/include/odp/helper => platform/linux-generic/include/protocols}/ipsec.h (53%)
copy {helper/include/odp/helper => platform/linux-generic/include/protocols}/tcp.h (88%)
create mode 100644 platform/linux-generic/include/protocols/udp.h
rename {platform/linux-generic/test => test/platform/linux-generic}/.gitignore (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/Makefile.am (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/Makefile.inc (100%)
create mode 100644 test/platform/linux-generic/m4/configure.m4
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/.gitignore (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/Makefile.am (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_env (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_run.sh (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_run_dpdk.sh (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_run_netmap.sh (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_run_pcap.sh (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio/pktio_run_tap.sh (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/.gitignore (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/Makefile.am (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/ipc_common.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/ipc_common.h (98%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/pktio_ipc1.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/pktio_ipc2.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/pktio_ipc/pktio_ipc_run.sh (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/ring/.gitignore (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/ring/Makefile.am (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/ring/ring_basic.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/ring/ring_main.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/ring/ring_stress.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/ring/ring_suites.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/ring/ring_suites.h (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/run-test (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/.gitignore (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/Makefile.am (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem.h (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem_common.h (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem_linux.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem_linux.h (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem_odp.c (100%)
rename {platform/linux-generic/test => test/platform/linux-generic}/shmem/shmem_odp.h (100%)
hooks/post-receive
--
7 years, 10 months
- 1
- 0
[COMMIT] branch master updated. v1.10.1.0-41-g3e95604
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via 3e9560480627196a26d702be045ff22191b9a6c1 (commit)
from a97db1b8b46b9656f964ccf09ce28941ae062507 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3e9560480627196a26d702be045ff22191b9a6c1
Author: Yi He <yi.he(a)linaro.org>
Date: Mon Jul 4 07:53:22 2016 +0000
linux-gen: remove all dependencies to helper
Remove all dependencies to helper by copying
protocol header definitions into linux-generic,
checked and decoupled all odph_* ODPH_* references.
Signed-off-by: Yi He <yi.he(a)linaro.org>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 469869e..c8fd8cb 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -6,8 +6,6 @@ include $(top_srcdir)/platform/@with_platform@/Makefile.inc
AM_CFLAGS += -I$(srcdir)/include
AM_CFLAGS += -I$(top_srcdir)/include
-AM_CFLAGS += -I$(top_srcdir)/helper/include
-AM_CFLAGS += -I$(top_srcdir)/helper
include_HEADERS = \
$(top_srcdir)/include/odp.h \
@@ -125,6 +123,11 @@ noinst_HEADERS = \
${srcdir}/include/odp_timer_internal.h \
${srcdir}/include/odp_timer_wheel_internal.h \
${srcdir}/include/odp_traffic_mngr_internal.h \
+ ${srcdir}/include/protocols/eth.h \
+ ${srcdir}/include/protocols/ip.h \
+ ${srcdir}/include/protocols/ipsec.h \
+ ${srcdir}/include/protocols/tcp.h \
+ ${srcdir}/include/protocols/udp.h \
${srcdir}/Makefile.inc
__LIB__libodp_linux_la_SOURCES = \
diff --git a/platform/linux-generic/include/odp_classification_inlines.h b/platform/linux-generic/include/odp_classification_inlines.h
index 611d706..b839197 100644
--- a/platform/linux-generic/include/odp_classification_inlines.h
+++ b/platform/linux-generic/include/odp_classification_inlines.h
@@ -19,11 +19,11 @@ extern "C" {
#endif
#include <odp/api/debug.h>
-#include <odp/helper/eth.h>
-#include <odp/helper/ip.h>
-#include <odp/helper/ipsec.h>
-#include <odp/helper/udp.h>
-#include <odp/helper/tcp.h>
+#include <protocols/eth.h>
+#include <protocols/ip.h>
+#include <protocols/ipsec.h>
+#include <protocols/udp.h>
+#include <protocols/tcp.h>
#include <odp_packet_internal.h>
/* PMR term value verification function
@@ -45,11 +45,11 @@ static inline int verify_pmr_ip_proto(const uint8_t *pkt_addr,
odp_packet_hdr_t *pkt_hdr,
pmr_term_value_t *term_value)
{
- const odph_ipv4hdr_t *ip;
+ const _odp_ipv4hdr_t *ip;
uint8_t proto;
if (!pkt_hdr->p.input_flags.ipv4)
return 0;
- ip = (const odph_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset);
+ ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset);
proto = ip->proto;
if (term_value->match.value == (proto & term_value->match.mask))
return 1;
@@ -61,11 +61,11 @@ static inline int verify_pmr_ipv4_saddr(const uint8_t *pkt_addr,
odp_packet_hdr_t *pkt_hdr,
pmr_term_value_t *term_value)
{
- const odph_ipv4hdr_t *ip;
+ const _odp_ipv4hdr_t *ip;
uint32_t ipaddr;
if (!pkt_hdr->p.input_flags.ipv4)
return 0;
- ip = (const odph_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset);
+ ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset);
ipaddr = odp_be_to_cpu_32(ip->src_addr);
if (term_value->match.value == (ipaddr & term_value->match.mask))
return 1;
@@ -77,11 +77,11 @@ static inline int verify_pmr_ipv4_daddr(const uint8_t *pkt_addr,
odp_packet_hdr_t *pkt_hdr,
pmr_term_value_t *term_value)
{
- const odph_ipv4hdr_t *ip;
+ const _odp_ipv4hdr_t *ip;
uint32_t ipaddr;
if (!pkt_hdr->p.input_flags.ipv4)
return 0;
- ip = (const odph_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset);
+ ip = (const _odp_ipv4hdr_t *)(pkt_addr + pkt_hdr->p.l3_offset);
ipaddr = odp_be_to_cpu_32(ip->dst_addr);
if (term_value->match.value == (ipaddr & term_value->match.mask))
return 1;
@@ -94,10 +94,10 @@ static inline int verify_pmr_tcp_sport(const uint8_t *pkt_addr,
pmr_term_value_t *term_value)
{
uint16_t sport;
- const odph_tcphdr_t *tcp;
+ const _odp_tcphdr_t *tcp;
if (!pkt_hdr->p.input_flags.tcp)
return 0;
- tcp = (const odph_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset);
+ tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset);
sport = odp_be_to_cpu_16(tcp->src_port);
if (term_value->match.value == (sport & term_value->match.mask))
return 1;
@@ -110,10 +110,10 @@ static inline int verify_pmr_tcp_dport(const uint8_t *pkt_addr,
pmr_term_value_t *term_value)
{
uint16_t dport;
- const odph_tcphdr_t *tcp;
+ const _odp_tcphdr_t *tcp;
if (!pkt_hdr->p.input_flags.tcp)
return 0;
- tcp = (const odph_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset);
+ tcp = (const _odp_tcphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset);
dport = odp_be_to_cpu_16(tcp->dst_port);
if (term_value->match.value == (dport & term_value->match.mask))
return 1;
@@ -126,10 +126,10 @@ static inline int verify_pmr_udp_dport(const uint8_t *pkt_addr,
pmr_term_value_t *term_value)
{
uint16_t dport;
- const odph_udphdr_t *udp;
+ const _odp_udphdr_t *udp;
if (!pkt_hdr->p.input_flags.udp)
return 0;
- udp = (const odph_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset);
+ udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset);
dport = odp_be_to_cpu_16(udp->dst_port);
if (term_value->match.value == (dport & term_value->match.mask))
return 1;
@@ -142,11 +142,11 @@ static inline int verify_pmr_udp_sport(const uint8_t *pkt_addr,
pmr_term_value_t *term_value)
{
uint16_t sport;
- const odph_udphdr_t *udp;
+ const _odp_udphdr_t *udp;
if (!pkt_hdr->p.input_flags.udp)
return 0;
- udp = (const odph_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset);
+ udp = (const _odp_udphdr_t *)(pkt_addr + pkt_hdr->p.l4_offset);
sport = odp_be_to_cpu_16(udp->src_port);
if (term_value->match.value == (sport & term_value->match.mask))
return 1;
@@ -160,19 +160,19 @@ static inline int verify_pmr_dmac(const uint8_t *pkt_addr,
{
uint64_t dmac = 0;
uint64_t dmac_be = 0;
- const odph_ethhdr_t *eth;
+ const _odp_ethhdr_t *eth;
if (!packet_hdr_has_eth(pkt_hdr))
return 0;
- eth = (const odph_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset);
- memcpy(&dmac_be, eth->dst.addr, ODPH_ETHADDR_LEN);
+ eth = (const _odp_ethhdr_t *)(pkt_addr + pkt_hdr->p.l2_offset);
+ memcpy(&dmac_be, eth->dst.addr, _ODP_ETHADDR_LEN);
dmac = odp_be_to_cpu_64(dmac_be);
/* since we are converting a 48 bit ethernet address from BE to cpu
format using odp_be_to_cpu_64() the last 16 bits needs to be right
shifted */
if (dmac_be != dmac)
- dmac = dmac >> (64 - (ODPH_ETHADDR_LEN * 8));
+ dmac = dmac >> (64 - (_ODP_ETHADDR_LEN * 8));
if (term_value->match.value == (dmac & term_value->match.mask))
return 1;
@@ -220,11 +220,11 @@ static inline int verify_pmr_ipsec_spi(const uint8_t *pkt_addr,
pkt_addr += pkt_hdr->p.l4_offset;
if (pkt_hdr->p.input_flags.ipsec_ah) {
- const odph_ahhdr_t *ahhdr = (const odph_ahhdr_t *)pkt_addr;
+ const _odp_ahhdr_t *ahhdr = (const _odp_ahhdr_t *)pkt_addr;
spi = odp_be_to_cpu_32(ahhdr->spi);
} else if (pkt_hdr->p.input_flags.ipsec_esp) {
- const odph_esphdr_t *esphdr = (const odph_esphdr_t *)pkt_addr;
+ const _odp_esphdr_t *esphdr = (const _odp_esphdr_t *)pkt_addr;
spi = odp_be_to_cpu_32(esphdr->spi);
} else {
diff --git a/platform/linux-generic/include/odp_name_table_internal.h b/platform/linux-generic/include/odp_name_table_internal.h
index 21ae42d..52b202c 100644
--- a/platform/linux-generic/include/odp_name_table_internal.h
+++ b/platform/linux-generic/include/odp_name_table_internal.h
@@ -21,7 +21,7 @@ typedef enum {
ODP_PKTIO_HANDLE,
ODP_POOL_HANDLE,
ODP_QUEUE_HANDLE,
- ODPH_RING_HANDLE,
+ ODP_RING_HANDLE,
ODP_SHM_HANDLE,
ODP_TIMER_POOL_HANDLE,
ODP_TM_HANDLE,
diff --git a/platform/linux-generic/include/protocols/eth.h b/platform/linux-generic/include/protocols/eth.h
new file mode 100644
index 0000000..6d00e7f
--- /dev/null
+++ b/platform/linux-generic/include/protocols/eth.h
@@ -0,0 +1,113 @@
+/* Copyright (c) 2016, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/**
+ * @file
+ *
+ * ODP ethernet header
+ */
+
+#ifndef ODP_ETH_H_
+#define ODP_ETH_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <odp_api.h>
+
+/** @addtogroup odp_header ODP HEADER
+ * @{
+ */
+
+#define _ODP_ETHADDR_LEN 6 /**< Ethernet address length */
+#define _ODP_ETHHDR_LEN 14 /**< Ethernet header length */
+#define _ODP_VLANHDR_LEN 4 /**< VLAN header length */
+#define _ODP_ETH_LEN_MIN 60 /**< Min frame length (excl CRC 4 bytes) */
+#define _ODP_ETH_LEN_MIN_CRC 64 /**< Min frame length (incl CRC 4 bytes) */
+#define _ODP_ETH_LEN_MAX 1514 /**< Max frame length (excl CRC 4 bytes) */
+#define _ODP_ETH_LEN_MAX_CRC 1518 /**< Max frame length (incl CRC 4 bytes) */
+
+/* The two byte _odp_vlanhdr_t tci field is composed of the following three
+ * subfields - a three bit Priority Code Point (PCP), a one bit Drop
+ * Eligibility Indicator (DEI) and a twelve bit VLAN Identifier (VID). The
+ * following constants can be used to extract or modify these subfields, once
+ * the tci field has been read in and converted to host byte order. Note
+ * that the DEI subfield used to be the CFI bit.
+ */
+#define _ODP_VLANHDR_MAX_PRIO 7 /**< Max value of the 3 bit priority */
+#define _ODP_VLANHDR_PCP_MASK 0xE000 /**< PCP field bit mask */
+#define _ODP_VLANHDR_PCP_SHIFT 13 /**< PCP field shift */
+#define _ODP_VLANHDR_DEI_MASK 0x1000 /**< DEI field bit mask */
+#define _ODP_VLANHDR_DEI_SHIFT 12 /**< DEI field shift */
+#define _ODP_VLANHDR_MAX_VID 0x0FFF /**< Max value of the 12 bit VID field */
+#define _ODP_VLANHDR_VID_MASK 0x0FFF /**< VID field bit mask */
+#define _ODP_VLANHDR_VID_SHIFT 0 /**< VID field shift */
+
+/**
+ * Ethernet MAC address
+ */
+typedef struct ODP_PACKED {
+ uint8_t addr[_ODP_ETHADDR_LEN]; /**< @private Address */
+} _odp_ethaddr_t;
+
+/** @internal Compile time assert */
+ODP_STATIC_ASSERT(sizeof(_odp_ethaddr_t) == _ODP_ETHADDR_LEN,
+ "_ODP_ETHADDR_T__SIZE_ERROR");
+
+/**
+ * Ethernet header
+ */
+typedef struct ODP_PACKED {
+ _odp_ethaddr_t dst; /**< Destination address */
+ _odp_ethaddr_t src; /**< Source address */
+ odp_u16be_t type; /**< EtherType */
+} _odp_ethhdr_t;
+
+/** @internal Compile time assert */
+ODP_STATIC_ASSERT(sizeof(_odp_ethhdr_t) == _ODP_ETHHDR_LEN,
+ "_ODP_ETHHDR_T__SIZE_ERROR");
+
+/**
+ * IEEE 802.1Q VLAN header
+ *
+ * This field is present when the EtherType (the _odp_ethhdr_t type field) of
+ * the preceding ethernet header is _ODP_ETHTYPE_VLAN. The inner EtherType
+ * (the _odp_vlanhdr_t type field) then indicates what comes next. Note that
+ * the so called TPID field isn't here because it overlaps with the
+ * _odp_ethhdr_t type field.
+ */
+typedef struct ODP_PACKED {
+ odp_u16be_t tci; /**< Priority / CFI / VLAN ID */
+ odp_u16be_t type; /**< Inner EtherType */
+} _odp_vlanhdr_t;
+
+/** @internal Compile time assert */
+ODP_STATIC_ASSERT(sizeof(_odp_vlanhdr_t) == _ODP_VLANHDR_LEN,
+ "_ODP_VLANHDR_T__SIZE_ERROR");
+
+/* Ethernet header Ether Type ('type') values, a selected few */
+#define _ODP_ETHTYPE_IPV4 0x0800 /**< Internet Protocol version 4 */
+#define _ODP_ETHTYPE_ARP 0x0806 /**< Address Resolution Protocol */
+#define _ODP_ETHTYPE_RARP 0x8035 /**< Reverse Address Resolution Protocol*/
+#define _ODP_ETHTYPE_VLAN 0x8100 /**< VLAN-tagged frame IEEE 802.1Q */
+#define _ODP_ETHTYPE_VLAN_OUTER 0x88A8 /**< Stacked VLANs/QinQ, outer-tag/S-TAG*/
+#define _ODP_ETHTYPE_IPV6 0x86dd /**< Internet Protocol version 6 */
+#define _ODP_ETHTYPE_FLOW_CTRL 0x8808 /**< Ethernet flow control */
+#define _ODP_ETHTYPE_MPLS 0x8847 /**< MPLS unicast */
+#define _ODP_ETHTYPE_MPLS_MCAST 0x8848 /**< MPLS multicast */
+#define _ODP_ETHTYPE_MACSEC 0x88E5 /**< MAC security IEEE 802.1AE */
+#define _ODP_ETHTYPE_1588 0x88F7 /**< Precision Time Protocol IEEE 1588 */
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/platform/linux-generic/include/protocols/ip.h b/platform/linux-generic/include/protocols/ip.h
new file mode 100644
index 0000000..d5277fb
--- /dev/null
+++ b/platform/linux-generic/include/protocols/ip.h
@@ -0,0 +1,168 @@
+/* Copyright (c) 2016, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/**
+ * @file
+ *
+ * ODP IP header
+ */
+
+#ifndef ODP_IP_H_
+#define ODP_IP_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <odp_api.h>
+
+/** @addtogroup odp_header ODP HEADER
+ * @{
+ */
+
+#define _ODP_IPV4 4 /**< IP version 4 */
+#define _ODP_IPV4HDR_LEN 20 /**< Min length of IP header (no options) */
+#define _ODP_IPV4HDR_IHL_MIN 5 /**< Minimum IHL value*/
+#define _ODP_IPV4ADDR_LEN 4 /**< IPv4 address length in bytes */
+
+/** The one byte IPv4 tos or IPv6 tc field is composed of the following two
+ * subfields - a six bit Differentiated Service Code Point (DSCP) and a two
+ * bit Explicit Congestion Notification (ECN) subfield. The following
+ * constants can be used to extract or modify these fields. Despite the
+ * name prefix being _ODP_IP_TOS_* these constants apply equally well for
+ * the IPv6 Traffic Class (tc) field.
+ */
+#define _ODP_IP_TOS_MAX_DSCP 63 /**< 6-bit DSCP field has max value 63 */
+#define _ODP_IP_TOS_DSCP_MASK 0xFC /**< DSCP field is in bits <7:2> */
+#define _ODP_IP_TOS_DSCP_SHIFT 2 /**< DSCP field is shifted letf by 2 */
+#define _ODP_IP_TOS_MAX_ECN 3 /**< 2-bit ECN field has max value 3 */
+#define _ODP_IP_TOS_ECN_MASK 0x03 /**< ECN field is in bits <1:0> */
+#define _ODP_IP_TOS_ECN_SHIFT 0 /**< ECN field is not shifted. */
+
+/** The following constants give names to the four possible ECN values,
+ * as described in RFC 3168.
+ */
+#define _ODP_IP_ECN_NOT_ECT 0 /**< 0 indicates not participating in ECN */
+#define _ODP_IP_ECN_ECT1 1 /**< Indicates no congestion seen yet */
+#define _ODP_IP_ECN_ECT0 2 /**< Indicates no congestion seen yet */
+#define _ODP_IP_ECN_CE 3 /**< Used to signal Congestion Experienced */
+
+/** @internal Returns IPv4 version */
+#define _ODP_IPV4HDR_VER(ver_ihl) (((ver_ihl) & 0xf0) >> 4)
+
+/** @internal Returns IPv4 header length */
+#define _ODP_IPV4HDR_IHL(ver_ihl) ((ver_ihl) & 0x0f)
+
+/** @internal Returns IPv4 DSCP */
+#define _ODP_IPV4HDR_DSCP(tos) (((tos) & 0xfc) >> 2)
+
+/** @internal Returns IPv4 Don't fragment */
+#define _ODP_IPV4HDR_FLAGS_DONT_FRAG(frag_offset) ((frag_offset) & 0x4000)
+
+/** @internal Returns IPv4 more fragments */
+#define _ODP_IPV4HDR_FLAGS_MORE_FRAGS(frag_offset) ((frag_offset) & 0x2000)
+
+/** @internal Returns IPv4 fragment offset */
+#define _ODP_IPV4HDR_FRAG_OFFSET(frag_offset) ((frag_offset) & 0x1fff)
+
+/** @internal Returns true if IPv4 packet is a fragment */
+#define _ODP_IPV4HDR_IS_FRAGMENT(frag_offset) ((frag_offset) & 0x3fff)
+
+/** IPv4 header */
+typedef struct ODP_PACKED {
+ uint8_t ver_ihl; /**< Version / Header length */
+ uint8_t tos; /**< Type of service */
+ odp_u16be_t tot_len; /**< Total length */
+ odp_u16be_t id; /**< ID */
+ odp_u16be_t frag_offset;/**< Fragmentation offset */
+ uint8_t ttl; /**< Time to live */
+ uint8_t proto; /**< Protocol */
+ odp_u16sum_t chksum; /**< Checksum */
+ odp_u32be_t src_addr; /**< Source address */
+ odp_u32be_t dst_addr; /**< Destination address */
+} _odp_ipv4hdr_t;
+
+/** @internal Compile time assert */
+ODP_STATIC_ASSERT(sizeof(_odp_ipv4hdr_t) == _ODP_IPV4HDR_LEN,
+ "_ODP_IPV4HDR_T__SIZE_ERROR");
+
+/** IPv6 version */
+#define _ODP_IPV6 6
+
+/** IPv6 header length */
+#define _ODP_IPV6HDR_LEN 40
+
+/** IPv6 address length in bytes */
+#define _ODP_IPV6ADDR_LEN 16
+
+/** The following constants can be used to access the three subfields
+ * of the 4 byte ver_tc_flow field - namely the four bit Version subfield,
+ * the eight bit Traffic Class subfield (TC) and the twenty bit Flow Label
+ * subfield. Note that the IPv6 TC field is analogous to the IPv4 TOS
+ * field and is composed of the DSCP and ECN subfields. Use the _ODP_IP_TOS_*
+ * constants above to access these subfields.
+ */
+#define _ODP_IPV6HDR_VERSION_MASK 0xF0000000 /**< Version field bit mask */
+#define _ODP_IPV6HDR_VERSION_SHIFT 28 /**< Version field shift */
+#define _ODP_IPV6HDR_TC_MASK 0x0FF00000 /**< TC field bit mask */
+#define _ODP_IPV6HDR_TC_SHIFT 20 /**< TC field shift */
+#define _ODP_IPV6HDR_FLOW_LABEL_MASK 0x000FFFFF /**< Flow Label bit mask */
+#define _ODP_IPV6HDR_FLOW_LABEL_SHIFT 0 /**< Flow Label shift */
+
+/** @internal Returns IPv6 DSCP */
+#define _ODP_IPV6HDR_DSCP(ver_tc_flow) \
+ (uint8_t)((((ver_tc_flow) & 0x0fc00000) >> 22) & 0xff)
+
+/**
+ * IPv6 header
+ */
+typedef struct ODP_PACKED {
+ odp_u32be_t ver_tc_flow; /**< Version / Traffic class / Flow label */
+ odp_u16be_t payload_len; /**< Payload length */
+ uint8_t next_hdr; /**< Next header */
+ uint8_t hop_limit; /**< Hop limit */
+ uint8_t src_addr[16]; /**< Source address */
+ uint8_t dst_addr[16]; /**< Destination address */
+} _odp_ipv6hdr_t;
+
+/** @internal Compile time assert */
+ODP_STATIC_ASSERT(sizeof(_odp_ipv6hdr_t) == _ODP_IPV6HDR_LEN,
+ "_ODP_IPV6HDR_T__SIZE_ERROR");
+
+/**
+ * IPv6 Header extensions
+ */
+typedef struct ODP_PACKED {
+ uint8_t next_hdr; /**< Protocol of next header */
+ uint8_t ext_len; /**< Length of this extension in 8 byte units,
+ not counting first 8 bytes, so 0 = 8 bytes
+ 1 = 16 bytes, etc. */
+ uint8_t filler[6]; /**< Fill out first 8 byte segment */
+} _odp_ipv6hdr_ext_t;
+
+/** @name
+ * IP protocol values (IPv4:'proto' or IPv6:'next_hdr')
+ * @{*/
+#define _ODP_IPPROTO_HOPOPTS 0x00 /**< IPv6 hop-by-hop options */
+#define _ODP_IPPROTO_ICMP 0x01 /**< Internet Control Message Protocol (1) */
+#define _ODP_IPPROTO_TCP 0x06 /**< Transmission Control Protocol (6) */
+#define _ODP_IPPROTO_UDP 0x11 /**< User Datagram Protocol (17) */
+#define _ODP_IPPROTO_ROUTE 0x2B /**< IPv6 Routing header (43) */
+#define _ODP_IPPROTO_FRAG 0x2C /**< IPv6 Fragment (44) */
+#define _ODP_IPPROTO_AH 0x33 /**< Authentication Header (51) */
+#define _ODP_IPPROTO_ESP 0x32 /**< Encapsulating Security Payload (50) */
+#define _ODP_IPPROTO_INVALID 0xFF /**< Reserved invalid by IANA */
+
+/**@}*/
+
+/**
+ * @}
+ */
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/platform/linux-generic/include/protocols/ipsec.h b/platform/linux-generic/include/protocols/ipsec.h
new file mode 100644
index 0000000..093177f
--- /dev/null
+++ b/platform/linux-generic/include/protocols/ipsec.h
@@ -0,0 +1,81 @@
+/* Copyright (c) 2016, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+
+/**
+ * @file
+ *
+ * ODP IPSec headers
+ */
+
+#ifndef ODP_IPSEC_H_
+#define ODP_IPSEC_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <odp_api.h>
+
+/** @addtogroup odp_header ODP HEADER
+ * @{
+ */
+
+#define _ODP_ESPHDR_LEN 8 /**< IPSec ESP header length */
+#define _ODP_ESPTRL_LEN 2 /**< IPSec ESP trailer length */
+#define _ODP_AHHDR_LEN 12 /**< IPSec AH header length */
+
+/**
+ * IPSec ESP header
+ */
+typedef struct ODP_PACKED {
+ odp_u32be_t spi; /**< Security Parameter Index */
+ odp_u32be_t seq_no; /**< Sequence Number */
+ uint8_t iv[0]; /**< Initialization vector */
+} _odp_esphdr_t;
+
+/** @internal Compile time assert */
+ODP_STATIC_ASSERT(sizeof(_odp_esphdr_t) == _ODP_ESPHDR_LEN,
+ "_ODP_ESPHDR_T__SIZE_ERROR");
+
+/**
+ * IPSec ESP trailer
+ */
+typedef struct ODP_PACKED {
+ uint8_t pad_len; /**< Padding length (0-255) */
+ uint8_t next_header; /**< Next header protocol */
+ uint8_t icv[0]; /**< Integrity Check Value (optional) */
+} _odp_esptrl_t;
+
+/** @internal Compile time assert */
+ODP_STATIC_ASSERT(sizeof(_odp_esptrl_t) == _ODP_ESPTRL_LEN,
+ "_ODP_ESPTRL_T__SIZE_ERROR");
+
+/**
+ * IPSec AH header
+ */
+typedef struct ODP_PACKED {
+ uint8_t next_header; /**< Next header protocol */
+ uint8_t ah_len; /**< AH header length */
+ odp_u16be_t pad; /**< Padding (must be 0) */
+ odp_u32be_t spi; /**< Security Parameter Index */
+ odp_u32be_t seq_no; /**< Sequence Number */
+ uint8_t icv[0]; /**< Integrity Check Value */
+} _odp_ahhdr_t;
+
+/** @internal Compile time assert */
+ODP_STATIC_ASSERT(sizeof(_odp_ahhdr_t) == _ODP_AHHDR_LEN,
+ "_ODP_AHHDR_T__SIZE_ERROR");
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/platform/linux-generic/include/protocols/tcp.h b/platform/linux-generic/include/protocols/tcp.h
new file mode 100644
index 0000000..4e92e4b
--- /dev/null
+++ b/platform/linux-generic/include/protocols/tcp.h
@@ -0,0 +1,89 @@
+/* Copyright (c) 2016, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+
+/**
+ * @file
+ *
+ * ODP TCP header
+ */
+
+#ifndef ODP_TCP_H_
+#define ODP_TCP_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <odp_api.h>
+
+/** @addtogroup odp_header ODP HEADER
+ * @{
+ */
+
+#define _ODP_TCPHDR_LEN 20 /**< Min length of TCP header (no options) */
+
+/** TCP header */
+typedef struct ODP_PACKED {
+ odp_u16be_t src_port; /**< Source port */
+ odp_u16be_t dst_port; /**< Destination port */
+ odp_u32be_t seq_no; /**< Sequence number */
+ odp_u32be_t ack_no; /**< Acknowledgment number */
+ union {
+ odp_u16be_t doffset_flags;
+#if defined(ODP_BIG_ENDIAN_BITFIELD)
+ struct {
+ odp_u16be_t rsvd1:8;
+ odp_u16be_t flags:8; /**< TCP flags as a byte */
+ };
+ struct {
+ odp_u16be_t hl:4; /**< Hdr len, in words */
+ odp_u16be_t rsvd3:4; /**< Reserved */
+ odp_u16be_t cwr:1;
+ odp_u16be_t ece:1;
+ odp_u16be_t urg:1;
+ odp_u16be_t ack:1;
+ odp_u16be_t psh:1;
+ odp_u16be_t rst:1;
+ odp_u16be_t syn:1;
+ odp_u16be_t fin:1;
+ };
+#elif defined(ODP_LITTLE_ENDIAN_BITFIELD)
+ struct {
+ odp_u16be_t flags:8;
+ odp_u16be_t rsvd1:8; /**< TCP flags as a byte */
+ };
+ struct {
+ odp_u16be_t rsvd3:4; /**< Reserved */
+ odp_u16be_t hl:4; /**< Hdr len, in words */
+ odp_u16be_t fin:1;
+ odp_u16be_t syn:1;
+ odp_u16be_t rst:1;
+ odp_u16be_t psh:1;
+ odp_u16be_t ack:1;
+ odp_u16be_t urg:1;
+ odp_u16be_t ece:1;
+ odp_u16be_t cwr:1;
+ };
+
+#else
+#error "Endian BitField order not defined!"
+#endif
+ };
+ odp_u16be_t window; /**< Window size */
+ odp_u16be_t cksm; /**< Checksum */
+ odp_u16be_t urgptr; /**< Urgent pointer */
+} _odp_tcphdr_t;
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/platform/linux-generic/include/protocols/udp.h b/platform/linux-generic/include/protocols/udp.h
new file mode 100644
index 0000000..535aba8
--- /dev/null
+++ b/platform/linux-generic/include/protocols/udp.h
@@ -0,0 +1,49 @@
+/* Copyright (c) 2016, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/**
+ * @file
+ *
+ * ODP UDP header
+ */
+
+#ifndef ODP_UDP_H_
+#define ODP_UDP_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <odp_api.h>
+
+/** @addtogroup odp_header ODP HEADER
+ * @{
+ */
+
+/** UDP header length */
+#define _ODP_UDPHDR_LEN 8
+
+/** UDP header */
+typedef struct ODP_PACKED {
+ odp_u16be_t src_port; /**< Source port */
+ odp_u16be_t dst_port; /**< Destination port */
+ odp_u16be_t length; /**< UDP datagram length in bytes (header+data) */
+ odp_u16be_t chksum; /**< UDP header and data checksum (0 if not used)*/
+} _odp_udphdr_t;
+
+/** @internal Compile time assert */
+ODP_STATIC_ASSERT(sizeof(_odp_udphdr_t) == _ODP_UDPHDR_LEN,
+ "_ODP_UDPHDR_T__SIZE_ERROR");
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c
index 027a7ce..ea223bf 100644
--- a/platform/linux-generic/odp_classification.c
+++ b/platform/linux-generic/odp_classification.c
@@ -18,7 +18,8 @@
#include <odp_classification_internal.h>
#include <odp_pool_internal.h>
#include <odp/api/shared_memory.h>
-#include <odp/helper/eth.h>
+#include <protocols/eth.h>
+#include <protocols/ip.h>
#include <string.h>
#include <errno.h>
#include <stdbool.h>
@@ -841,16 +842,16 @@ cos_t *match_qos_l3_cos(pmr_l3_cos_t *l3_cos, const uint8_t *pkt_addr,
{
uint8_t dscp;
cos_t *cos = NULL;
- const odph_ipv4hdr_t *ipv4;
- const odph_ipv6hdr_t *ipv6;
+ const _odp_ipv4hdr_t *ipv4;
+ const _odp_ipv6hdr_t *ipv6;
if (hdr->p.input_flags.l3 && hdr->p.input_flags.ipv4) {
- ipv4 = (const odph_ipv4hdr_t *)(pkt_addr + hdr->p.l3_offset);
- dscp = ODPH_IPV4HDR_DSCP(ipv4->tos);
+ ipv4 = (const _odp_ipv4hdr_t *)(pkt_addr + hdr->p.l3_offset);
+ dscp = _ODP_IPV4HDR_DSCP(ipv4->tos);
cos = l3_cos->cos[dscp];
} else if (hdr->p.input_flags.l3 && hdr->p.input_flags.ipv6) {
- ipv6 = (const odph_ipv6hdr_t *)(pkt_addr + hdr->p.l3_offset);
- dscp = ODPH_IPV6HDR_DSCP(ipv6->ver_tc_flow);
+ ipv6 = (const _odp_ipv6hdr_t *)(pkt_addr + hdr->p.l3_offset);
+ dscp = _ODP_IPV6HDR_DSCP(ipv6->ver_tc_flow);
cos = l3_cos->cos[dscp];
}
@@ -861,14 +862,14 @@ cos_t *match_qos_l2_cos(pmr_l2_cos_t *l2_cos, const uint8_t *pkt_addr,
odp_packet_hdr_t *hdr)
{
cos_t *cos = NULL;
- const odph_ethhdr_t *eth;
- const odph_vlanhdr_t *vlan;
+ const _odp_ethhdr_t *eth;
+ const _odp_vlanhdr_t *vlan;
uint16_t qos;
if (packet_hdr_has_l2(hdr) && hdr->p.input_flags.vlan &&
packet_hdr_has_eth(hdr)) {
- eth = (const odph_ethhdr_t *)(pkt_addr + hdr->p.l2_offset);
- vlan = (const odph_vlanhdr_t *)(eth + 1);
+ eth = (const _odp_ethhdr_t *)(pkt_addr + hdr->p.l2_offset);
+ vlan = (const _odp_vlanhdr_t *)(eth + 1);
qos = odp_be_to_cpu_16(vlan->tci);
qos = ((qos >> 13) & 0x07);
cos = l2_cos->cos[qos];
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 0a868e9..0e319d2 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -10,10 +10,10 @@
#include <odp/api/hints.h>
#include <odp/api/byteorder.h>
-#include <odp/helper/eth.h>
-#include <odp/helper/ip.h>
-#include <odp/helper/tcp.h>
-#include <odp/helper/udp.h>
+#include <protocols/eth.h>
+#include <protocols/ip.h>
+#include <protocols/tcp.h>
+#include <protocols/udp.h>
#include <errno.h>
#include <string.h>
@@ -991,15 +991,15 @@ int _odp_packet_copy_md_to_packet(odp_packet_t srcpkt, odp_packet_t dstpkt)
static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr,
uint32_t *offset, uint32_t frame_len)
{
- const odph_ipv4hdr_t *ipv4 = (const odph_ipv4hdr_t *)*parseptr;
- uint8_t ver = ODPH_IPV4HDR_VER(ipv4->ver_ihl);
- uint8_t ihl = ODPH_IPV4HDR_IHL(ipv4->ver_ihl);
+ const _odp_ipv4hdr_t *ipv4 = (const _odp_ipv4hdr_t *)*parseptr;
+ uint8_t ver = _ODP_IPV4HDR_VER(ipv4->ver_ihl);
+ uint8_t ihl = _ODP_IPV4HDR_IHL(ipv4->ver_ihl);
uint16_t frag_offset;
uint32_t dstaddr = odp_be_to_cpu_32(ipv4->dst_addr);
prs->l3_len = odp_be_to_cpu_16(ipv4->tot_len);
- if (odp_unlikely(ihl < ODPH_IPV4HDR_IHL_MIN) ||
+ if (odp_unlikely(ihl < _ODP_IPV4HDR_IHL_MIN) ||
odp_unlikely(ver != 4) ||
(prs->l3_len > frame_len - *offset)) {
prs->error_flags.ip_err = 1;
@@ -1009,7 +1009,7 @@ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr,
*offset += ihl * 4;
*parseptr += ihl * 4;
- if (odp_unlikely(ihl > ODPH_IPV4HDR_IHL_MIN))
+ if (odp_unlikely(ihl > _ODP_IPV4HDR_IHL_MIN))
prs->input_flags.ipopt = 1;
/* A packet is a fragment if:
@@ -1018,7 +1018,7 @@ static inline uint8_t parse_ipv4(packet_parser_t *prs, const uint8_t **parseptr,
* "fragment offset" field is nonzero (all fragments except the first)
*/
frag_offset = odp_be_to_cpu_16(ipv4->frag_offset);
- if (odp_unlikely(ODPH_IPV4HDR_IS_FRAGMENT(frag_offset)))
+ if (odp_unlikely(_ODP_IPV4HDR_IS_FRAGMENT(frag_offset)))
prs->input_flags.ipfrag = 1;
/* Handle IPv4 broadcast / multicast */
@@ -1035,12 +1035,12 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr,
uint32_t *offset, uint32_t frame_len,
uint32_t seg_len)
{
- const odph_ipv6hdr_t *ipv6 = (const odph_ipv6hdr_t *)*parseptr;
- const odph_ipv6hdr_ext_t *ipv6ext;
+ const _odp_ipv6hdr_t *ipv6 = (const _odp_ipv6hdr_t *)*parseptr;
+ const _odp_ipv6hdr_ext_t *ipv6ext;
uint32_t dstaddr0 = odp_be_to_cpu_32(ipv6->dst_addr[0]);
prs->l3_len = odp_be_to_cpu_16(ipv6->payload_len) +
- ODPH_IPV6HDR_LEN;
+ _ODP_IPV6HDR_LEN;
/* Basic sanity checks on IPv6 header */
if ((odp_be_to_cpu_32(ipv6->ver_tc_flow) >> 28) != 6 ||
@@ -1054,22 +1054,22 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr,
prs->input_flags.ip_bcast = 0;
/* Skip past IPv6 header */
- *offset += sizeof(odph_ipv6hdr_t);
- *parseptr += sizeof(odph_ipv6hdr_t);
+ *offset += sizeof(_odp_ipv6hdr_t);
+ *parseptr += sizeof(_odp_ipv6hdr_t);
/* Skip past any IPv6 extension headers */
- if (ipv6->next_hdr == ODPH_IPPROTO_HOPOPTS ||
- ipv6->next_hdr == ODPH_IPPROTO_ROUTE) {
+ if (ipv6->next_hdr == _ODP_IPPROTO_HOPOPTS ||
+ ipv6->next_hdr == _ODP_IPPROTO_ROUTE) {
prs->input_flags.ipopt = 1;
do {
- ipv6ext = (const odph_ipv6hdr_ext_t *)*parseptr;
+ ipv6ext = (const _odp_ipv6hdr_ext_t *)*parseptr;
uint16_t extlen = 8 + ipv6ext->ext_len * 8;
*offset += extlen;
*parseptr += extlen;
- } while ((ipv6ext->next_hdr == ODPH_IPPROTO_HOPOPTS ||
- ipv6ext->next_hdr == ODPH_IPPROTO_ROUTE) &&
+ } while ((ipv6ext->next_hdr == _ODP_IPPROTO_HOPOPTS ||
+ ipv6ext->next_hdr == _ODP_IPPROTO_ROUTE) &&
*offset < seg_len);
if (*offset >= prs->l3_offset +
@@ -1078,13 +1078,13 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr,
return 0;
}
- if (ipv6ext->next_hdr == ODPH_IPPROTO_FRAG)
+ if (ipv6ext->next_hdr == _ODP_IPPROTO_FRAG)
prs->input_flags.ipfrag = 1;
return ipv6ext->next_hdr;
}
- if (odp_unlikely(ipv6->next_hdr == ODPH_IPPROTO_FRAG)) {
+ if (odp_unlikely(ipv6->next_hdr == _ODP_IPPROTO_FRAG)) {
prs->input_flags.ipopt = 1;
prs->input_flags.ipfrag = 1;
}
@@ -1098,11 +1098,11 @@ static inline uint8_t parse_ipv6(packet_parser_t *prs, const uint8_t **parseptr,
static inline void parse_tcp(packet_parser_t *prs,
const uint8_t **parseptr, uint32_t *offset)
{
- const odph_tcphdr_t *tcp = (const odph_tcphdr_t *)*parseptr;
+ const _odp_tcphdr_t *tcp = (const _odp_tcphdr_t *)*parseptr;
- if (tcp->hl < sizeof(odph_tcphdr_t) / sizeof(uint32_t))
+ if (tcp->hl < sizeof(_odp_tcphdr_t) / sizeof(uint32_t))
prs->error_flags.tcp_err = 1;
- else if ((uint32_t)tcp->hl * 4 > sizeof(odph_tcphdr_t))
+ else if ((uint32_t)tcp->hl * 4 > sizeof(_odp_tcphdr_t))
prs->input_flags.tcpopt = 1;
prs->l4_len = prs->l3_len +
@@ -1119,10 +1119,10 @@ static inline void parse_tcp(packet_parser_t *prs,
static inline void parse_udp(packet_parser_t *prs,
const uint8_t **parseptr, uint32_t *offset)
{
- const odph_udphdr_t *udp = (const odph_udphdr_t *)*parseptr;
+ const _odp_udphdr_t *udp = (const _odp_udphdr_t *)*parseptr;
uint32_t udplen = odp_be_to_cpu_16(udp->length);
- if (udplen < sizeof(odph_udphdr_t) ||
+ if (udplen < sizeof(_odp_udphdr_t) ||
udplen > (prs->l3_len +
prs->l4_offset - prs->l3_offset)) {
prs->error_flags.udp_err = 1;
@@ -1131,8 +1131,8 @@ static inline void parse_udp(packet_parser_t *prs,
prs->l4_len = udplen;
if (offset)
- *offset += sizeof(odph_udphdr_t);
- *parseptr += sizeof(odph_udphdr_t);
+ *offset += sizeof(_odp_udphdr_t);
+ *parseptr += sizeof(_odp_udphdr_t);
}
/**
@@ -1146,7 +1146,7 @@ void packet_parse_l2(packet_parser_t *prs, uint32_t frame_len)
prs->input_flags.eth = 1;
/* Detect jumbo frames */
- if (frame_len > ODPH_ETH_LEN_MAX)
+ if (frame_len > _ODP_ETH_LEN_MAX)
prs->input_flags.jumbo = 1;
/* Assume valid L2 header, no CRC/FCS check in SW */
@@ -1164,19 +1164,19 @@ void packet_parse_l2(packet_parser_t *prs, uint32_t frame_len)
int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr,
uint32_t frame_len, uint32_t seg_len)
{
- const odph_ethhdr_t *eth;
- const odph_vlanhdr_t *vlan;
+ const _odp_ethhdr_t *eth;
+ const _odp_vlanhdr_t *vlan;
uint16_t ethtype;
uint32_t offset;
uint8_t ip_proto = 0;
const uint8_t *parseptr;
uint16_t macaddr0, macaddr2, macaddr4;
- offset = sizeof(odph_ethhdr_t);
+ offset = sizeof(_odp_ethhdr_t);
if (packet_parse_l2_not_done(prs))
packet_parse_l2(prs, frame_len);
- eth = (const odph_ethhdr_t *)ptr;
+ eth = (const _odp_ethhdr_t *)ptr;
/* Handle Ethernet broadcast/multicast addresses */
macaddr0 = odp_be_to_cpu_16(*((const uint16_t *)(const void *)eth));
@@ -1200,7 +1200,7 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr,
parseptr = (const uint8_t *)(eth + 1);
/* Check for SNAP vs. DIX */
- if (ethtype < ODPH_ETH_LEN_MAX) {
+ if (ethtype < _ODP_ETH_LEN_MAX) {
prs->input_flags.snap = 1;
if (ethtype > frame_len - offset) {
prs->error_flags.snap_len = 1;
@@ -1213,22 +1213,22 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr,
}
/* Parse the VLAN header(s), if present */
- if (ethtype == ODPH_ETHTYPE_VLAN_OUTER) {
+ if (ethtype == _ODP_ETHTYPE_VLAN_OUTER) {
prs->input_flags.vlan_qinq = 1;
prs->input_flags.vlan = 1;
- vlan = (const odph_vlanhdr_t *)parseptr;
+ vlan = (const _odp_vlanhdr_t *)parseptr;
ethtype = odp_be_to_cpu_16(vlan->type);
- offset += sizeof(odph_vlanhdr_t);
- parseptr += sizeof(odph_vlanhdr_t);
+ offset += sizeof(_odp_vlanhdr_t);
+ parseptr += sizeof(_odp_vlanhdr_t);
}
- if (ethtype == ODPH_ETHTYPE_VLAN) {
+ if (ethtype == _ODP_ETHTYPE_VLAN) {
prs->input_flags.vlan = 1;
- vlan = (const odph_vlanhdr_t *)parseptr;
+ vlan = (const _odp_vlanhdr_t *)parseptr;
ethtype = odp_be_to_cpu_16(vlan->type);
- offset += sizeof(odph_vlanhdr_t);
- parseptr += sizeof(odph_vlanhdr_t);
+ offset += sizeof(_odp_vlanhdr_t);
+ parseptr += sizeof(_odp_vlanhdr_t);
}
/* Set l3_offset+flag only for known ethtypes */
@@ -1237,18 +1237,18 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr,
/* Parse Layer 3 headers */
switch (ethtype) {
- case ODPH_ETHTYPE_IPV4:
+ case _ODP_ETHTYPE_IPV4:
prs->input_flags.ipv4 = 1;
ip_proto = parse_ipv4(prs, &parseptr, &offset, frame_len);
break;
- case ODPH_ETHTYPE_IPV6:
+ case _ODP_ETHTYPE_IPV6:
prs->input_flags.ipv6 = 1;
ip_proto = parse_ipv6(prs, &parseptr, &offset, frame_len,
seg_len);
break;
- case ODPH_ETHTYPE_ARP:
+ case _ODP_ETHTYPE_ARP:
prs->input_flags.arp = 1;
ip_proto = 255; /* Reserved invalid by IANA */
break;
@@ -1265,30 +1265,30 @@ int packet_parse_common(packet_parser_t *prs, const uint8_t *ptr,
/* Parse Layer 4 headers */
switch (ip_proto) {
- case ODPH_IPPROTO_ICMP:
+ case _ODP_IPPROTO_ICMP:
prs->input_flags.icmp = 1;
break;
- case ODPH_IPPROTO_TCP:
- if (odp_unlikely(offset + ODPH_TCPHDR_LEN > seg_len))
+ case _ODP_IPPROTO_TCP:
+ if (odp_unlikely(offset + _ODP_TCPHDR_LEN > seg_len))
return -1;
prs->input_flags.tcp = 1;
parse_tcp(prs, &parseptr, NULL);
break;
- case ODPH_IPPROTO_UDP:
- if (odp_unlikely(offset + ODPH_UDPHDR_LEN > seg_len))
+ case _ODP_IPPROTO_UDP:
+ if (odp_unlikely(offset + _ODP_UDPHDR_LEN > seg_len))
return -1;
prs->input_flags.udp = 1;
parse_udp(prs, &parseptr, NULL);
break;
- case ODPH_IPPROTO_AH:
+ case _ODP_IPPROTO_AH:
prs->input_flags.ipsec = 1;
prs->input_flags.ipsec_ah = 1;
break;
- case ODPH_IPPROTO_ESP:
+ case _ODP_IPPROTO_ESP:
prs->input_flags.ipsec = 1;
prs->input_flags.ipsec_esp = 1;
break;
diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c
index 9cfa1fc..aa14b6b 100644
--- a/platform/linux-generic/odp_traffic_mngr.c
+++ b/platform/linux-generic/odp_traffic_mngr.c
@@ -19,8 +19,8 @@
#include <unistd.h>
#include <pthread.h>
#include <odp/api/std_types.h>
-#include <odp/helper/eth.h>
-#include <odp/helper/ip.h>
+#include <protocols/eth.h>
+#include <protocols/ip.h>
#include <odp_traffic_mngr_internal.h>
/* Local vars */
@@ -1899,14 +1899,14 @@ static int tm_enqueue(tm_system_t *tm_system,
static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking,
odp_packet_t odp_pkt)
{
- odph_vlanhdr_t vlan_hdr, *vlan_hdr_ptr;
- odph_ethhdr_t *ether_hdr_ptr;
+ _odp_vlanhdr_t vlan_hdr, *vlan_hdr_ptr;
+ _odp_ethhdr_t *ether_hdr_ptr;
odp_bool_t split_hdr;
uint32_t hdr_len;
uint16_t old_tci, new_tci;
ether_hdr_ptr = odp_packet_l2_ptr(odp_pkt, &hdr_len);
- vlan_hdr_ptr = (odph_vlanhdr_t *)(ether_hdr_ptr + 1);
+ vlan_hdr_ptr = (_odp_vlanhdr_t *)(ether_hdr_ptr + 1);
/* If the split_hdr variable below is TRUE, then this indicates that
* for this odp (output) packet the VLAN header is not all in the same
@@ -1915,31 +1915,31 @@ static void egress_vlan_marking(tm_vlan_marking_t *vlan_marking,
* handle this case for correctness, but because of the rarity the
* code handling this is more optimized for ease of understanding and
* correctness rather then performance. */
- split_hdr = hdr_len < (ODPH_ETHHDR_LEN + ODPH_VLANHDR_LEN);
+ split_hdr = hdr_len < (_ODP_ETHHDR_LEN + _ODP_VLANHDR_LEN);
if (split_hdr) {
- odp_packet_copy_to_mem(odp_pkt, ODPH_ETHHDR_LEN,
- ODPH_VLANHDR_LEN, &vlan_hdr);
+ odp_packet_copy_to_mem(odp_pkt, _ODP_ETHHDR_LEN,
+ _ODP_VLANHDR_LEN, &vlan_hdr);
vlan_hdr_ptr = &vlan_hdr;
}
old_tci = odp_be_to_cpu_16(vlan_hdr_ptr->tci);
new_tci = old_tci;
if (vlan_marking->drop_eligible_enabled)
- new_tci |= ODPH_VLANHDR_DEI_MASK;
+ new_tci |= _ODP_VLANHDR_DEI_MASK;
if (new_tci == old_tci)
return;
vlan_hdr_ptr->tci = odp_cpu_to_be_16(new_tci);
if (split_hdr)
- odp_packet_copy_from_mem(odp_pkt, ODPH_ETHHDR_LEN,
- ODPH_VLANHDR_LEN, &vlan_hdr);
+ odp_packet_copy_from_mem(odp_pkt, _ODP_ETHHDR_LEN,
+ _ODP_VLANHDR_LEN, &vlan_hdr);
}
static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking,
odp_packet_t odp_pkt)
{
- odph_ipv4hdr_t ipv4_hdr, *ipv4_hdr_ptr;
+ _odp_ipv4hdr_t ipv4_hdr, *ipv4_hdr_ptr;
odp_bool_t split_hdr;
uint32_t hdr_len, l3_offset, old_chksum, ones_compl_sum, tos_diff;
uint8_t old_tos, new_tos, ecn;
@@ -1957,7 +1957,7 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking,
split_hdr = hdr_len < 12;
if (split_hdr) {
odp_packet_copy_to_mem(odp_pkt, l3_offset,
- ODPH_IPV4HDR_LEN, &ipv4_hdr);
+ _ODP_IPV4HDR_LEN, &ipv4_hdr);
ipv4_hdr_ptr = &ipv4_hdr;
}
@@ -1968,10 +1968,10 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking,
tos_marking->shifted_dscp;
if (tos_marking->ecn_ce_enabled && odp_packet_has_tcp(odp_pkt)) {
- ecn = old_tos & ODPH_IP_TOS_ECN_MASK;
- if ((ecn == ODPH_IP_ECN_ECT0) || (ecn == ODPH_IP_ECN_ECT1))
- new_tos = (new_tos & ~ODPH_IP_TOS_ECN_MASK) |
- (ODPH_IP_ECN_CE << ODPH_IP_TOS_ECN_SHIFT);
+ ecn = old_tos & _ODP_IP_TOS_ECN_MASK;
+ if ((ecn == _ODP_IP_ECN_ECT0) || (ecn == _ODP_IP_ECN_ECT1))
+ new_tos = (new_tos & ~_ODP_IP_TOS_ECN_MASK) |
+ (_ODP_IP_ECN_CE << _ODP_IP_TOS_ECN_SHIFT);
}
if (new_tos == old_tos)
@@ -1999,13 +1999,13 @@ static void egress_ipv4_tos_marking(tm_tos_marking_t *tos_marking,
ipv4_hdr_ptr->chksum = odp_cpu_to_be_16((~ones_compl_sum) & 0xFFFF);
if (split_hdr)
odp_packet_copy_from_mem(odp_pkt, l3_offset,
- ODPH_IPV4HDR_LEN, &ipv4_hdr);
+ _ODP_IPV4HDR_LEN, &ipv4_hdr);
}
static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking,
odp_packet_t odp_pkt)
{
- odph_ipv6hdr_t ipv6_hdr, *ipv6_hdr_ptr;
+ _odp_ipv6hdr_t ipv6_hdr, *ipv6_hdr_ptr;
odp_bool_t split_hdr;
uint32_t hdr_len, old_ver_tc_flow, new_ver_tc_flow, l3_offset;
uint8_t old_tc, new_tc, ecn;
@@ -2023,13 +2023,13 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking,
split_hdr = hdr_len < 4;
if (split_hdr) {
odp_packet_copy_to_mem(odp_pkt, l3_offset,
- ODPH_IPV6HDR_LEN, &ipv6_hdr);
+ _ODP_IPV6HDR_LEN, &ipv6_hdr);
ipv6_hdr_ptr = &ipv6_hdr;
}
old_ver_tc_flow = odp_be_to_cpu_32(ipv6_hdr_ptr->ver_tc_flow);
- old_tc = (old_ver_tc_flow & ODPH_IPV6HDR_TC_MASK)
- >> ODPH_IPV6HDR_TC_SHIFT;
+ old_tc = (old_ver_tc_flow & _ODP_IPV6HDR_TC_MASK)
+ >> _ODP_IPV6HDR_TC_SHIFT;
new_tc = old_tc;
if (tos_marking->drop_prec_enabled)
@@ -2037,22 +2037,22 @@ static void egress_ipv6_tc_marking(tm_tos_marking_t *tos_marking,
tos_marking->shifted_dscp;
if (tos_marking->ecn_ce_enabled && odp_packet_has_tcp(odp_pkt)) {
- ecn = old_tc & ODPH_IP_TOS_ECN_MASK;
- if ((ecn == ODPH_IP_ECN_ECT0) || (ecn == ODPH_IP_ECN_ECT1))
- new_tc = (new_tc & ~ODPH_IP_TOS_ECN_MASK) |
- (ODPH_IP_ECN_CE << ODPH_IP_TOS_ECN_SHIFT);
+ ecn = old_tc & _ODP_IP_TOS_ECN_MASK;
+ if ((ecn == _ODP_IP_ECN_ECT0) || (ecn == _ODP_IP_ECN_ECT1))
+ new_tc = (new_tc & ~_ODP_IP_TOS_ECN_MASK) |
+ (_ODP_IP_ECN_CE << _ODP_IP_TOS_ECN_SHIFT);
}
if (new_tc == old_tc)
return;
- new_ver_tc_flow = (old_ver_tc_flow & ~ODPH_IPV6HDR_TC_MASK) |
- (new_tc << ODPH_IPV6HDR_TC_SHIFT);
+ new_ver_tc_flow = (old_ver_tc_flow & ~_ODP_IPV6HDR_TC_MASK) |
+ (new_tc << _ODP_IPV6HDR_TC_SHIFT);
ipv6_hdr_ptr->ver_tc_flow = odp_cpu_to_be_32(new_ver_tc_flow);
if (split_hdr)
odp_packet_copy_from_mem(odp_pkt, l3_offset,
- ODPH_IPV6HDR_LEN, &ipv6_hdr);
+ _ODP_IPV6HDR_LEN, &ipv6_hdr);
}
static void tm_egress_marking(tm_system_t *tm_system, odp_packet_t odp_pkt)
@@ -2868,9 +2868,9 @@ int odp_tm_drop_prec_marking(odp_tm_t odp_tm,
if (drop_prec_enabled) {
new_dscp = new_dscp & dscp_mask;
inverted_mask = (uint8_t)~dscp_mask;
- tos_mask = (inverted_mask << ODPH_IP_TOS_DSCP_SHIFT) |
- ODPH_IP_TOS_ECN_MASK;
- shifted_dscp = new_dscp << ODPH_IP_TOS_DSCP_SHIFT;
+ tos_mask = (inverted_mask << _ODP_IP_TOS_DSCP_SHIFT) |
+ _ODP_IP_TOS_ECN_MASK;
+ shifted_dscp = new_dscp << _ODP_IP_TOS_DSCP_SHIFT;
} else {
tos_mask = 0xFF; /* Note that this is an inverted mask */
shifted_dscp = 0;
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 245ff7b..c21c703 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -19,7 +19,7 @@
#include <odp_packet_dpdk.h>
#include <odp_debug_internal.h>
-#include <odp/helper/eth.h>
+#include <protocols/eth.h>
#include <rte_config.h>
#include <rte_mbuf.h>
@@ -590,7 +590,7 @@ static int dpdk_open(odp_pktio_t id ODP_UNUSED,
ODP_ERR("Failed to read interface MTU\n");
return -1;
}
- pkt_dpdk->mtu = mtu + ODPH_ETHHDR_LEN;
+ pkt_dpdk->mtu = mtu + _ODP_ETHHDR_LEN;
/* Some DPDK PMD virtual devices, like PCAP, do not support promisc
* mode change. Use system call for them. */
diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c
index 1febacd..ac16c41 100644
--- a/platform/linux-generic/pktio/loop.c
+++ b/platform/linux-generic/pktio/loop.c
@@ -12,8 +12,8 @@
#include <odp_debug_internal.h>
#include <odp/api/hints.h>
-#include <odp/helper/eth.h>
-#include <odp/helper/ip.h>
+#include <protocols/eth.h>
+#include <protocols/ip.h>
#include <errno.h>
#include <inttypes.h>
diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c
index 08e49f4..d69df6b 100644
--- a/platform/linux-generic/pktio/netmap.c
+++ b/platform/linux-generic/pktio/netmap.c
@@ -12,7 +12,7 @@
#include <odp_packet_netmap.h>
#include <odp_packet_socket.h>
#include <odp_debug_internal.h>
-#include <odp/helper/eth.h>
+#include <protocols/eth.h>
#include <sys/ioctl.h>
#include <poll.h>
@@ -410,7 +410,7 @@ static int netmap_open(odp_pktio_t id ODP_UNUSED, pktio_entry_t *pktio_entry,
ODP_ERR("Unable to read interface MTU\n");
goto error;
}
- mtu += ODPH_ETHHDR_LEN;
+ mtu += _ODP_ETHHDR_LEN;
pkt_nm->mtu = (mtu < buf_size) ? mtu : buf_size;
/* Check if RSS is supported. If not, set 'max_input_queues' to 1. */
@@ -605,7 +605,7 @@ static inline int netmap_pkt_to_odp(pktio_entry_t *pktio_entry,
return -1;
}
- if (odp_unlikely(len < ODPH_ETH_LEN_MIN)) {
+ if (odp_unlikely(len < _ODP_ETH_LEN_MIN)) {
ODP_ERR("RX: Frame truncated: %" PRIu16 "\n", len);
return -1;
}
diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c
index 2fb2a5b..be9049a 100644
--- a/platform/linux-generic/pktio/pcap.c
+++ b/platform/linux-generic/pktio/pcap.c
@@ -40,7 +40,7 @@
#include <odp_packet_internal.h>
#include <odp_packet_io_internal.h>
-#include <odp/helper/eth.h>
+#include <protocols/eth.h>
#include <errno.h>
#include <pcap/pcap.h>
@@ -349,9 +349,9 @@ static uint32_t pcapif_mtu_get(pktio_entry_t *pktio_entry ODP_UNUSED)
static int pcapif_mac_addr_get(pktio_entry_t *pktio_entry ODP_UNUSED,
void *mac_addr)
{
- memcpy(mac_addr, pcap_mac, ODPH_ETHADDR_LEN);
+ memcpy(mac_addr, pcap_mac, _ODP_ETHADDR_LEN);
- return ODPH_ETHADDR_LEN;
+ return _ODP_ETHADDR_LEN;
}
static int pcapif_capability(pktio_entry_t *pktio_entry ODP_UNUSED,
diff --git a/platform/linux-generic/pktio/ring.c b/platform/linux-generic/pktio/ring.c
index 3024f4a..cc84e8a 100644
--- a/platform/linux-generic/pktio/ring.c
+++ b/platform/linux-generic/pktio/ring.c
@@ -75,7 +75,6 @@
#include <string.h>
#include <stdbool.h>
#include <inttypes.h>
-#include "odph_debug.h"
#include <odp_packet_io_ring_internal.h>
#include <odp_internal.h>
@@ -167,9 +166,9 @@ _ring_create(const char *name, unsigned count, unsigned flags)
/* count must be a power of 2 */
if (!RING_VAL_IS_POWER_2(count) || (count > _RING_SZ_MASK)) {
- ODPH_ERR("Requested size is invalid, must be power of 2,"
- "and do not exceed the size limit %u\n",
- _RING_SZ_MASK);
+ ODP_ERR("Requested size is invalid, must be power of 2,"
+ "and do not exceed the size limit %u\n",
+ _RING_SZ_MASK);
__odp_errno = EINVAL;
return NULL;
}
@@ -204,7 +203,7 @@ _ring_create(const char *name, unsigned count, unsigned flags)
TAILQ_INSERT_TAIL(&odp_ring_list, r, next);
} else {
__odp_errno = ENOMEM;
- ODPH_ERR("Cannot reserve memory\n");
+ ODP_ERR("Cannot reserve memory\n");
}
odp_rwlock_write_unlock(&qlock);
diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c
index 8f86dda..5d85ef5 100644
--- a/platform/linux-generic/pktio/socket.c
+++ b/platform/linux-generic/pktio/socket.c
@@ -43,8 +43,8 @@
#include <odp_classification_internal.h>
#include <odp/api/hints.h>
-#include <odp/helper/eth.h>
-#include <odp/helper/ip.h>
+#include <protocols/eth.h>
+#include <protocols/ip.h>
static int sock_stats_reset(pktio_entry_t *pktio_entry);
@@ -84,8 +84,8 @@ int sendmmsg(int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags)
/** Eth buffer start offset from u32-aligned address to make sure the following
* header (e.g. IP) starts at a 32-bit aligned address.
*/
-#define ETHBUF_OFFSET (ODP_ALIGN_ROUNDUP(ODPH_ETHHDR_LEN, sizeof(uint32_t)) \
- - ODPH_ETHHDR_LEN)
+#define ETHBUF_OFFSET (ODP_ALIGN_ROUNDUP(_ODP_ETHHDR_LEN, sizeof(uint32_t)) \
+ - _ODP_ETHHDR_LEN)
/** Round up buffer address to get a properly aliged eth buffer, i.e. aligned
* so that the next header always starts at a 32bit aligned address.
diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c
index 420cd26..11bb7d6 100644
--- a/platform/linux-generic/pktio/socket_mmap.c
+++ b/platform/linux-generic/pktio/socket_mmap.c
@@ -32,8 +32,8 @@
#include <odp_classification_internal.h>
#include <odp/api/hints.h>
-#include <odp/helper/eth.h>
-#include <odp/helper/ip.h>
+#include <protocols/eth.h>
+#include <protocols/ip.h>
static int set_pkt_sock_fanout_mmap(pkt_sock_mmap_t *const pkt_sock,
int sock_group_idx)
@@ -115,8 +115,8 @@ static uint8_t *pkt_mmap_vlan_insert(uint8_t *l2_hdr_ptr,
uint16_t vlan_tci,
int *pkt_len_ptr)
{
- odph_ethhdr_t *eth_hdr;
- odph_vlanhdr_t *vlan_hdr;
+ _odp_ethhdr_t *eth_hdr;
+ _odp_vlanhdr_t *vlan_hdr;
uint8_t *new_l2_ptr;
int orig_pkt_len;
@@ -124,17 +124,17 @@ static uint8_t *pkt_mmap_vlan_insert(uint8_t *l2_hdr_ptr,
* shifting the Ethernet header down to open up space for the IEEE
* 802.1Q vlan header.
*/
- if (ODPH_VLANHDR_LEN < mac_offset) {
+ if (_ODP_VLANHDR_LEN < mac_offset) {
orig_pkt_len = *pkt_len_ptr;
- new_l2_ptr = l2_hdr_ptr - ODPH_VLANHDR_LEN;
- memmove(new_l2_ptr, l2_hdr_ptr, ODPH_ETHHDR_LEN);
+ new_l2_ptr = l2_hdr_ptr - _ODP_VLANHDR_LEN;
+ memmove(new_l2_ptr, l2_hdr_ptr, _ODP_ETHHDR_LEN);
- eth_hdr = (odph_ethhdr_t *)new_l2_ptr;
- vlan_hdr = (odph_vlanhdr_t *)(new_l2_ptr + ODPH_ETHHDR_LEN);
+ eth_hdr = (_odp_ethhdr_t *)new_l2_ptr;
+ vlan_hdr = (_odp_vlanhdr_t *)(new_l2_ptr + _ODP_ETHHDR_LEN);
vlan_hdr->tci = odp_cpu_to_be_16(vlan_tci);
vlan_hdr->type = eth_hdr->type;
- eth_hdr->type = odp_cpu_to_be_16(ODPH_ETHTYPE_VLAN);
- *pkt_len_ptr = orig_pkt_len + ODPH_VLANHDR_LEN;
+ eth_hdr->type = odp_cpu_to_be_16(_ODP_ETHTYPE_VLAN);
+ *pkt_len_ptr = orig_pkt_len + _ODP_VLANHDR_LEN;
return new_l2_ptr;
}
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/Makefile.am | 7 +-
.../include/odp_classification_inlines.h | 50 +++---
.../include/odp_name_table_internal.h | 2 +-
platform/linux-generic/include/protocols/eth.h | 113 ++++++++++++++
platform/linux-generic/include/protocols/ip.h | 168 +++++++++++++++++++++
.../linux-generic/include/protocols}/ipsec.h | 40 ++---
.../linux-generic/include/protocols}/tcp.h | 12 +-
platform/linux-generic/include/protocols/udp.h | 49 ++++++
platform/linux-generic/odp_classification.c | 23 +--
platform/linux-generic/odp_packet.c | 106 ++++++-------
platform/linux-generic/odp_traffic_mngr.c | 64 ++++----
platform/linux-generic/pktio/dpdk.c | 4 +-
platform/linux-generic/pktio/loop.c | 4 +-
platform/linux-generic/pktio/netmap.c | 6 +-
platform/linux-generic/pktio/pcap.c | 6 +-
platform/linux-generic/pktio/ring.c | 9 +-
platform/linux-generic/pktio/socket.c | 8 +-
platform/linux-generic/pktio/socket_mmap.c | 22 +--
18 files changed, 513 insertions(+), 180 deletions(-)
create mode 100644 platform/linux-generic/include/protocols/eth.h
create mode 100644 platform/linux-generic/include/protocols/ip.h
copy {helper/include/odp/helper => platform/linux-generic/include/protocols}/ipsec.h (53%)
copy {helper/include/odp/helper => platform/linux-generic/include/protocols}/tcp.h (88%)
create mode 100644 platform/linux-generic/include/protocols/udp.h
hooks/post-receive
--
7 years, 10 months
- 1
- 0
[COMMIT] branch master updated. v1.10.1.0-40-ga97db1b
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via a97db1b8b46b9656f964ccf09ce28941ae062507 (commit)
via d1d06aa241b97e2f1919ee990168a21319a66143 (commit)
via c2784fbafbf8a29b6daa48429133e25b777536cf (commit)
via 9f0f2b86309aa8021ec937e7c0ee1d6f48b0d769 (commit)
from c03685af2895b20a5e8a046ea910254a96ab15c4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a97db1b8b46b9656f964ccf09ce28941ae062507
Author: Petri Savolainen <petri.savolainen(a)nokia.com>
Date: Mon Jul 4 18:42:26 2016 +0300
example: hello: add hello world example application
This is a minimal application which demonstrates the startup and
shutdown steps of an ODP application. It can be also used to
debug API related build problems, etc. It does not use helpers
to minimize dependency to anything else than the ODP API
header file.
Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/Makefile.am b/example/Makefile.am
index 7f82c4d..37542af 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -1 +1 @@
-SUBDIRS = classifier generator ipsec packet time timer traffic_mgmt l2fwd_simple switch
+SUBDIRS = classifier generator ipsec packet time timer traffic_mgmt l2fwd_simple switch hello
diff --git a/example/hello/.gitignore b/example/hello/.gitignore
new file mode 100644
index 0000000..7c11c4c
--- /dev/null
+++ b/example/hello/.gitignore
@@ -0,0 +1,3 @@
+odp_hello
+*.log
+*.trs
diff --git a/example/hello/Makefile.am b/example/hello/Makefile.am
new file mode 100644
index 0000000..2e4e0ce
--- /dev/null
+++ b/example/hello/Makefile.am
@@ -0,0 +1,11 @@
+include $(top_srcdir)/example/Makefile.inc
+
+bin_PROGRAMS = odp_hello$(EXEEXT)
+odp_hello_LDFLAGS = $(AM_LDFLAGS) -static
+odp_hello_CFLAGS = $(AM_CFLAGS) -I${top_srcdir}/example
+
+dist_odp_hello_SOURCES = odp_hello.c
+
+if test_example
+TESTS = odp_hello
+endif
diff --git a/example/hello/odp_hello.c b/example/hello/odp_hello.c
new file mode 100644
index 0000000..6d114ee
--- /dev/null
+++ b/example/hello/odp_hello.c
@@ -0,0 +1,107 @@
+/* Copyright (c) 2016, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/* This is a minimal application which demonstrates the startup and shutdown
+ * steps of an ODP application. It can be also used to debug API related
+ * build problems, etc. It does not use helpers to minimize dependency to
+ * anything else than the ODP API header file.
+ */
+
+/* Linux CPU affinity */
+#define _GNU_SOURCE
+#include <sched.h>
+
+/* Linux PID */
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#include <odp_api.h>
+
+typedef struct {
+ int cpu;
+ int num;
+} options_t;
+
+static int parse_args(int argc, char *argv[], options_t *opt)
+{
+ static const char * const args[] = {"-c", "-n"};
+ int i, tmp;
+
+ for (i = 1; i < argc; i++) {
+ if ((strcmp(argv[i], args[0]) == 0) &&
+ (sscanf(argv[i + 1], "%i", &tmp) == 1)) {
+ opt->cpu = tmp;
+ i++;
+ } else if ((strcmp(argv[i], args[1]) == 0) &&
+ (sscanf(argv[i + 1], "%i", &tmp) == 1)) {
+ opt->num = tmp;
+ i++;
+ } else {
+ printf("\nUsage:\n"
+ " %s CPU number\n"
+ " %s Number of iterations\n\n",
+ args[0], args[1]);
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+int main(int argc, char *argv[])
+{
+ odp_instance_t inst;
+ options_t opt;
+ pid_t pid;
+ cpu_set_t cpu_set;
+ int i;
+
+ memset(&opt, 0, sizeof(opt));
+ opt.cpu = 0;
+ opt.num = 1;
+
+ if (parse_args(argc, argv, &opt))
+ return -1;
+
+ pid = getpid();
+ CPU_ZERO(&cpu_set);
+ CPU_SET(opt.cpu, &cpu_set);
+
+ if (sched_setaffinity(pid, sizeof(cpu_set_t), &cpu_set)) {
+ printf("Set CPU affinity failed.\n");
+ return -1;
+ }
+
+ if (odp_init_global(&inst, NULL, NULL)) {
+ printf("Global init failed.\n");
+ return -1;
+ }
+
+ if (odp_init_local(inst, ODP_THREAD_CONTROL)) {
+ printf("Local init failed.\n");
+ return -1;
+ }
+
+ for (i = 0; i < opt.num; i++) {
+ printf("Hello world from CPU %i!\n", odp_cpu_id());
+ odp_time_wait_ns(ODP_TIME_SEC_IN_NS);
+ }
+
+ if (odp_term_local()) {
+ printf("Local term failed.\n");
+ return -1;
+ }
+
+ if (odp_term_global(inst)) {
+ printf("Global term failed.\n");
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/example/m4/configure.m4 b/example/m4/configure.m4
index 9731d81..bbda38f 100644
--- a/example/m4/configure.m4
+++ b/example/m4/configure.m4
@@ -19,4 +19,5 @@ AC_CONFIG_FILES([example/classifier/Makefile
example/timer/Makefile
example/traffic_mgmt/Makefile
example/l2fwd_simple/Makefile
- example/switch/Makefile])
+ example/switch/Makefile
+ example/hello/Makefile])
commit d1d06aa241b97e2f1919ee990168a21319a66143
Author: Petri Savolainen <petri.savolainen(a)nokia.com>
Date: Mon Jul 4 18:42:25 2016 +0300
linux-gen: std_types: remove extra c headers
Removed C header includes which are not needed for API
definitions. ODP API depends on uint64_t, etc types in
stdint.h, but not other C headers. As an exception,
stdbool.h remains since 'true' and 'false' definitions
may be used with odp_bool_t. It could be also removed
later since true/false are not part of the API (where as
uint64_t, etc types).
Application needs to include other C library headers
directly. ODP API does not specify which headers are included
by odp_api.h.
Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c
index 20e64ec..1bd2414 100644
--- a/example/classifier/odp_classifier.c
+++ b/example/classifier/odp_classifier.c
@@ -8,6 +8,7 @@
#include <string.h>
#include <getopt.h>
#include <unistd.h>
+#include <inttypes.h>
#include <example_debug.h>
#include <odp_api.h>
diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c
index 8393244..3fea112 100644
--- a/example/generator/odp_generator.c
+++ b/example/generator/odp_generator.c
@@ -13,6 +13,7 @@
#include <stdlib.h>
#include <getopt.h>
#include <unistd.h>
+#include <inttypes.h>
#include <sys/time.h>
#include <example_debug.h>
diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c
index 451bb2d..d8ca791 100644
--- a/example/ipsec/odp_ipsec.c
+++ b/example/ipsec/odp_ipsec.c
@@ -18,6 +18,7 @@
#include <stdlib.h>
#include <getopt.h>
#include <unistd.h>
+#include <inttypes.h>
#include <example_debug.h>
diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c
index 564c63a..6e14abb 100644
--- a/example/packet/odp_pktio.c
+++ b/example/packet/odp_pktio.c
@@ -8,6 +8,7 @@
#include <string.h>
#include <getopt.h>
#include <unistd.h>
+#include <inttypes.h>
#include <example_debug.h>
diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c
index 09835c0..5ce71a9 100644
--- a/example/switch/odp_switch.c
+++ b/example/switch/odp_switch.c
@@ -7,6 +7,8 @@
#include <stdio.h>
#include <getopt.h>
#include <unistd.h>
+#include <stdlib.h>
+#include <inttypes.h>
#include <odp_api.h>
#include <odp/helper/linux.h>
diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c
index 372d96b..380ec52 100644
--- a/example/time/time_global_test.c
+++ b/example/time/time_global_test.c
@@ -7,6 +7,7 @@
#include <odp_api.h>
#include <example_debug.h>
#include <odp/helper/linux.h>
+#include <inttypes.h>
#define MAX_WORKERS 32
#define ITERATION_NUM 2048
diff --git a/example/timer/odp_timer_simple.c b/example/timer/odp_timer_simple.c
index f33add9..98c08ce 100644
--- a/example/timer/odp_timer_simple.c
+++ b/example/timer/odp_timer_simple.c
@@ -12,6 +12,7 @@
#include <string.h>
#include <stdlib.h>
+#include <inttypes.h>
#include <example_debug.h>
/* ODP main header */
diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c
index cb58dfe..035ab2e 100644
--- a/example/timer/odp_timer_test.c
+++ b/example/timer/odp_timer_test.c
@@ -6,6 +6,7 @@
#include <string.h>
#include <stdlib.h>
+#include <inttypes.h>
#include <example_debug.h>
diff --git a/helper/chksum.c b/helper/chksum.c
index 859d1ec..8f18881 100644
--- a/helper/chksum.c
+++ b/helper/chksum.c
@@ -9,6 +9,8 @@
#include <odp/helper/udp.h>
#include <odp/helper/tcp.h>
#include <odp/helper/chksum.h>
+#include <stddef.h>
+#include <stdbool.h>
/* The following union type is used to "view" an ordered set of bytes (either
* 2 or 4) as 1 or 2 16-bit quantities - using host endian order. */
diff --git a/helper/linux.c b/helper/linux.c
index a1dbe52..bb4b22c 100644
--- a/helper/linux.c
+++ b/helper/linux.c
@@ -17,6 +17,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
+#include <stdbool.h>
#include <odp_api.h>
#include <odp/helper/linux.h>
diff --git a/platform/linux-generic/include/odp/api/std_types.h b/platform/linux-generic/include/odp/api/std_types.h
index d4eeb5d..b61f33f 100644
--- a/platform/linux-generic/include/odp/api/std_types.h
+++ b/platform/linux-generic/include/odp/api/std_types.h
@@ -17,13 +17,11 @@
extern "C" {
#endif
-#include <stdlib.h>
+/* uint64_t, uint32_t, etc */
#include <stdint.h>
-#include <stddef.h>
+
+/* true and false for odp_bool_t */
#include <stdbool.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <limits.h>
/** @addtogroup odp_system ODP SYSTEM
* @{
diff --git a/platform/linux-generic/include/odp_atomic_internal.h b/platform/linux-generic/include/odp_atomic_internal.h
index 67e8f82..dca2175 100644
--- a/platform/linux-generic/include/odp_atomic_internal.h
+++ b/platform/linux-generic/include/odp_atomic_internal.h
@@ -20,6 +20,7 @@
#include <odp/api/align.h>
#include <odp/api/hints.h>
#include <odp/api/atomic.h>
+#include <stdbool.h>
#ifdef __cplusplus
extern "C" {
diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h
index a427a80..f21364c 100644
--- a/platform/linux-generic/include/odp_buffer_internal.h
+++ b/platform/linux-generic/include/odp_buffer_internal.h
@@ -31,6 +31,7 @@ extern "C" {
#include <odp/api/event.h>
#include <odp_forward_typedefs_internal.h>
#include <odp_schedule_if.h>
+#include <stddef.h>
#define ODP_BITSIZE(x) \
((x) <= 2 ? 1 : \
diff --git a/platform/linux-generic/include/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h
index 09a571b..ccff69a 100644
--- a/platform/linux-generic/include/odp_packet_socket.h
+++ b/platform/linux-generic/include/odp_packet_socket.h
@@ -12,6 +12,7 @@
#include <linux/if_ether.h>
#include <sys/socket.h>
#include <string.h>
+#include <stddef.h>
#include <odp/api/align.h>
#include <odp/api/buffer.h>
diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c
index 69f913d..e7e4d58 100644
--- a/platform/linux-generic/odp_buffer.c
+++ b/platform/linux-generic/odp_buffer.c
@@ -12,7 +12,7 @@
#include <string.h>
#include <stdio.h>
-
+#include <inttypes.h>
odp_buffer_t odp_buffer_from_event(odp_event_t ev)
{
diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c
index 0602a62..027a7ce 100644
--- a/platform/linux-generic/odp_classification.c
+++ b/platform/linux-generic/odp_classification.c
@@ -21,6 +21,7 @@
#include <odp/helper/eth.h>
#include <string.h>
#include <errno.h>
+#include <stdbool.h>
#include <odp/api/spinlock.h>
#define LOCK(a) odp_spinlock_lock(a)
diff --git a/platform/linux-generic/odp_hash.c b/platform/linux-generic/odp_hash.c
index 0e09282..55876c3 100644
--- a/platform/linux-generic/odp_hash.c
+++ b/platform/linux-generic/odp_hash.c
@@ -40,6 +40,8 @@
#include <odp/api/hash.h>
#include <odp/api/std_types.h>
+#include <stddef.h>
+
static const uint32_t crc32c_tables[8][256] = {{
0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4, 0xC79A971F, 0x35F1141C,
0x26A1E7E8, 0xD4CA64EB, 0x8AD958CF, 0x78B2DBCC, 0x6BE22838, 0x9989AB3B,
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 9f81073..0a868e9 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -18,6 +18,7 @@
#include <errno.h>
#include <string.h>
#include <stdio.h>
+#include <inttypes.h>
/*
*
diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
index 5b202e7..0b9939b 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -24,6 +24,7 @@
#include <odp/api/time.h>
#include <string.h>
+#include <inttypes.h>
#include <sys/ioctl.h>
#include <ifaddrs.h>
#include <errno.h>
diff --git a/platform/linux-generic/odp_pkt_queue.c b/platform/linux-generic/odp_pkt_queue.c
index cbe1e74..7734ee9 100644
--- a/platform/linux-generic/odp_pkt_queue.c
+++ b/platform/linux-generic/odp_pkt_queue.c
@@ -10,6 +10,7 @@
#include <string.h>
#include <malloc.h>
#include <stdio.h>
+#include <inttypes.h>
#include <odp_api.h>
#include <odp_pkt_queue_internal.h>
#include <odp_debug_internal.h>
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
index 5ed7080..ec6d86a 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -22,7 +22,7 @@
#include <string.h>
#include <stdlib.h>
-
+#include <inttypes.h>
#if ODP_CONFIG_POOLS > ODP_BUFFER_MAX_POOLS
#error ODP_CONFIG_POOLS > ODP_BUFFER_MAX_POOLS
diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c
index 1166a72..bec1e51 100644
--- a/platform/linux-generic/odp_queue.c
+++ b/platform/linux-generic/odp_queue.c
@@ -42,7 +42,7 @@
#endif
#include <string.h>
-
+#include <inttypes.h>
typedef struct queue_table_t {
queue_entry_t queue[ODP_CONFIG_QUEUES];
diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c
index f432cf9..550af27 100644
--- a/platform/linux-generic/odp_shared_memory.c
+++ b/platform/linux-generic/odp_shared_memory.c
@@ -26,6 +26,7 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
+#include <inttypes.h>
ODP_STATIC_ASSERT(ODP_CONFIG_SHM_BLOCKS >= ODP_CONFIG_POOLS,
"ODP_CONFIG_SHM_BLOCKS < ODP_CONFIG_POOLS");
diff --git a/platform/linux-generic/odp_sorted_list.c b/platform/linux-generic/odp_sorted_list.c
index 554494b..8a1dc3a 100644
--- a/platform/linux-generic/odp_sorted_list.c
+++ b/platform/linux-generic/odp_sorted_list.c
@@ -10,6 +10,7 @@
#include <string.h>
#include <malloc.h>
#include <stdio.h>
+#include <inttypes.h>
#include <odp_debug_internal.h>
#include <odp_sorted_list_internal.h>
diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c
index fca35ce..bbe5358 100644
--- a/platform/linux-generic/odp_system_info.c
+++ b/platform/linux-generic/odp_system_info.c
@@ -15,6 +15,7 @@
#include <sched.h>
#include <string.h>
#include <stdio.h>
+#include <inttypes.h>
/* sysconf */
#include <unistd.h>
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index 996edf0..becea9d 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -28,6 +28,7 @@
#include <pthread.h>
#include <unistd.h>
#include <sys/syscall.h>
+#include <inttypes.h>
#include <odp/api/align.h>
#include <odp_align_internal.h>
diff --git a/platform/linux-generic/odp_timer_wheel.c b/platform/linux-generic/odp_timer_wheel.c
index 865dd7e..f2c802a 100644
--- a/platform/linux-generic/odp_timer_wheel.c
+++ b/platform/linux-generic/odp_timer_wheel.c
@@ -10,6 +10,7 @@
#include <string.h>
#include <malloc.h>
#include <stdio.h>
+#include <inttypes.h>
#include <odp_timer_wheel_internal.h>
#include <odp_traffic_mngr_internal.h>
#include <odp_debug_internal.h>
diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c
index 681df00..9cfa1fc 100644
--- a/platform/linux-generic/odp_traffic_mngr.c
+++ b/platform/linux-generic/odp_traffic_mngr.c
@@ -11,6 +11,8 @@
#include <string.h>
#include <malloc.h>
#include <stdio.h>
+#include <stdbool.h>
+#include <inttypes.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sched.h>
diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c
index dce33e5..1febacd 100644
--- a/platform/linux-generic/pktio/loop.c
+++ b/platform/linux-generic/pktio/loop.c
@@ -16,6 +16,8 @@
#include <odp/helper/ip.h>
#include <errno.h>
+#include <inttypes.h>
+#include <limits.h>
/* MAC address for the "loop" interface */
static const char pktio_loop_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x01};
diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c
index 847250b..08e49f4 100644
--- a/platform/linux-generic/pktio/netmap.c
+++ b/platform/linux-generic/pktio/netmap.c
@@ -22,6 +22,8 @@
#include <odp_classification_inlines.h>
#include <odp_classification_internal.h>
+#include <inttypes.h>
+
/* Disable netmap debug prints */
#ifndef ND
#define ND(_fmt, ...) do {} while (0)
diff --git a/platform/linux-generic/pktio/ring.c b/platform/linux-generic/pktio/ring.c
index ec27f2c..3024f4a 100644
--- a/platform/linux-generic/pktio/ring.c
+++ b/platform/linux-generic/pktio/ring.c
@@ -73,6 +73,8 @@
#include <fcntl.h>
#include <stdio.h>
#include <string.h>
+#include <stdbool.h>
+#include <inttypes.h>
#include "odph_debug.h"
#include <odp_packet_io_ring_internal.h>
#include <odp_internal.h>
diff --git a/platform/linux-generic/pktio/sysfs.c b/platform/linux-generic/pktio/sysfs.c
index 7aadc14..be0822d 100644
--- a/platform/linux-generic/pktio/sysfs.c
+++ b/platform/linux-generic/pktio/sysfs.c
@@ -8,6 +8,7 @@
#include <odp_packet_io_internal.h>
#include <errno.h>
#include <string.h>
+#include <inttypes.h>
static int sysfs_get_val(const char *fname, uint64_t *val)
{
diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c
index 8ba7bed..a9a8886 100644
--- a/platform/linux-generic/pktio/tap.c
+++ b/platform/linux-generic/pktio/tap.c
@@ -33,6 +33,7 @@
#include <fcntl.h>
#include <unistd.h>
#include <stdio.h>
+#include <stdbool.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/types.h>
diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c
index 2ceee74..164f7f5 100644
--- a/test/performance/odp_l2fwd.c
+++ b/test/performance/odp_l2fwd.c
@@ -19,6 +19,7 @@
#include <getopt.h>
#include <unistd.h>
#include <errno.h>
+#include <inttypes.h>
#include <test_debug.h>
diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c
index 98ec681..18a1aa2 100644
--- a/test/performance/odp_pktio_perf.c
+++ b/test/performance/odp_pktio_perf.c
@@ -31,6 +31,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <inttypes.h>
#include <test_debug.h>
#define PKT_BUF_NUM 8192
diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c
index c575b70..bd37f9b 100644
--- a/test/performance/odp_scheduling.c
+++ b/test/performance/odp_scheduling.c
@@ -12,6 +12,7 @@
#include <string.h>
#include <stdlib.h>
+#include <inttypes.h>
#include <test_debug.h>
diff --git a/test/platform/linux-generic/pktio_ipc/ipc_common.h b/test/platform/linux-generic/pktio_ipc/ipc_common.h
index 7bc483f..a6b7c58 100644
--- a/test/platform/linux-generic/pktio_ipc/ipc_common.h
+++ b/test/platform/linux-generic/pktio_ipc/ipc_common.h
@@ -6,6 +6,7 @@
#define _POSIX_C_SOURCE 200809L
#include <stdlib.h>
+#include <inttypes.h>
#include <string.h>
#include <getopt.h>
#include <unistd.h>
diff --git a/test/validation/classification/odp_classification_testsuites.h b/test/validation/classification/odp_classification_testsuites.h
index 023a267..aea3de1 100644
--- a/test/validation/classification/odp_classification_testsuites.h
+++ b/test/validation/classification/odp_classification_testsuites.h
@@ -9,6 +9,7 @@
#include <odp_api.h>
#include <odp_cunit_common.h>
+#include <stdbool.h>
extern odp_testinfo_t classification_suite[];
extern odp_testinfo_t classification_suite_basic[];
diff --git a/test/validation/common/mask_common.c b/test/validation/common/mask_common.c
index 5001364..b31534c 100644
--- a/test/validation/common/mask_common.c
+++ b/test/validation/common/mask_common.c
@@ -9,6 +9,8 @@
#include "odp_cunit_common.h"
#include "mask_common.h"
+#include <stdlib.h>
+
/*
* The following strings are used to build masks with odp_*mask_from_str().
* Both 0x prefixed and non prefixed hex values are supported.
diff --git a/test/validation/common/odp_cunit_common.h b/test/validation/common/odp_cunit_common.h
index 52fe203..486a5ec 100644
--- a/test/validation/common/odp_cunit_common.h
+++ b/test/validation/common/odp_cunit_common.h
@@ -14,6 +14,7 @@
#define ODP_CUNICT_COMMON_H
#include <stdint.h>
+#include <inttypes.h>
#include "CUnit/Basic.h"
#include "CUnit/TestDB.h"
#include <odp_api.h>
commit c2784fbafbf8a29b6daa48429133e25b777536cf
Author: Petri Savolainen <petri.savolainen(a)nokia.com>
Date: Mon Jul 4 18:42:24 2016 +0300
linux-gen: byteorder: remove dependency to linux headers
Platform specific API files included endian.h and
asm/byteorder.h. These are Linux headers and should not be
visible to application through odp_api.h.
Used __ORDER_LITTLE_ENDIAN__, etc instead which are supported
by both gcc and clang.
Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp/api/plat/byteorder_types.h b/platform/linux-generic/include/odp/api/plat/byteorder_types.h
index 0a8e409..679d4cf 100644
--- a/platform/linux-generic/include/odp/api/plat/byteorder_types.h
+++ b/platform/linux-generic/include/odp/api/plat/byteorder_types.h
@@ -18,15 +18,15 @@
extern "C" {
#endif
-#ifndef __BYTE_ORDER
+#ifndef __BYTE_ORDER__
#error __BYTE_ORDER not defined!
#endif
-#ifndef __BIG_ENDIAN
+#ifndef __ORDER_BIG_ENDIAN__
#error __BIG_ENDIAN not defined!
#endif
-#ifndef __LITTLE_ENDIAN
+#ifndef __ORDER_LITTLE_ENDIAN__
#error __LITTLE_ENDIAN not defined!
#endif
@@ -48,23 +48,16 @@ extern "C" {
/** @addtogroup odp_compiler_optim
* @{
*/
-
-#define ODP_BIG_ENDIAN __BIG_ENDIAN
-
-#define ODP_LITTLE_ENDIAN __LITTLE_ENDIAN
-
-#ifdef __BIG_ENDIAN_BITFIELD
-#define ODP_BIG_ENDIAN_BITFIELD
-#endif
-
-#ifdef __LITTLE_ENDIAN_BITFIELD
-#define ODP_LITTLE_ENDIAN_BITFIELD
-#endif
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define ODP_BYTE_ORDER ODP_LITTLE_ENDIAN
-#elif __BYTE_ORDER == __BIG_ENDIAN
-#define ODP_BYTE_ORDER ODP_BIG_ENDIAN
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+ #define ODP_LITTLE_ENDIAN 1
+ #define ODP_BIG_ENDIAN 0
+ #define ODP_BYTE_ORDER ODP_LITTLE_ENDIAN
+ #define ODP_LITTLE_ENDIAN_BITFIELD
+#else
+ #define ODP_LITTLE_ENDIAN 0
+ #define ODP_BIG_ENDIAN 1
+ #define ODP_BYTE_ORDER ODP_BIG_ENDIAN
+ #define ODP_BIG_ENDIAN_BITFIELD
#endif
typedef uint16_t __odp_bitwise odp_u16le_t;
diff --git a/platform/linux-generic/include/odp/api/std_types.h b/platform/linux-generic/include/odp/api/std_types.h
index 5737e43..d4eeb5d 100644
--- a/platform/linux-generic/include/odp/api/std_types.h
+++ b/platform/linux-generic/include/odp/api/std_types.h
@@ -17,8 +17,6 @@
extern "C" {
#endif
-#include <endian.h>
-#include <asm/byteorder.h>
#include <stdlib.h>
#include <stdint.h>
#include <stddef.h>
commit 9f0f2b86309aa8021ec937e7c0ee1d6f48b0d769
Author: Petri Savolainen <petri.savolainen(a)nokia.com>
Date: Mon Jul 4 18:42:23 2016 +0300
linux-gen: cpumask: remove dependency to sched.h
Platform specific API files included sched.h for accessing
cpu_set_t. This is problematic since application may need to
include it also and possibly with GNU extension (with #define
_GNU_SOURCE). Application should be able to include odp_api.h
in any order relative to other headers, and with or without
any (e.g. GNU) extensions.
The odp_cpumask_t is defined with equal (or larger) size to
Linux cpu_set_t and this is verified with build time asserts.
Linux CPU_SET macros are used to access the mask as before.
Signed-off-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/include/odp/api/cpumask.h b/platform/linux-generic/include/odp/api/cpumask.h
index 15bf25e..325ea52 100644
--- a/platform/linux-generic/include/odp/api/cpumask.h
+++ b/platform/linux-generic/include/odp/api/cpumask.h
@@ -17,10 +17,6 @@
extern "C" {
#endif
-#include <string.h>
-#include <sched.h>
-
-#include <odp/api/std_types.h>
#include <odp/api/plat/cpumask_types.h>
#include <odp/api/spec/cpumask.h>
diff --git a/platform/linux-generic/include/odp/api/plat/cpumask_types.h b/platform/linux-generic/include/odp/api/plat/cpumask_types.h
index c59f407..c2727a4 100644
--- a/platform/linux-generic/include/odp/api/plat/cpumask_types.h
+++ b/platform/linux-generic/include/odp/api/plat/cpumask_types.h
@@ -23,6 +23,7 @@ extern "C" {
*/
#include <odp/api/std_types.h>
+#include <odp/api/align.h>
#define ODP_CPUMASK_SIZE 1024
@@ -34,8 +35,13 @@ extern "C" {
* Don't access directly, use access functions.
*/
typedef struct odp_cpumask_t {
- cpu_set_t set; /**< @private Mask*/
-} odp_cpumask_t;
+ /** @private CPU mask storage
+ *
+ * This is private to the implementation.
+ * Don't access directly, use access functions.
+ */
+ uint8_t _u8[ODP_CPUMASK_SIZE / 8];
+} odp_cpumask_t ODP_ALIGNED(8);
/**
* @}
diff --git a/platform/linux-generic/include/odp/api/std_clib.h b/platform/linux-generic/include/odp/api/std_clib.h
index 1578d09..40c0ea8 100644
--- a/platform/linux-generic/include/odp/api/std_clib.h
+++ b/platform/linux-generic/include/odp/api/std_clib.h
@@ -12,6 +12,7 @@ extern "C" {
#endif
#include <odp/api/spec/std_types.h>
+#include <string.h>
static inline void *odp_memcpy(void *dst, const void *src, size_t num)
{
diff --git a/platform/linux-generic/odp_cpumask.c b/platform/linux-generic/odp_cpumask.c
index 3d35ade..6bf2632 100644
--- a/platform/linux-generic/odp_cpumask.c
+++ b/platform/linux-generic/odp_cpumask.c
@@ -20,9 +20,13 @@
#include <errno.h>
#include <sys/types.h>
-/** @internal Compile time assert */
-ODP_STATIC_ASSERT(CPU_SETSIZE >= ODP_CPUMASK_SIZE,
- "ODP_CPUMASK_SIZE__SIZE_ERROR");
+/* Check that mask can hold all system CPUs*/
+ODP_STATIC_ASSERT(ODP_CPUMASK_SIZE >= CPU_SETSIZE,
+ "ODP_CPUMASK_SIZE_TOO_SMALL");
+
+/* Check that mask type is large enough */
+ODP_STATIC_ASSERT(sizeof(odp_cpumask_t) >= sizeof(cpu_set_t),
+ "ODP_CPUMASK_T_TOO_SMALL");
void odp_cpumask_from_str(odp_cpumask_t *mask, const char *str_in)
{
@@ -66,7 +70,7 @@ void odp_cpumask_from_str(odp_cpumask_t *mask, const char *str_in)
}
/* Copy the computed mask */
- memcpy(&mask->set, &cpuset, sizeof(cpuset));
+ memcpy(mask, &cpuset, sizeof(cpuset));
}
int32_t odp_cpumask_to_str(const odp_cpumask_t *mask, char *str, int32_t len)
@@ -106,7 +110,7 @@ int32_t odp_cpumask_to_str(const odp_cpumask_t *mask, char *str, int32_t len)
value = 0;
do {
/* Set bit to go into the current nibble */
- if (CPU_ISSET(cpu, &mask->set))
+ if (CPU_ISSET(cpu, (const cpu_set_t *)mask))
value |= 1 << (cpu % 4);
/* If we are on a nibble boundary flush value to string */
@@ -126,12 +130,12 @@ int32_t odp_cpumask_to_str(const odp_cpumask_t *mask, char *str, int32_t len)
void odp_cpumask_zero(odp_cpumask_t *mask)
{
- CPU_ZERO(&mask->set);
+ CPU_ZERO((cpu_set_t *)mask);
}
void odp_cpumask_set(odp_cpumask_t *mask, int cpu)
{
- CPU_SET(cpu, &mask->set);
+ CPU_SET(cpu, (cpu_set_t *)mask);
}
void odp_cpumask_setall(odp_cpumask_t *mask)
@@ -139,51 +143,54 @@ void odp_cpumask_setall(odp_cpumask_t *mask)
int cpu;
for (cpu = 0; cpu < CPU_SETSIZE; cpu++)
- CPU_SET(cpu, &mask->set);
+ CPU_SET(cpu, (cpu_set_t *)mask);
}
void odp_cpumask_clr(odp_cpumask_t *mask, int cpu)
{
- CPU_CLR(cpu, &mask->set);
+ CPU_CLR(cpu, (cpu_set_t *)mask);
}
int odp_cpumask_isset(const odp_cpumask_t *mask, int cpu)
{
- return CPU_ISSET(cpu, &mask->set);
+ return CPU_ISSET(cpu, (const cpu_set_t *)mask);
}
int odp_cpumask_count(const odp_cpumask_t *mask)
{
- return CPU_COUNT(&mask->set);
+ return CPU_COUNT((const cpu_set_t *)mask);
}
void odp_cpumask_and(odp_cpumask_t *dest, const odp_cpumask_t *src1,
const odp_cpumask_t *src2)
{
- CPU_AND(&dest->set, &src1->set, &src2->set);
+ CPU_AND((cpu_set_t *)dest, (const cpu_set_t *)src1,
+ (const cpu_set_t *)src2);
}
void odp_cpumask_or(odp_cpumask_t *dest, const odp_cpumask_t *src1,
const odp_cpumask_t *src2)
{
- CPU_OR(&dest->set, &src1->set, &src2->set);
+ CPU_OR((cpu_set_t *)dest, (const cpu_set_t *)src1,
+ (const cpu_set_t *)src2);
}
void odp_cpumask_xor(odp_cpumask_t *dest, const odp_cpumask_t *src1,
const odp_cpumask_t *src2)
{
- CPU_XOR(&dest->set, &src1->set, &src2->set);
+ CPU_XOR((cpu_set_t *)dest, (const cpu_set_t *)src1,
+ (const cpu_set_t *)src2);
}
int odp_cpumask_equal(const odp_cpumask_t *mask1,
const odp_cpumask_t *mask2)
{
- return CPU_EQUAL(&mask1->set, &mask2->set);
+ return CPU_EQUAL((const cpu_set_t *)mask1, (const cpu_set_t *)mask2);
}
void odp_cpumask_copy(odp_cpumask_t *dest, const odp_cpumask_t *src)
{
- memcpy(&dest->set, &src->set, sizeof(src->set));
+ memcpy(dest, src, sizeof(odp_cpumask_t));
}
int odp_cpumask_first(const odp_cpumask_t *mask)
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
index f58f410..f534759 100644
--- a/platform/linux-generic/odp_init.c
+++ b/platform/linux-generic/odp_init.c
@@ -9,6 +9,7 @@
#include <unistd.h>
#include <odp_internal.h>
#include <odp_schedule_if.h>
+#include <string.h>
struct odp_global_data_s odp_global_data;
-----------------------------------------------------------------------
Summary of changes:
example/Makefile.am | 2 +-
example/classifier/odp_classifier.c | 1 +
example/generator/odp_generator.c | 1 +
{test/validation => example/hello}/.gitignore | 1 +
example/hello/Makefile.am | 11 +++
example/hello/odp_hello.c | 107 +++++++++++++++++++++
example/ipsec/odp_ipsec.c | 1 +
example/m4/configure.m4 | 3 +-
example/packet/odp_pktio.c | 1 +
example/switch/odp_switch.c | 2 +
example/time/time_global_test.c | 1 +
example/timer/odp_timer_simple.c | 1 +
example/timer/odp_timer_test.c | 1 +
helper/chksum.c | 2 +
helper/linux.c | 1 +
platform/linux-generic/include/odp/api/cpumask.h | 4 -
.../include/odp/api/plat/byteorder_types.h | 33 +++----
.../include/odp/api/plat/cpumask_types.h | 10 +-
platform/linux-generic/include/odp/api/std_clib.h | 1 +
platform/linux-generic/include/odp/api/std_types.h | 10 +-
.../linux-generic/include/odp_atomic_internal.h | 1 +
.../linux-generic/include/odp_buffer_internal.h | 1 +
platform/linux-generic/include/odp_packet_socket.h | 1 +
platform/linux-generic/odp_buffer.c | 2 +-
platform/linux-generic/odp_classification.c | 1 +
platform/linux-generic/odp_cpumask.c | 39 +++++---
platform/linux-generic/odp_hash.c | 2 +
platform/linux-generic/odp_init.c | 1 +
platform/linux-generic/odp_packet.c | 1 +
platform/linux-generic/odp_packet_io.c | 1 +
platform/linux-generic/odp_pkt_queue.c | 1 +
platform/linux-generic/odp_pool.c | 2 +-
platform/linux-generic/odp_queue.c | 2 +-
platform/linux-generic/odp_shared_memory.c | 1 +
platform/linux-generic/odp_sorted_list.c | 1 +
platform/linux-generic/odp_system_info.c | 1 +
platform/linux-generic/odp_timer.c | 1 +
platform/linux-generic/odp_timer_wheel.c | 1 +
platform/linux-generic/odp_traffic_mngr.c | 2 +
platform/linux-generic/pktio/loop.c | 2 +
platform/linux-generic/pktio/netmap.c | 2 +
platform/linux-generic/pktio/ring.c | 2 +
platform/linux-generic/pktio/sysfs.c | 1 +
platform/linux-generic/pktio/tap.c | 1 +
test/performance/odp_l2fwd.c | 1 +
test/performance/odp_pktio_perf.c | 1 +
test/performance/odp_scheduling.c | 1 +
test/platform/linux-generic/pktio_ipc/ipc_common.h | 1 +
.../classification/odp_classification_testsuites.h | 1 +
test/validation/common/mask_common.c | 2 +
test/validation/common/odp_cunit_common.h | 1 +
51 files changed, 218 insertions(+), 54 deletions(-)
copy {test/validation => example/hello}/.gitignore (54%)
create mode 100644 example/hello/Makefile.am
create mode 100644 example/hello/odp_hello.c
hooks/post-receive
--
7 years, 10 months
- 1
- 0
[COMMIT] branch master updated. v1.10.1.0-36-gc03685a
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
via c03685af2895b20a5e8a046ea910254a96ab15c4 (commit)
from c6bf23e2794ec2a54fa1724cd9d833d84aa39270 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c03685af2895b20a5e8a046ea910254a96ab15c4
Author: Bill Fischofer <bill.fischofer(a)linaro.org>
Date: Mon Jul 4 21:31:45 2016 -0500
linux-generic: schedule: simplify wait logic to avoid clang issues
Resolve Bug https://bugs.linaro.org/show_bug.cgi?id=2387 by ensuring that
t1 variable is seen as initialized in all paths in the SP Scheduler.
Previous logic failed due to an apparent issue with clang.
Signed-off-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen(a)nokia.com>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c
index 8c45123..2e28aa4 100644
--- a/platform/linux-generic/odp_schedule_sp.c
+++ b/platform/linux-generic/odp_schedule_sp.c
@@ -364,9 +364,9 @@ static uint64_t schedule_wait_time(uint64_t ns)
}
static int schedule_multi(odp_queue_t *from, uint64_t wait,
- odp_event_t events[], int max_events)
+ odp_event_t events[], int max_events ODP_UNUSED)
{
- (void)max_events;
+ odp_time_t t1;
int update_t1 = 1;
if (sched_local.cmd) {
@@ -384,7 +384,6 @@ static int schedule_multi(odp_queue_t *from, uint64_t wait,
sched_cmd_t *cmd;
uint32_t qi;
int num;
- odp_time_t t1;
cmd = sched_cmd(NUM_PRIO);
-----------------------------------------------------------------------
Summary of changes:
platform/linux-generic/odp_schedule_sp.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
hooks/post-receive
--
7 years, 10 months
- 1
- 0
[COMMIT] branch api-next updated. v1.10.1.0-36-gc4aefb8
by git＠git-us.linaro.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, api-next has been updated
via c4aefb88d31452b3add8cf16f9eef152525c3e93 (commit)
via 52dbfc9fc964ca292a777f11336854e88538f46d (commit)
from 1a24b758857eef4caf2a1801851315b6c93edd76 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c4aefb88d31452b3add8cf16f9eef152525c3e93
Author: Ru Jia <jiaru(a)ict.ac.cn>
Date: Thu Jun 30 16:15:32 2016 +0800
helper: test: add validation test of ip lookup table
Signed-off-by: Ru Jia <jiaru(a)ict.ac.cn>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am
index 0811d28..d9eb437 100644
--- a/helper/test/Makefile.am
+++ b/helper/test/Makefile.am
@@ -10,7 +10,8 @@ EXECUTABLES = chksum$(EXEEXT) \
table$(EXEEXT) \
thread$(EXEEXT) \
parse$(EXEEXT)\
- process$(EXEEXT)
+ process$(EXEEXT) \
+ iplookuptable$(EXEEXT)
COMPILE_ONLY = odpthreads
@@ -37,3 +38,4 @@ dist_process_SOURCES = process.c
dist_parse_SOURCES = parse.c
process_LDADD = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la
dist_table_SOURCES = table.c
+dist_iplookuptable_SOURCES = iplookuptable.c
diff --git a/helper/test/iplookuptable.c b/helper/test/iplookuptable.c
new file mode 100644
index 0000000..e1d2820
--- /dev/null
+++ b/helper/test/iplookuptable.c
@@ -0,0 +1,174 @@
+/* Copyright (c) 2016, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include <odp_api.h>
+#include <test_debug.h>
+#include <../odph_iplookuptable.h>
+#include <odp/helper/ip.h>
+
+static void print_prefix_info(
+ const char *msg, uint32_t ip, uint8_t cidr)
+{
+ int i = 0;
+ uint8_t *ptr = (uint8_t *)(&ip);
+
+ printf("%s IP prefix: ", msg);
+ for (i = 3; i >= 0; i--) {
+ if (i != 3)
+ printf(".");
+ printf("%d", ptr[i]);
+ }
+ printf("/%d\n", cidr);
+}
+
+/*
+ * Basic sequence of operations for a single key:
+ * - put short prefix
+ * - put long prefix
+ * - get (hit long prefix)
+ * - remove long prefix
+ * - get (hit short prefix)
+ */
+static int test_ip_lookup_table(void)
+{
+ odph_iplookup_prefix_t prefix1, prefix2;
+ odph_table_t table;
+ int ret;
+ uint64_t value1 = 1, value2 = 2, result = 0;
+ uint32_t lkp_ip = 0;
+
+ table = odph_iplookup_table_create(
+ "prefix_test", 0, 0, sizeof(uint32_t));
+ if (table == NULL) {
+ printf("IP prefix lookup table creation failed\n");
+ return -1;
+ }
+
+ ret = odph_ipv4_addr_parse(&prefix1.ip, "192.168.0.0");
+ if (ret < 0) {
+ printf("Failed to get IP addr from str\n");
+ odph_iplookup_table_destroy(table);
+ return -1;
+ }
+ prefix1.cidr = 11;
+
+ ret = odph_ipv4_addr_parse(&prefix2.ip, "192.168.0.0");
+ if (ret < 0) {
+ printf("Failed to get IP addr from str\n");
+ odph_iplookup_table_destroy(table);
+ return -1;
+ }
+ prefix2.cidr = 24;
+
+ ret = odph_ipv4_addr_parse(&lkp_ip, "192.168.0.1");
+ if (ret < 0) {
+ printf("Failed to get IP addr from str\n");
+ odph_iplookup_table_destroy(table);
+ return -1;
+ }
+
+ /* test with standard put/get/remove functions */
+ ret = odph_iplookup_table_put_value(table, &prefix1, &value1);
+ print_prefix_info("Add", prefix1.ip, prefix1.cidr);
+ if (ret < 0) {
+ printf("Failed to add ip prefix\n");
+ odph_iplookup_table_destroy(table);
+ return -1;
+ }
+
+ ret = odph_iplookup_table_get_value(table, &lkp_ip, &result, 0);
+ print_prefix_info("Lkp", lkp_ip, 32);
+ if (ret < 0 || result != 1) {
+ printf("Failed to find longest prefix\n");
+ odph_iplookup_table_destroy(table);
+ return -1;
+ }
+
+ /* add a longer prefix */
+ ret = odph_iplookup_table_put_value(table, &prefix2, &value2);
+ print_prefix_info("Add", prefix2.ip, prefix2.cidr);
+ if (ret < 0) {
+ printf("Failed to add ip prefix\n");
+ odph_iplookup_table_destroy(table);
+ return -1;
+ }
+
+ ret = odph_iplookup_table_get_value(table, &lkp_ip, &result, 0);
+ print_prefix_info("Lkp", lkp_ip, 32);
+ if (ret < 0 || result != 2) {
+ printf("Failed to find longest prefix\n");
+ odph_iplookup_table_destroy(table);
+ return -1;
+ }
+
+ ret = odph_iplookup_table_remove_value(table, &prefix2);
+ print_prefix_info("Del", prefix2.ip, prefix2.cidr);
+ if (ret < 0) {
+ printf("Failed to delete ip prefix\n");
+ odph_iplookup_table_destroy(table);
+ return -1;
+ }
+
+ ret = odph_iplookup_table_get_value(table, &lkp_ip, &result, 0);
+ print_prefix_info("Lkp", lkp_ip, 32);
+ if (ret < 0 || result != 1) {
+ printf("Error: found result ater deleting\n");
+ odph_iplookup_table_destroy(table);
+ return -1;
+ }
+
+ ret = odph_iplookup_table_remove_value(table, &prefix1);
+ print_prefix_info("Del", prefix1.ip, prefix1.cidr);
+ if (ret < 0) {
+ printf("Failed to delete prefix\n");
+ odph_iplookup_table_destroy(table);
+ return -1;
+ }
+
+ odph_iplookup_table_destroy(table);
+ return 0;
+}
+
+int main(int argc TEST_UNUSED, char *argv[] TEST_UNUSED)
+{
+ odp_instance_t instance;
+ int ret = 0;
+
+ ret = odp_init_global(&instance, NULL, NULL);
+ if (ret != 0) {
+ fprintf(stderr, "Error: ODP global init failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ ret = odp_init_local(instance, ODP_THREAD_WORKER);
+ if (ret != 0) {
+ fprintf(stderr, "Error: ODP local init failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ if (test_ip_lookup_table() < 0)
+ printf("Test failed\n");
+ else
+ printf("All tests passed\n");
+
+ if (odp_term_local()) {
+ fprintf(stderr, "Error: ODP local term failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ if (odp_term_global(instance)) {
+ fprintf(stderr, "Error: ODP global term failed.\n");
+ exit(EXIT_FAILURE);
+ }
+
+ return ret;
+}
commit 52dbfc9fc964ca292a777f11336854e88538f46d
Author: Ru Jia <jiaru(a)ict.ac.cn>
Date: Thu Jun 30 16:15:31 2016 +0800
helper: table: add impl of ip lookup table
This is an implementation of the 16,8,8 ip lookup
(longest prefix matching) algorithm. The key of the
table is 32-bit IPv4 address.
Signed-off-by: Ru Jia <jiaru(a)ict.ac.cn>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer(a)linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org>
diff --git a/helper/Makefile.am b/helper/Makefile.am
index 116a1f0..24a0748 100644
--- a/helper/Makefile.am
+++ b/helper/Makefile.am
@@ -28,7 +28,8 @@ noinst_HEADERS = \
$(srcdir)/odph_hashtable.h \
$(srcdir)/odph_lineartable.h \
$(srcdir)/odph_cuckootable.h \
- $(srcdir)/odph_list_internal.h
+ $(srcdir)/odph_list_internal.h \
+ $(srcdir)/odph_iplookuptable.h
__LIB__libodphelper_linux_la_SOURCES = \
eth.c \
@@ -37,6 +38,7 @@ __LIB__libodphelper_linux_la_SOURCES = \
linux.c \
hashtable.c \
lineartable.c \
- cuckootable.c
+ cuckootable.c \
+ iplookuptable.c
lib_LTLIBRARIES = $(LIB)/libodphelper-linux.la
diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c
new file mode 100644
index 0000000..5f80743
--- /dev/null
+++ b/helper/iplookuptable.c
@@ -0,0 +1,937 @@
+/* Copyright (c) 2016, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <string.h>
+#include <stdint.h>
+#include <errno.h>
+#include <stdio.h>
+
+#include "odph_iplookuptable.h"
+#include "odph_list_internal.h"
+#include "odph_debug.h"
+#include <odp_api.h>
+
+/** @magic word, write to the first byte of the memory block
+ * to indicate this block is used by a ip lookup table
+ */
+#define ODPH_IP_LOOKUP_TABLE_MAGIC_WORD 0xCFCFFCFC
+
+/* The length(bit) of the IPv4 address */
+#define IP_LENGTH 32
+
+/* The number of L1 entries */
+#define ENTRY_NUM_L1 (1 << 16)
+/* The size of one L2\L3 subtree */
+#define ENTRY_NUM_SUBTREE (1 << 8)
+
+#define WHICH_CHILD(ip, cidr) ((ip >> (IP_LENGTH - cidr)) & 0x00000001)
+
+/** @internal entry struct
+ * Structure store an entry of the ip prefix table.
+ * Because of the leaf pushing, each entry of the table must have
+ * either a child entry, or a nexthop info.
+ * If child == 0 and index != ODP_BUFFER_INVALID, this entry has
+ * a nexthop info, index indicates the buffer that stores the
+ * nexthop value, and ptr points to the address of the buffer.
+ * If child == 1, this entry has a subtree, index indicates
+ * the buffer that stores the subtree, and ptr points to the
+ * address of the buffer.
+ */
+typedef struct {
+ union {
+ uint8_t u8;
+ struct {
+#if ODP_BYTE_ORDER == ODP_BIG_ENDIAN
+ uint8_t child : 1;
+ uint8_t cidr : 7;
+#else
+ uint8_t cidr : 7;
+ uint8_t child : 1;
+#endif
+ };
+ };
+ union {
+ odp_buffer_t nexthop;
+ void *ptr;
+ };
+} prefix_entry_t;
+
+#define ENTRY_SIZE (sizeof(prefix_entry_t) + sizeof(odp_buffer_t))
+#define ENTRY_BUFF_ARR(x) ((odp_buffer_t *)((char *)x \
+ + sizeof(prefix_entry_t) * ENTRY_NUM_SUBTREE))
+
+/** @internal trie node struct
+ * In this IP lookup algorithm, we use a
+ * binary tire to detect the overlap prefix.
+ */
+typedef struct trie_node {
+ /* tree structure */
+ struct trie_node *parent;
+ struct trie_node *left;
+ struct trie_node *right;
+ /* IP prefix length */
+ uint8_t cidr;
+ /* Nexthop buffer index */
+ odp_buffer_t nexthop;
+ /* Buffer that stores this node */
+ odp_buffer_t buffer;
+} trie_node_t;
+
+/** Number of L2\L3 entries(subtrees) per cache cube. */
+#define CACHE_NUM_SUBTREE (1 << 13)
+/** Number of trie nodes per cache cube. */
+#define CACHE_NUM_TRIE (1 << 20)
+
+/** @typedef cache_type_t
+ * Cache node type
+ */
+typedef enum {
+ CACHE_TYPE_SUBTREE = 0,
+ CACHE_TYPE_TRIE
+} cache_type_t;
+
+/** A IP lookup table structure. */
+typedef struct {
+ /**< for check */
+ uint32_t magicword;
+ /** Name of the hash. */
+ char name[ODPH_TABLE_NAME_LEN];
+ /** Total L1 entries. */
+ prefix_entry_t *l1e;
+ /** Root node of the binary trie */
+ trie_node_t *trie;
+ /** Length of value. */
+ uint32_t nexthop_len;
+ /** Queues of free slots (caches)
+ * There are two queues:
+ * - free_slots[CACHE_TYPE_SUBTREE] is used for L2 and
+ * L3 entries (subtrees). Each entry stores an 8-bit
+ * subtree.
+ * - free_slots[CACHE_TYPE_TRIE] is used for the binary
+ * trie. Each entry contains a trie node.
+ */
+ odp_queue_t free_slots[2];
+ /** The number of pool used by each queue. */
+ uint32_t cache_count[2];
+} odph_iplookup_table_impl ODP_ALIGNED_CACHE;
+
+/***********************************************************
+ ***************** Cache management ********************
+ ***********************************************************/
+
+/** Destroy all caches */
+static void
+cache_destroy(odph_iplookup_table_impl *impl)
+{
+ odp_queue_t queue;
+ odp_event_t ev;
+ uint32_t i = 0, count = 0;
+ char pool_name[ODPH_TABLE_NAME_LEN + 8];
+
+ /* free all buffers in the queue */
+ for (; i < 2; i++) {
+ queue = impl->free_slots[i];
+ if (queue == ODP_QUEUE_INVALID)
+ continue;
+
+ while ((ev = odp_queue_deq(queue))
+ != ODP_EVENT_INVALID) {
+ odp_buffer_free(odp_buffer_from_event(ev));
+ }
+ odp_queue_destroy(queue);
+ }
+
+ /* destroy all cache pools */
+ for (i = 0; i < 2; i++) {
+ for (count = 0; count < impl->cache_count[i]; count++) {
+ sprintf(
+ pool_name, "%s_%d_%d",
+ impl->name, i, count);
+ odp_pool_destroy(odp_pool_lookup(pool_name));
+ }
+ }
+}
+
+/** According to the type of cahce, set the value of
+ * a buffer to the initial value.
+ */
+static void
+cache_init_buffer(odp_buffer_t buffer, cache_type_t type, uint32_t size)
+{
+ int i = 0;
+ void *addr = odp_buffer_addr(buffer);
+
+ memset(addr, 0, size);
+ if (type == CACHE_TYPE_SUBTREE) {
+ prefix_entry_t *entry = (prefix_entry_t *)addr;
+
+ for (i = 0; i < ENTRY_NUM_SUBTREE; i++, entry++)
+ entry->nexthop = ODP_BUFFER_INVALID;
+ } else if (type == CACHE_TYPE_TRIE) {
+ trie_node_t *node = (trie_node_t *)addr;
+
+ node->buffer = buffer;
+ node->nexthop = ODP_BUFFER_INVALID;
+ }
+}
+
+/** Create a new buffer pool, and insert its buffer into the queue. */
+static int
+cache_alloc_new_pool(
+ odph_iplookup_table_impl *tbl, cache_type_t type)
+{
+ odp_pool_t pool;
+ odp_pool_param_t param;
+ odp_queue_t queue = tbl->free_slots[type];
+
+ odp_buffer_t buffer;
+ char pool_name[ODPH_TABLE_NAME_LEN + 8];
+ uint32_t size = 0, num = 0;
+
+ /* Create new pool (new free buffers). */
+ param.type = ODP_POOL_BUFFER;
+ param.buf.align = ODP_CACHE_LINE_SIZE;
+ if (type == CACHE_TYPE_SUBTREE) {
+ num = CACHE_NUM_SUBTREE;
+ size = ENTRY_SIZE * ENTRY_NUM_SUBTREE;
+ } else if (type == CACHE_TYPE_TRIE) {
+ num = CACHE_NUM_TRIE;
+ size = sizeof(trie_node_t);
+ } else {
+ ODPH_DBG("wrong cache_type_t.\n");
+ return -1;
+ }
+ param.buf.size = size;
+ param.buf.num = num;
+
+ sprintf(
+ pool_name, "%s_%d_%d",
+ tbl->name, type, tbl->cache_count[type]);
+ pool = odp_pool_create(pool_name, ¶m);
+ if (pool == ODP_POOL_INVALID) {
+ ODPH_DBG("failed to create a new pool.\n");
+ return -1;
+ }
+
+ /* insert new free buffers into queue */
+ while ((buffer = odp_buffer_alloc(pool))
+ != ODP_BUFFER_INVALID) {
+ cache_init_buffer(buffer, type, size);
+ odp_queue_enq(queue, odp_buffer_to_event(buffer));
+ }
+
+ tbl->cache_count[type]++;
+ return 0;
+}
+
+/** Get a new buffer from a cache list. If there is no
+ * available buffer, allocate a new pool.
+ */
+static odp_buffer_t
+cache_get_buffer(odph_iplookup_table_impl *tbl, cache_type_t type)
+{
+ odp_buffer_t buffer = ODP_BUFFER_INVALID;
+ odp_queue_t queue = tbl->free_slots[type];
+
+ /* get free buffer from queue */
+ buffer = odp_buffer_from_event(
+ odp_queue_deq(queue));
+
+ /* If there is no free buffer available, allocate new pool */
+ if (buffer == ODP_BUFFER_INVALID) {
+ cache_alloc_new_pool(tbl, type);
+ buffer = odp_buffer_from_event(odp_queue_deq(queue));
+ }
+
+ return buffer;
+}
+
+/***********************************************************
+ ****************** Binary trie ********************
+ ***********************************************************/
+
+/* Initialize the root node of the trie */
+static int
+trie_init(odph_iplookup_table_impl *tbl)
+{
+ trie_node_t *root = NULL;
+ odp_buffer_t buffer = cache_get_buffer(tbl, CACHE_TYPE_TRIE);
+
+ if (buffer != ODP_BUFFER_INVALID) {
+ root = (trie_node_t *)odp_buffer_addr(buffer);
+ root->cidr = 0;
+ tbl->trie = root;
+ return 0;
+ }
+
+ return -1;
+}
+
+/* Destroy the whole trie (recursively) */
+static void
+trie_destroy(odph_iplookup_table_impl *tbl, trie_node_t *trie)
+{
+ if (trie->left != NULL)
+ trie_destroy(tbl, trie->left);
+ if (trie->right != NULL)
+ trie_destroy(tbl, trie->right);
+
+ /* destroy this node */
+ odp_queue_enq(
+ tbl->free_slots[CACHE_TYPE_TRIE],
+ odp_buffer_to_event(trie->buffer));
+}
+
+/* Insert a new prefix node into the trie
+ * If the node is already existed, update its nexthop info,
+ * Return 0 and set nexthop pointer to INVALID.
+ * If the node is not exitsed, create this target node and
+ * all nodes along the path from root to the target node.
+ * Then return 0 and set nexthop pointer points to the
+ * new buffer.
+ * Return -1 for error.
+ */
+static int
+trie_insert_node(
+ odph_iplookup_table_impl *tbl, trie_node_t *root,
+ uint32_t ip, uint8_t cidr, odp_buffer_t nexthop)
+{
+ uint8_t level = 0, child;
+ odp_buffer_t buf;
+ trie_node_t *node = root, *prev = root;
+
+ /* create/update all nodes along the path
+ * from root to the new node. */
+ for (level = 1; level <= cidr; level++) {
+ child = WHICH_CHILD(ip, level);
+
+ node = child == 0 ? prev->left : prev->right;
+ /* If the child node doesn't exit, create it. */
+ if (node == NULL) {
+ buf = cache_get_buffer(tbl, CACHE_TYPE_TRIE);
+ if (buf == ODP_BUFFER_INVALID)
+ return -1;
+
+ node = (trie_node_t *)odp_buffer_addr(buf);
+ node->cidr = level;
+ node->parent = prev;
+
+ if (child == 0)
+ prev->left = node;
+ else
+ prev->right = node;
+ }
+ prev = node;
+ }
+
+ /* The final one is the target. */
+ node->nexthop = nexthop;
+ return 0;
+}
+
+/* Delete a node */
+static int
+trie_delete_node(
+ odph_iplookup_table_impl *tbl,
+ trie_node_t *root, uint32_t ip, uint8_t cidr)
+{
+ if (root == NULL)
+ return -1;
+
+ /* The default prefix (root node) cannot be deleted. */
+ if (cidr == 0)
+ return -1;
+
+ trie_node_t *node = root, *prev = NULL;
+ uint8_t level = 1, child = 0;
+ odp_buffer_t tmp;
+
+ /* Find the target node. */
+ for (level = 1; level <= cidr; level++) {
+ child = WHICH_CHILD(ip, level);
+ node = (child == 0) ? node->left : node->right;
+ if (node == NULL) {
+ ODPH_DBG("Trie node is not existed\n");
+ return -1;
+ }
+ }
+
+ node->nexthop = ODP_BUFFER_INVALID;
+
+ /* Delete all redundant nodes along the path. */
+ for (level = cidr; level > 0; level--) {
+ if (
+ node->left != NULL || node->right != NULL ||
+ node->nexthop != ODP_BUFFER_INVALID)
+ break;
+
+ child = WHICH_CHILD(ip, level);
+ prev = node->parent;
+
+ /* free trie node */
+ tmp = node->buffer;
+ cache_init_buffer(
+ tmp, CACHE_TYPE_TRIE, sizeof(trie_node_t));
+ odp_queue_enq(
+ tbl->free_slots[CACHE_TYPE_TRIE],
+ odp_buffer_to_event(tmp));
+
+ if (child == 0)
+ prev->left = NULL;
+ else
+ prev->right = NULL;
+ node = prev;
+ }
+ return 0;
+}
+
+/* Detect the longest overlapping prefix. */
+static int
+trie_detect_overlap(
+ trie_node_t *trie, uint32_t ip, uint8_t cidr,
+ uint8_t leaf_push, uint8_t *over_cidr,
+ odp_buffer_t *over_nexthop)
+{
+ uint8_t child = 0;
+ uint32_t level, limit = cidr > leaf_push ? leaf_push + 1 : cidr;
+ trie_node_t *node = trie, *longest = trie;
+
+ for (level = 1; level < limit; level++) {
+ child = WHICH_CHILD(ip, level);
+ node = (child == 0) ? node->left : node->right;
+ if (node->nexthop != ODP_BUFFER_INVALID)
+ longest = node;
+ }
+
+ *over_cidr = longest->cidr;
+ *over_nexthop = longest->nexthop;
+ return 0;
+}
+
+/***********************************************************
+ *************** IP prefix lookup table ****************
+ ***********************************************************/
+
+odph_table_t
+odph_iplookup_table_lookup(const char *name)
+{
+ odph_iplookup_table_impl *tbl = NULL;
+
+ if (name == NULL || strlen(name) >= ODPH_TABLE_NAME_LEN)
+ return NULL;
+
+ tbl = (odph_iplookup_table_impl *)odp_shm_addr(odp_shm_lookup(name));
+
+ if (
+ tbl != NULL &&
+ tbl->magicword == ODPH_IP_LOOKUP_TABLE_MAGIC_WORD &&
+ strcmp(tbl->name, name) == 0)
+ return (odph_table_t)tbl;
+
+ return NULL;
+}
+
+odph_table_t
+odph_iplookup_table_create(
+ const char *name, uint32_t ODP_IGNORED_1,
+ uint32_t ODP_IGNORED_2, uint32_t value_size)
+{
+ odph_iplookup_table_impl *tbl;
+ odp_shm_t shm_tbl;
+ odp_queue_t queue;
+ odp_queue_param_t qparam;
+
+ unsigned i;
+ uint32_t impl_size, l1_size;
+ char queue_name[ODPH_TABLE_NAME_LEN + 2];
+
+ /* Check for valid parameters */
+ if (strlen(name) == 0) {
+ ODPH_DBG("invalid parameters\n");
+ return NULL;
+ }
+
+ /* Guarantee there's no existing */
+ tbl = (odph_iplookup_table_impl *)odph_iplookup_table_lookup(name);
+ if (tbl != NULL) {
+ ODPH_DBG("IP prefix table %s already exists\n", name);
+ return NULL;
+ }
+
+ /* Calculate the sizes of different parts of IP prefix table */
+ impl_size = sizeof(odph_iplookup_table_impl);
+ l1_size = ENTRY_SIZE * ENTRY_NUM_L1;
+
+ shm_tbl = odp_shm_reserve(
+ name, impl_size + l1_size,
+ ODP_CACHE_LINE_SIZE, ODP_SHM_SW_ONLY);
+
+ if (shm_tbl == ODP_SHM_INVALID) {
+ ODPH_DBG(
+ "shm allocation failed for odph_iplookup_table_impl %s\n",
+ name);
+ return NULL;
+ }
+
+ tbl = (odph_iplookup_table_impl *)odp_shm_addr(shm_tbl);
+ memset(tbl, 0, impl_size + l1_size);
+
+ /* header of this mem block is the table impl struct,
+ * then the l1 entries array.
+ */
+ tbl->l1e = (prefix_entry_t *)((char *)tbl + impl_size);
+ for (i = 0; i < ENTRY_NUM_L1; i++)
+ tbl->l1e[i].nexthop = ODP_BUFFER_INVALID;
+
+ /* Setup table context. */
+ snprintf(tbl->name, sizeof(tbl->name), "%s", name);
+ tbl->magicword = ODPH_IP_LOOKUP_TABLE_MAGIC_WORD;
+ tbl->nexthop_len = value_size;
+
+ /* Initialize cache */
+ for (i = 0; i < 2; i++) {
+ tbl->cache_count[i] = 0;
+
+ odp_queue_param_init(&qparam);
+ qparam.type = ODP_QUEUE_TYPE_PLAIN;
+ sprintf(queue_name, "%s_%d", name, i);
+ queue = odp_queue_create(queue_name, &qparam);
+ if (queue == ODP_QUEUE_INVALID) {
+ ODPH_DBG("failed to create queue");
+ cache_destroy(tbl);
+ return NULL;
+ }
+ tbl->free_slots[i] = queue;
+ cache_alloc_new_pool(tbl, i);
+ }
+
+ /* Initialize tire */
+ if (trie_init(tbl) < 0) {
+ odp_shm_free(shm_tbl);
+ return NULL;
+ }
+
+ return (odph_table_t)tbl;
+}
+
+int
+odph_iplookup_table_destroy(odph_table_t tbl)
+{
+ int i, j;
+ odph_iplookup_table_impl *impl = NULL;
+ prefix_entry_t *subtree = NULL;
+ odp_buffer_t *buff1 = NULL, *buff2 = NULL;
+
+ if (tbl == NULL)
+ return -1;
+
+ impl = (odph_iplookup_table_impl *)tbl;
+
+ /* check magic word */
+ if (impl->magicword != ODPH_IP_LOOKUP_TABLE_MAGIC_WORD) {
+ ODPH_DBG("wrong magicword for IP prefix table\n");
+ return -1;
+ }
+
+ /* destroy trie */
+ trie_destroy(impl, impl->trie);
+
+ /* free all L2 and L3 entries */
+ buff1 = ENTRY_BUFF_ARR(impl->l1e);
+ for (i = 0; i < ENTRY_NUM_L1; i++) {
+ if ((impl->l1e[i]).child == 0)
+ continue;
+
+ subtree = (prefix_entry_t *)impl->l1e[i].ptr;
+ buff2 = ENTRY_BUFF_ARR(subtree);
+ /* destroy all l3 subtrees of this l2 subtree */
+ for (j = 0; j < ENTRY_NUM_SUBTREE; j++) {
+ if (subtree[j].child == 0)
+ continue;
+ odp_queue_enq(
+ impl->free_slots[CACHE_TYPE_TRIE],
+ odp_buffer_to_event(buff2[j]));
+ }
+ /* destroy this l2 subtree */
+ odp_queue_enq(
+ impl->free_slots[CACHE_TYPE_TRIE],
+ odp_buffer_to_event(buff1[i]));
+ }
+
+ /* destroy all cache */
+ cache_destroy(impl);
+
+ /* free impl */
+ odp_shm_free(odp_shm_lookup(impl->name));
+ return 0;
+}
+
+/* Insert the prefix into level x
+ * Return:
+ * -1 error
+ * 0 the table is unmodified
+ * 1 the table is modified
+ */
+static int
+prefix_insert_into_lx(
+ odph_iplookup_table_impl *tbl, prefix_entry_t *entry,
+ uint8_t cidr, odp_buffer_t nexthop, uint8_t level)
+{
+ uint8_t ret = 0;
+ uint32_t i = 0, limit = (1 << (level - cidr));
+ prefix_entry_t *e = entry, *ne = NULL;
+
+ for (i = 0; i < limit; i++, e++) {
+ if (e->child == 1) {
+ if (e->cidr > cidr)
+ continue;
+
+ e->cidr = cidr;
+ /* push to next level */
+ ne = (prefix_entry_t *)e->ptr;
+ ret = prefix_insert_into_lx(
+ tbl, ne, cidr, nexthop, cidr + 8);
+ } else {
+ if (e->cidr > cidr)
+ continue;
+
+ e->child = 0;
+ e->cidr = cidr;
+ e->nexthop = nexthop;
+ ret = 1;
+ }
+ }
+ return ret;
+}
+
+static int
+prefix_insert_iter(
+ odph_iplookup_table_impl *tbl, prefix_entry_t *entry,
+ odp_buffer_t *buff, uint32_t ip, uint8_t cidr,
+ odp_buffer_t nexthop, uint8_t level, uint8_t depth)
+{
+ uint8_t state = 0;
+ prefix_entry_t *ne = NULL;
+ odp_buffer_t *nbuff = NULL;
+
+ /* If child subtree is existed, get it. */
+ if (entry->child) {
+ ne = (prefix_entry_t *)entry->ptr;
+ nbuff = ENTRY_BUFF_ARR(ne);
+ } else {
+ /* If the child is not existed, create a new subtree. */
+ odp_buffer_t buf, push = entry->nexthop;
+
+ buf = cache_get_buffer(tbl, CACHE_TYPE_SUBTREE);
+ if (buf == ODP_BUFFER_INVALID) {
+ ODPH_DBG("failed to get subtree buffer from cache.\n");
+ return -1;
+ }
+ ne = (prefix_entry_t *)odp_buffer_addr(buf);
+ nbuff = ENTRY_BUFF_ARR(ne);
+
+ entry->child = 1;
+ entry->ptr = ne;
+ *buff = buf;
+
+ /* If this entry contains a nexthop and a small cidr,
+ * push it to the next level.
+ */
+ if (entry->cidr > 0) {
+ state = prefix_insert_into_lx(
+ tbl, ne, entry->cidr,
+ push, entry->cidr + 8);
+ }
+ }
+
+ ne += (ip >> 24);
+ nbuff += (ip >> 24);
+ if (cidr <= 8) {
+ state = prefix_insert_into_lx(
+ tbl, ne, cidr + depth * 8, nexthop, level);
+ } else {
+ state = prefix_insert_iter(
+ tbl, ne, nbuff, ip << 8, cidr - 8,
+ nexthop, level + 8, depth + 1);
+ }
+
+ return state;
+}
+
+int
+odph_iplookup_table_put_value(odph_table_t tbl, void *key, void *value)
+{
+ if ((tbl == NULL) || (key == NULL) || (value == NULL))
+ return -1;
+
+ odph_iplookup_table_impl *impl = (odph_iplookup_table_impl *)tbl;
+ odph_iplookup_prefix_t *prefix = (odph_iplookup_prefix_t *)key;
+ prefix_entry_t *l1e = NULL;
+ odp_buffer_t nexthop = *((odp_buffer_t *)value);
+ int ret = 0;
+
+ if (prefix->cidr == 0)
+ return -1;
+ prefix->ip = prefix->ip & (0xffffffff << (IP_LENGTH - prefix->cidr));
+
+ /* insert into trie */
+ ret = trie_insert_node(
+ impl, impl->trie,
+ prefix->ip, prefix->cidr, nexthop);
+
+ if (ret < 0) {
+ ODPH_DBG("failed to insert into trie\n");
+ return -1;
+ }
+
+ /* get L1 entry */
+ l1e = &impl->l1e[prefix->ip >> 16];
+ odp_buffer_t *buff = ENTRY_BUFF_ARR(impl->l1e) + (prefix->ip >> 16);
+
+ if (prefix->cidr <= 16) {
+ ret = prefix_insert_into_lx(
+ impl, l1e, prefix->cidr, nexthop, 16);
+ } else {
+ ret = prefix_insert_iter(
+ impl, l1e, buff,
+ ((prefix->ip) << 16), prefix->cidr - 16,
+ nexthop, 24, 2);
+ }
+
+ return ret;
+}
+
+int
+odph_iplookup_table_get_value(
+ odph_table_t tbl, void *key, void *buffer, uint32_t buffer_size)
+{
+ if ((tbl == NULL) || (key == NULL) || (buffer == NULL))
+ return -EINVAL;
+
+ odph_iplookup_table_impl *impl = (odph_iplookup_table_impl *)tbl;
+ uint32_t ip = *((uint32_t *)key);
+ prefix_entry_t *entry = &impl->l1e[ip >> 16];
+ odp_buffer_t *buff = (odp_buffer_t *)buffer;
+
+ if (entry == NULL) {
+ ODPH_DBG("failed to get L1 entry.\n");
+ return -1;
+ }
+
+ ip <<= 16;
+ while (entry->child) {
+ entry = (prefix_entry_t *)entry->ptr;
+ entry += ip >> 24;
+ ip <<= 8;
+ }
+
+ /* copy data */
+ if (entry->nexthop == ODP_BUFFER_INVALID) {
+ /* ONLY match the default prefix */
+ printf("only match the default prefix\n");
+ *buff = ODP_BUFFER_INVALID;
+ } else {
+ *buff = entry->nexthop;
+ }
+
+ return 0;
+}
+
+static int
+prefix_delete_lx(
+ odph_iplookup_table_impl *tbl, prefix_entry_t *l1e,
+ odp_buffer_t *buff, uint8_t cidr, uint8_t over_cidr,
+ odp_buffer_t over_nexthop, uint8_t level)
+{
+ uint8_t ret, flag = 1;
+ prefix_entry_t *e = l1e;
+ odp_buffer_t *b = buff;
+ uint32_t i = 0, limit = 1 << (level - cidr);
+
+ for (i = 0; i < limit; i++, e++, b++) {
+ if (e->child == 1) {
+ if (e->cidr > cidr) {
+ flag = 0;
+ continue;
+ }
+
+ prefix_entry_t *ne = (prefix_entry_t *)e->ptr;
+ odp_buffer_t *nbuff = ENTRY_BUFF_ARR(ne);
+
+ e->cidr = over_cidr;
+ ret = prefix_delete_lx(
+ tbl, ne, nbuff, cidr, over_cidr,
+ over_nexthop, cidr + 8);
+
+ /* If ret == 1, the next 2^8 entries equal to
+ * (over_cidr, over_nexthop). In this case, we
+ * should not push the (over_cidr, over_nexthop)
+ * to the next level. In fact, we should recycle
+ * the next 2^8 entries.
+ */
+ if (ret) {
+ /* destroy subtree */
+ cache_init_buffer(
+ *b, CACHE_TYPE_SUBTREE,
+ ENTRY_SIZE * ENTRY_NUM_SUBTREE);
+ odp_queue_enq(
+ tbl->free_slots[CACHE_TYPE_SUBTREE],
+ odp_buffer_to_event(*b));
+ e->child = 0;
+ e->nexthop = over_nexthop;
+ } else {
+ flag = 0;
+ }
+ } else {
+ if (e->cidr > cidr) {
+ flag = 0;
+ continue;
+ } else {
+ e->cidr = over_cidr;
+ e->nexthop = over_nexthop;
+ }
+ }
+ }
+ return flag;
+}
+
+/* Check if the entry can be recycled.
+ * An entry can be recycled duo to two reasons:
+ * - all children of the entry are the same,
+ * - all children of the entry have a cidr smaller than the level
+ * bottom bound.
+ */
+static uint8_t
+can_recycle(prefix_entry_t *e, uint32_t level)
+{
+ uint8_t recycle = 1;
+ int i = 1;
+ prefix_entry_t *ne = (prefix_entry_t *)e->ptr;
+
+ if (ne->child)
+ return 0;
+
+ uint8_t cidr = ne->cidr;
+ odp_buffer_t index = ne->nexthop;
+
+ if (cidr > level)
+ return 0;
+
+ ne++;
+ for (; i < 256; i++, ne++) {
+ if (
+ ne->child != 0 || ne->cidr != cidr ||
+ ne->nexthop != index) {
+ recycle = 0;
+ break;
+ }
+ }
+ return recycle;
+}
+
+static uint8_t
+prefix_delete_iter(
+ odph_iplookup_table_impl *tbl, prefix_entry_t *e,
+ odp_buffer_t *buff, uint32_t ip, uint8_t cidr,
+ uint8_t level, uint8_t depth)
+{
+ uint8_t ret = 0, over_cidr;
+ odp_buffer_t over_nexthop;
+
+ trie_detect_overlap(
+ tbl->trie, ip, cidr + 8 * depth, level,
+ &over_cidr, &over_nexthop);
+ if (cidr > 8) {
+ prefix_entry_t *ne =
+ (prefix_entry_t *)e->ptr;
+ odp_buffer_t *nbuff = ENTRY_BUFF_ARR(ne);
+
+ ne += ((uint32_t)(ip << level) >> 24);
+ nbuff += ((uint32_t)(ip << level) >> 24);
+ ret = prefix_delete_iter(
+ tbl, ne, nbuff, ip, cidr - 8,
+ level + 8, depth + 1);
+
+ if (ret && can_recycle(e, level)) {
+ /* destroy subtree */
+ cache_init_buffer(
+ *buff, CACHE_TYPE_SUBTREE,
+ ENTRY_SIZE * ENTRY_NUM_SUBTREE);
+ odp_queue_enq(
+ tbl->free_slots[CACHE_TYPE_SUBTREE],
+ odp_buffer_to_event(*buff));
+ e->child = 0;
+ e->nexthop = over_nexthop;
+ e->cidr = over_cidr;
+ return 1;
+ }
+ return 0;
+ }
+
+ ret = prefix_delete_lx(
+ tbl, e, buff, cidr + 8 * depth,
+ over_cidr, over_nexthop, level);
+ return ret;
+}
+
+int
+odph_iplookup_table_remove_value(odph_table_t tbl, void *key)
+{
+ if ((tbl == NULL) || (key == NULL))
+ return -EINVAL;
+
+ odph_iplookup_table_impl *impl = (odph_iplookup_table_impl *)tbl;
+ odph_iplookup_prefix_t *prefix = (odph_iplookup_prefix_t *)key;
+ uint32_t ip = prefix->ip;
+ uint8_t cidr = prefix->cidr;
+
+ if (prefix->cidr < 0)
+ return -EINVAL;
+
+ prefix_entry_t *entry = &impl->l1e[ip >> 16];
+ odp_buffer_t *buff = ENTRY_BUFF_ARR(impl->l1e) + (ip >> 16);
+ uint8_t over_cidr, ret;
+ odp_buffer_t over_nexthop;
+
+ trie_detect_overlap(
+ impl->trie, ip, cidr, 16, &over_cidr, &over_nexthop);
+
+ if (cidr <= 16) {
+ prefix_delete_lx(
+ impl, entry, buff, cidr, over_cidr, over_nexthop, 16);
+ } else {
+ prefix_entry_t *ne = (prefix_entry_t *)entry->ptr;
+ odp_buffer_t *nbuff = ENTRY_BUFF_ARR(ne);
+
+ ne += ((uint32_t)(ip << 16) >> 24);
+ nbuff += ((uint32_t)(ip << 16) >> 24);
+ ret = prefix_delete_iter(impl, ne, nbuff, ip, cidr - 16, 24, 2);
+
+ if (ret && can_recycle(entry, 16)) {
+ /* destroy subtree */
+ cache_init_buffer(
+ *buff, CACHE_TYPE_SUBTREE,
+ sizeof(prefix_entry_t) * ENTRY_NUM_SUBTREE);
+ odp_queue_enq(
+ impl->free_slots[CACHE_TYPE_SUBTREE],
+ odp_buffer_to_event(*buff));
+ entry->child = 0;
+ entry->cidr = over_cidr;
+ entry->nexthop = over_nexthop;
+ }
+ }
+
+ return trie_delete_node(impl, impl->trie, ip, cidr);
+}
+
+odph_table_ops_t odph_iplookup_table_ops = {
+ odph_iplookup_table_create,
+ odph_iplookup_table_lookup,
+ odph_iplookup_table_destroy,
+ odph_iplookup_table_put_value,
+ odph_iplookup_table_get_value,
+ odph_iplookup_table_remove_value
+};
diff --git a/helper/odph_iplookuptable.h b/helper/odph_iplookuptable.h
new file mode 100644
index 0000000..0ae6b37
--- /dev/null
+++ b/helper/odph_iplookuptable.h
@@ -0,0 +1,58 @@
+/* Copyright (c) 2016, Linaro Limited
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/**
+ * @file
+ *
+ * ODP IP Lookup Table
+ *
+ * This is an implementation of the IP lookup table. The key of
+ * this table is IPv4 address (32 bits), and the value can be
+ * defined by user. This table uses the 16,8,8 ip lookup (longest
+ * prefix matching) algorithm.
+ */
+
+#ifndef ODPH_IPLOOKUP_TABLE_H_
+#define ODPH_IPLOOKUP_TABLE_H_
+
+#include <odp/helper/table.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+ uint32_t ip;
+ uint8_t cidr;
+} odph_iplookup_prefix_t;
+
+odph_table_t odph_iplookup_table_create(
+ const char *name,
+ uint32_t ODP_IGNORED_1,
+ uint32_t ODP_IGNORED_2,
+ uint32_t value_size);
+
+odph_table_t odph_iplookup_table_lookup(const char *name);
+
+int odph_iplookup_table_destroy(odph_table_t table);
+
+int odph_iplookup_table_put_value(
+ odph_table_t table, void *key, void *value);
+
+int odph_iplookup_table_get_value(
+ odph_table_t table, void *key,
+ void *buffer, uint32_t buffer_size);
+
+int odph_iplookup_table_remove_value(
+ odph_table_t table, void *key);
+
+extern odph_table_ops_t odph_iplookup_table_ops;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ODPH_IPLOOKUP_TABLE_H_ */
-----------------------------------------------------------------------
Summary of changes:
helper/Makefile.am | 6 +-
helper/iplookuptable.c | 937 ++++++++++++++++++++++++++++++++++++++++++++
helper/odph_iplookuptable.h | 58 +++
helper/test/Makefile.am | 4 +-
helper/test/iplookuptable.c | 174 ++++++++
5 files changed, 1176 insertions(+), 3 deletions(-)
create mode 100644 helper/iplookuptable.c
create mode 100644 helper/odph_iplookuptable.h
create mode 100644 helper/test/iplookuptable.c
hooks/post-receive
--
7 years, 10 months
- 1
- 0