From: Arjen Baart <arjen@andromeda.nl>
Date: Sun, 5 May 2019 06:13:45 +0000 (+0200)
Subject: Code cleanup
X-Git-Url: http://www.andromeda.nl/gitweb/?p=account.git;a=commitdiff_plain;h=bf570fc52a567a6715e48324da8631f86e6786a0

Code cleanup
---

diff --git a/account.cpp b/account.cpp
index 1ccb4f8..171caaa 100644
--- a/account.cpp
+++ b/account.cpp
@@ -58,7 +58,6 @@ std::ostream &operator<<(std::ostream &s, amount a)
       s << "           ";
    else
    {
-      //s << form("%8d.%02d",a / 100, a % 100);
       s << std::setw(8) << std::setfill(' ') << a / 100 << ".";
       s << std::setw(2) << std::setfill('0') << a % 100;
       s << std::setw(0) << std::setfill(' ');
@@ -91,11 +90,7 @@ std::ostream &operator<<(std::ostream &s, balance b)
 
 std::istream &operator>>(std::istream &s, Booking &b)
 {
-   char cmnt[128];
-
    s >> b.Bnumber >> b.booked;
-   //s.get(cmnt, 128);
-   //b.comment = cmnt;
    s >> b.comment;
 
    return s;
@@ -103,8 +98,6 @@ std::istream &operator>>(std::istream &s, Booking &b)
 
 std::ostream &operator<<(std::ostream &s, Booking &b)
 {
-   //s << form("#%03d ",b.Bnumber) << b.booked << " " << b.comment;
-   //s << form("%.*s", 58 - ~b.comment, "                                                              ");
    s << "#" << std::setw(4) << std::setfill('0') << b.Bnumber;
    s << std::setw(0) << std::setfill(' ');
    s << " " << b.booked << " ";
@@ -118,7 +111,6 @@ std::istream &operator>>(std::istream &s, Mutation &m)
 {
    int   nr_blanks = 0;
    char  c;
-   char  buf[128];
 
    while (s.get(c), c == ' ')
       nr_blanks++;
@@ -127,10 +119,6 @@ std::istream &operator>>(std::istream &s, Mutation &m)
    s >> m.account;
 
    amount  a;
-   //s.get(buf, 128);
-
-   //std::istringstream amnt(buf+strlen(buf)-10);
-   //amnt >> a;
 
    String amnt;
    int    p;
@@ -171,7 +159,7 @@ std::ostream &operator<<(std::ostream &s, Mutation &m)
 
 std::istream &operator>>(std::istream &s, Account &acc)
 {
-   char kind, name[128];
+   char kind;
 
    s >> acc.Anumber >> kind >> std::ws;
    if (kind == 'B')
@@ -179,9 +167,6 @@ std::istream &operator>>(std::istream &s, Account &acc)
    else
       acc.kind = COST;
 
-   //s.get(name, 128);
-   //acc.name = name;
-
    s >> acc.name;
 
    return s;
@@ -191,7 +176,6 @@ std::ostream &operator<<(std::ostream &s, Account &acc)
 {
    s << acc.Anumber << " " << std::setw(44) << std::left << acc.name;
    s << std::setw(0) << std::right << " ";
-   //s << form("%.*s", 45 - ~acc.name, "                                                   ");
    s << acc.Bal;
 
    return s;
@@ -516,23 +500,11 @@ void Account::Postscript_sheet(PostScript &ps)
 
          y -= 10;
          row++;
-         //s << b[B] << "|" << balance(m[M]) << " |\n";
       }
    }
 
    /*  Print the footer with the totals  */
 
-#if 0
-   s << "                 SALDO                                      ";
-   s << "               |" << -~total << " |\n";
-   s << "----------------------------------------------------------------";
-   s << "-----------+-------------+-----------+\n";
-   total += -~total;
-   s << "                 TOTAAL                                       ";
-   s << "             |" << total << " |\n";
-   s << "----------------------------------------------------------------";
-   s << "-----------+-------------+-----------+\n";
-#endif
 
    if (page_started)
    {
diff --git a/account_main.cpp b/account_main.cpp
index b21e129..22336e6 100644
--- a/account_main.cpp
+++ b/account_main.cpp
@@ -18,8 +18,8 @@ void renumber_journal(char *journal_file, unsigned long renumber);
 void print_journal();
 
 Ledger    ledger;
-Booking   b[2000];
-Mutation  m[6000];
+Booking   b[40000];
+Mutation  m[200000];
 
 int n_m = 0, n_b = 0;
 
@@ -31,7 +31,7 @@ static struct option long_options[] =
    { 0, 0, 0, 0 }
 };
 
-main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
    int      i, c;
    Account  a;
@@ -94,6 +94,8 @@ main(int argc, char *argv[])
 
    std::ofstream  saldi("saldi.xml");
    ledger.XML_saldi(saldi, date(b[0]), date(b[n_b-1]));
+
+   return 0;
 }
 
 void read_journal(char *journal_file)
diff --git a/bank.cpp b/bank.cpp
index e3e693e..7e672b9 100644
--- a/bank.cpp
+++ b/bank.cpp
@@ -24,6 +24,11 @@ class BankTemplate
    regex name_match;
    regex description_match;
 
+   //  for debugging
+
+   String _nm;
+   String _dm;
+
    String text_template;
 
 public:
@@ -39,6 +44,8 @@ public:
    {
       Credit = cr;
       text_template = "";
+      _nm = nm;
+      _dm = dm;
    }
 
    BankTemplate(const BankTemplate  & b)
@@ -46,6 +53,8 @@ public:
    {
       Credit            = b.Credit;
       text_template     = b.text_template;
+      _nm               = b._nm;
+      _dm               = b._dm;
    }
 
    void add_to_template(String s)
@@ -60,6 +69,7 @@ public:
 
 bool BankTemplate::matches(String deb_cred, String name, String descr)
 {
+   std::cout << name << " == " << _nm << "\n" << descr << " == " << _dm << "\n";
    return (deb_cred == "C") == Credit && name == name_match && descr == description_match;
 }
 
@@ -147,7 +157,7 @@ static struct option long_options[] =
    { 0, 0, 0, 0 }
 };
 
-main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
    int      c;
 
@@ -179,6 +189,8 @@ main(int argc, char *argv[])
    std::vector<BankTemplate> templates = read_templates("Bank.templ");
 
    read_mutations(argv[optind], templates);
+
+   return 0;
 }
 
 std::vector<BankTemplate> read_templates(const char * filename)
@@ -220,7 +232,7 @@ std::vector<BankTemplate> read_templates(const char * filename)
 
 void read_mutations(const char *filename, std::vector<BankTemplate> templates)
 {
-   int            i;
+   unsigned int      i;
 
    std::ifstream  in(filename);
 
diff --git a/doc/classes.svg b/doc/classes.svg
index 351fd43..59beee9 100644
--- a/doc/classes.svg
+++ b/doc/classes.svg
@@ -9,33 +9,33 @@
    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"
-   width="744.09448819"
-   height="1052.3622047"
+   width="793.70081"
+   height="1122.5197"
    id="svg2"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.92.1 r15371"
    sodipodi:docname="classes.svg">
   <defs
      id="defs4">
     <marker
        inkscape:stockid="EmptyDiamondL"
        orient="auto"
-       refY="0.0"
-       refX="0.0"
+       refY="0"
+       refX="0"
        id="EmptyDiamondL"
        style="overflow:visible">
       <path
          id="path3708"
-         d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z "
-         style="fill-rule:evenodd;fill:#FFFFFF;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8)" />
+         d="M 0,-6.0339855 -6.0339963,0 0,6.0339703 6.0339594,0 Z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.85333335pt;marker-start:none"
+         inkscape:connector-curvature="0" />
     </marker>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 561.25983 : 1"
+       inkscape:vp_y="0 : 1066.6667 : 0"
+       inkscape:vp_z="793.70078 : 561.25983 : 1"
+       inkscape:persp3d-origin="396.85039 : 374.17322 : 1"
        id="perspective10" />
   </defs>
   <sodipodi:namedview
@@ -45,21 +45,25 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="309.70171"
-     inkscape:cy="563.88025"
+     inkscape:zoom="1"
+     inkscape:cx="369.60227"
+     inkscape:cy="401.08228"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="true"
+     showgrid="false"
      inkscape:snap-global="true"
      inkscape:window-width="1733"
-     inkscape:window-height="1164"
+     inkscape:window-height="1163"
      inkscape:window-x="120"
      inkscape:window-y="0"
      inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
-       id="grid3590" />
+       id="grid3590"
+       originx="0"
+       originy="0"
+       spacingx="1.0666667"
+       spacingy="1.0666667" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -78,632 +82,724 @@
      inkscape:groupmode="layer"
      id="layer1">
     <rect
-       style="fill:#0000ff;fill-opacity:0.2477876;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#0000ff;fill-opacity:0.2477876;stroke:#000000;stroke-width:3.20000005;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect3594"
-       width="140"
-       height="170"
-       x="40"
-       y="552.36218" />
+       width="149.33333"
+       height="181.33333"
+       x="42.666668"
+       y="589.18634" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:bold;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Charter Bold"
-       x="50"
-       y="562.36218"
+       style="font-style:normal;font-weight:bold;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Charter Bold';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="53.333332"
+       y="599.85297"
        id="text4050"><tspan
          sodipodi:role="line"
          id="tspan4052"
-         x="50"
-         y="562.36218">acc_nr</tspan></text>
+         x="53.333332"
+         y="599.85297"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">acc_nr</tspan></text>
     <path
-       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 40,572.36218 c 140,0 140,0 140,0 l 0,0"
-       id="path4054" />
+       style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 42.666667,610.51966 c 149.333333,0 149.333333,0 149.333333,0 v 0"
+       id="path4054"
+       inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="50"
-       y="582.36218"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="53.333332"
+       y="621.18634"
        id="text4056"><tspan
          sodipodi:role="line"
          id="tspan4058"
-         x="50"
-         y="582.36218">group</tspan></text>
+         x="53.333332"
+         y="621.18634"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">group</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="50"
-       y="602.36218"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="53.333332"
+       y="642.51965"
        id="text4060"><tspan
          sodipodi:role="line"
          id="tspan4062"
-         x="50"
-         y="602.36218">nr</tspan></text>
+         x="53.333332"
+         y="642.51965"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">nr</tspan></text>
     <rect
-       y="562.36218"
-       x="560"
-       height="170"
-       width="140"
+       y="599.85297"
+       x="597.33331"
+       height="181.33333"
+       width="149.33333"
        id="rect2823"
-       style="fill:#0000ff;fill-opacity:0.2477876;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       style="fill:#0000ff;fill-opacity:0.2477876;stroke:#000000;stroke-width:3.20000005;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <text
        id="text2825"
-       y="572.36218"
-       x="570"
-       style="font-size:12px;font-style:normal;font-weight:bold;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Charter Bold"
+       y="610.51965"
+       x="608"
+       style="font-style:normal;font-weight:bold;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Charter Bold';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
        xml:space="preserve"><tspan
-         y="572.36218"
-         x="570"
+         y="610.51965"
+         x="608"
          id="tspan2827"
-         sodipodi:role="line">amount</tspan></text>
+         sodipodi:role="line"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">amount</tspan></text>
     <path
        id="path2829"
-       d="m 560,582.36218 c 140,0 140,0 140,0 l 0,0"
-       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       d="m 597.33333,621.18633 c 149.33334,0 149.33334,0 149.33334,0 v 0"
+       style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
     <text
        id="text2831"
-       y="592.36218"
-       x="570"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       y="631.85297"
+       x="608"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
        xml:space="preserve"><tspan
-         y="592.36218"
-         x="570"
+         y="631.85297"
+         x="608"
          id="tspan2833"
-         sodipodi:role="line">value</tspan></text>
+         sodipodi:role="line"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">value</tspan></text>
     <rect
-       style="fill:#0000ff;fill-opacity:0.2477876;stroke:#000000;stroke-width:3.17156482;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#0000ff;fill-opacity:0.2477876;stroke:#000000;stroke-width:3.38300252;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect2839"
-       width="140"
-       height="190"
-       x="320"
-       y="562.36218" />
+       width="149.33333"
+       height="202.66667"
+       x="341.33334"
+       y="599.85297" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:bold;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Charter Bold"
-       x="330"
-       y="572.36218"
+       style="font-style:normal;font-weight:bold;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Charter Bold';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="352"
+       y="610.51965"
        id="text2841"><tspan
          sodipodi:role="line"
          id="tspan2843"
-         x="330"
-         y="572.36218">balance</tspan></text>
+         x="352"
+         y="610.51965"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">balance</tspan></text>
     <path
-       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 320,582.36218 c 140,0 140,0 140,0 l 0,0"
-       id="path2845" />
+       style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 341.33333,621.18633 c 149.33334,0 149.33334,0 149.33334,0 v 0"
+       id="path2845"
+       inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="330"
-       y="592.36218"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="352"
+       y="631.85297"
        id="text2847"><tspan
          sodipodi:role="line"
          id="tspan2849"
-         x="330"
-         y="592.36218">Debit</tspan></text>
+         x="352"
+         y="631.85297"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">Debit</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="330"
-       y="612.36218"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="352"
+       y="653.18634"
        id="text2851"><tspan
          sodipodi:role="line"
          id="tspan2853"
-         x="330"
-         y="612.36218">Credit</tspan></text>
+         x="352"
+         y="653.18634"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">Credit</tspan></text>
     <rect
-       style="fill:#00fff6;fill-opacity:0.2477876;stroke:#000000;stroke-width:0.82285076;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#00fff6;fill-opacity:0.2477876;stroke:#000000;stroke-width:0.87770748;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect2855"
-       width="20.155643"
-       height="20.155643"
-       x="-333.50888"
-       y="860.43506"
+       width="21.499353"
+       height="21.499353"
+       x="-355.7428"
+       y="917.79742"
        transform="matrix(0.86824309,-0.49613904,0.86824309,0.49613904,0,0)"
-       inkscape:transform-center-x="37.123098" />
+       inkscape:transform-center-x="39.597971" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 490,592.36218 70,-20"
+       style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 522.66667,631.85299 74.66666,-21.33333"
        id="path4525"
-       inkscape:connector-type="polyline"
-       sodipodi:nodetypes="cc" />
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       inkscape:connector-type="polyline" />
     <rect
-       y="272.36218"
-       x="490"
-       height="170"
-       width="140"
+       y="290.51965"
+       x="522.66669"
+       height="181.33333"
+       width="149.33333"
        id="rect4527"
-       style="fill:#0000ff;fill-opacity:0.2477876;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       style="fill:#0000ff;fill-opacity:0.2477876;stroke:#000000;stroke-width:3.20000005;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <text
        id="text4529"
-       y="282.36218"
-       x="500"
-       style="font-size:12px;font-style:normal;font-weight:bold;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Charter Bold"
+       y="301.18634"
+       x="533.33331"
+       style="font-style:normal;font-weight:bold;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Charter Bold';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
        xml:space="preserve"><tspan
-         y="282.36218"
-         x="500"
+         y="301.18634"
+         x="533.33331"
          id="tspan4531"
-         sodipodi:role="line">Booking</tspan></text>
+         sodipodi:role="line"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">Booking</tspan></text>
     <path
        id="path4533"
-       d="m 490,292.36218 c 140,0 140,0 140,0 l 0,0"
-       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       d="m 522.66667,311.85299 c 149.33333,0 149.33333,0 149.33333,0 v 0"
+       style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
     <text
        id="text4535"
-       y="307.36218"
-       x="500"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       y="327.853"
+       x="533.33331"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
        xml:space="preserve"><tspan
-         y="307.36218"
-         x="500"
+         y="327.853"
+         x="533.33331"
          id="tspan4537"
-         sodipodi:role="line">Bnumber</tspan></text>
+         sodipodi:role="line"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">Bnumber</tspan></text>
     <text
        id="text4539"
-       y="322.36218"
-       x="500"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       y="343.853"
+       x="533.33331"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
        xml:space="preserve"><tspan
-         y="322.36218"
-         x="500"
+         y="343.853"
+         x="533.33331"
          id="tspan4541"
-         sodipodi:role="line">booked</tspan></text>
+         sodipodi:role="line"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">booked</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="500"
-       y="337.36218"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="533.33331"
+       y="359.853"
        id="text4543"><tspan
          sodipodi:role="line"
          id="tspan4545"
-         x="500"
-         y="337.36218">comment</tspan></text>
+         x="533.33331"
+         y="359.853"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">comment</tspan></text>
     <rect
-       y="282.36218"
-       x="80"
-       height="170"
-       width="140"
+       y="301.18634"
+       x="85.333336"
+       height="181.33333"
+       width="149.33333"
        id="rect4547"
-       style="fill:#0000ff;fill-opacity:0.2477876;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       style="fill:#0000ff;fill-opacity:0.2477876;stroke:#000000;stroke-width:3.20000005;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <text
        id="text4549"
-       y="292.36218"
-       x="90"
-       style="font-size:12px;font-style:normal;font-weight:bold;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Charter Bold"
+       y="311.853"
+       x="96"
+       style="font-style:normal;font-weight:bold;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Charter Bold';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
        xml:space="preserve"><tspan
-         y="292.36218"
-         x="90"
+         y="311.853"
+         x="96"
          id="tspan4551"
-         sodipodi:role="line">Mutation</tspan></text>
+         sodipodi:role="line"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">Mutation</tspan></text>
     <path
        id="path4553"
-       d="m 80,302.36218 c 140,0 140,0 140,0 l 0,0"
-       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       d="m 85.333333,322.51966 c 149.333337,0 149.333337,0 149.333337,0 v 0"
+       style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
     <text
        id="text4555"
-       y="312.36218"
-       x="90"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       y="333.18634"
+       x="96"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
        xml:space="preserve"><tspan
-         y="312.36218"
-         x="90"
+         y="333.18634"
+         x="96"
          id="tspan4557"
-         sodipodi:role="line">booking_nr</tspan></text>
+         sodipodi:role="line"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">booking_nr</tspan></text>
     <text
        id="text4559"
-       y="332.36218"
-       x="90"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       y="354.51965"
+       x="96"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
        xml:space="preserve"><tspan
-         y="332.36218"
-         x="90"
+         y="354.51965"
+         x="96"
          id="tspan4561"
-         sodipodi:role="line">bal</tspan></text>
+         sodipodi:role="line"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">bal</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="90"
-       y="352.36218"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="96"
+       y="375.853"
        id="text4563"><tspan
          sodipodi:role="line"
          id="tspan4565"
-         x="90"
-         y="352.36218">account</tspan></text>
+         x="96"
+         y="375.853"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">account</tspan></text>
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 219.2031,323.33511 390,562.36218"
+       style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 233.81664,344.89078 416,599.85299"
        id="path4567"
+       inkscape:connector-curvature="0"
        inkscape:connector-type="polyline" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 80,352.36218 -30,200"
+       style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 85.333333,375.85299 -32,213.33334"
        id="path4569"
-       inkscape:connector-type="polyline"
-       sodipodi:nodetypes="cc" />
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       inkscape:connector-type="polyline" />
     <rect
-       y="772.36218"
-       x="180"
-       height="270"
-       width="140"
+       y="823.85297"
+       x="192"
+       height="288"
+       width="149.33333"
        id="rect4571"
-       style="fill:#0000ff;fill-opacity:0.2477876;stroke:#000000;stroke-width:3.78075624;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       style="fill:#0000ff;fill-opacity:0.2477876;stroke:#000000;stroke-width:4.03280687;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <text
        id="text4573"
-       y="782.36218"
-       x="190"
-       style="font-size:12px;font-style:normal;font-weight:bold;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Charter Bold"
+       y="834.51965"
+       x="202.66667"
+       style="font-style:normal;font-weight:bold;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Charter Bold';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
        xml:space="preserve"><tspan
-         y="782.36218"
-         x="190"
+         y="834.51965"
+         x="202.66667"
          id="tspan4575"
-         sodipodi:role="line">Account</tspan></text>
+         sodipodi:role="line"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">Account</tspan></text>
     <path
        id="path4577"
-       d="m 180,792.36218 c 140,0 140,0 140,0 l 0,0"
-       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       d="m 192,845.18633 c 149.33333,0 149.33333,0 149.33333,0 v 0"
+       style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
     <text
        id="text4579"
-       y="802.36218"
-       x="190"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       y="855.85297"
+       x="202.66667"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
        xml:space="preserve"><tspan
-         y="802.36218"
-         x="190"
+         y="855.85297"
+         x="202.66667"
          id="tspan4581"
-         sodipodi:role="line">Anumber</tspan></text>
+         sodipodi:role="line"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">Anumber</tspan></text>
     <text
        id="text4583"
-       y="822.36218"
-       x="190"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+       y="877.18634"
+       x="202.66667"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
        xml:space="preserve"><tspan
-         y="822.36218"
-         x="190"
+         y="877.18634"
+         x="202.66667"
          id="tspan4585"
-         sodipodi:role="line">name</tspan></text>
+         sodipodi:role="line"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">name</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="190.91882"
-       y="838.61493"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="203.64674"
+       y="894.52258"
        id="text4587"><tspan
          sodipodi:role="line"
          id="tspan4589"
-         x="190.91882"
-         y="838.61493">kind</tspan></text>
+         x="203.64674"
+         y="894.52258"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">kind</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="191.62593"
-       y="855.58551"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="204.40099"
+       y="912.62457"
        id="text4591"><tspan
          sodipodi:role="line"
          id="tspan4593"
-         x="191.62593"
-         y="855.58551">Bal</tspan></text>
+         x="204.40099"
+         y="912.62457"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">Bal</tspan></text>
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 180,822.36218 -70,-100"
+       style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 192,877.18633 117.33333,770.51966"
        id="path4595"
+       inkscape:connector-curvature="0"
        inkscape:connector-type="polyline" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 320,872.36218 70,-120"
+       style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 341.33333,930.51966 416,802.51966"
        id="path4597"
-       inkscape:connector-type="polyline"
-       sodipodi:nodetypes="cc" />
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       inkscape:connector-type="polyline" />
     <rect
-       style="fill:#0000ff;fill-opacity:0.2477876;stroke:#000000;stroke-width:3.48948002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#0000ff;fill-opacity:0.2477876;stroke:#000000;stroke-width:3.72211194;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4603"
-       width="140"
-       height="230"
-       x="560"
-       y="792.36218" />
+       width="149.33333"
+       height="245.33333"
+       x="597.33331"
+       y="845.18634" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:bold;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Charter Bold"
-       x="570"
-       y="802.36218"
+       style="font-style:normal;font-weight:bold;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Charter Bold';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="608"
+       y="855.85297"
        id="text4605"><tspan
          sodipodi:role="line"
          id="tspan4607"
-         x="570"
-         y="802.36218">Ledger</tspan></text>
+         x="608"
+         y="855.85297"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">Ledger</tspan></text>
     <path
-       style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 560,812.36218 c 140,0 140,0 140,0 l 0,0"
-       id="path4609" />
+       style="fill:none;stroke:#000000;stroke-width:3.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 597.33333,866.51966 c 149.33334,0 149.33334,0 149.33334,0 v 0"
+       id="path4609"
+       inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="570"
-       y="822.36218"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="608"
+       y="877.18634"
        id="text4611"><tspan
          sodipodi:role="line"
          id="tspan4613"
-         x="570"
-         y="822.36218">accs</tspan></text>
+         x="608"
+         y="877.18634"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">accs</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="570"
-       y="842.36218"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="608"
+       y="898.51965"
        id="text4615"><tspan
          sodipodi:role="line"
          id="tspan4617"
-         x="570"
-         y="842.36218">nr_accs</tspan></text>
+         x="608"
+         y="898.51965"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">nr_accs</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="570"
-       y="862.36218"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="608"
+       y="919.85297"
        id="text4619"><tspan
          sodipodi:role="line"
          id="tspan4621"
-         x="570"
-         y="862.36218">idx</tspan></text>
+         x="608"
+         y="919.85297"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">idx</tspan></text>
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 560,822.36218 -240,60"
+       style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 597.33333,877.18633 -256,64"
        id="path4623"
+       inkscape:connector-curvature="0"
        inkscape:connector-type="polyline" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 220,312.36218 270,0"
+       style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 234.66667,333.18633 h 288"
        id="path4250"
+       inkscape:connector-curvature="0"
        inkscape:connector-type="polyline" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="54.44722"
-       y="633.755"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="58.077034"
+       y="676.00531"
        id="text4252"><tspan
          sodipodi:role="line"
          id="tspan4254"
-         x="54.44722"
-         y="633.755">String()</tspan><tspan
-         sodipodi:role="line"
-         x="54.44722"
-         y="648.755"
-         id="tspan4256">==</tspan><tspan
-         sodipodi:role="line"
-         x="54.44722"
-         y="663.755"
-         id="tspan4258">istream &gt;&gt;</tspan><tspan
-         sodipodi:role="line"
-         x="54.44722"
-         y="678.755"
-         id="tspan4260">ostream &lt;&lt;</tspan></text>
+         x="58.077034"
+         y="676.00531"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">String()</tspan><tspan
+         sodipodi:role="line"
+         x="58.077034"
+         y="692.00531"
+         id="tspan4256"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">==</tspan><tspan
+         sodipodi:role="line"
+         x="58.077034"
+         y="708.00531"
+         id="tspan4258"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">istream &gt;&gt;</tspan><tspan
+         sodipodi:role="line"
+         x="58.077034"
+         y="724.00531"
+         id="tspan4260"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">ostream &lt;&lt;</tspan></text>
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 40,612.36218 c 140,0 140,0 140,0"
-       id="path4262" />
+       style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 42.666667,653.18633 c 149.333333,0 149.333333,0 149.333333,0"
+       id="path4262"
+       inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 80,362.36218 c 140,0 140,0 140,0"
-       id="path4264" />
+       style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 85.333333,386.51966 c 149.333337,0 149.333337,0 149.333337,0"
+       id="path4264"
+       inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 560,602.36218 c 140,0 140,0 140,0"
-       id="path4266" />
+       style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 597.33333,642.51966 c 149.33334,0 149.33334,0 149.33334,0"
+       id="path4266"
+       inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="571.34229"
-       y="620.31995"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="609.43176"
+       y="661.67462"
        id="text4268"><tspan
          sodipodi:role="line"
          id="tspan4270"
-         x="571.34229"
-         y="620.31995">long()</tspan><tspan
-         sodipodi:role="line"
-         x="571.34229"
-         y="635.31995"
-         id="tspan4272">+</tspan><tspan
-         sodipodi:role="line"
-         x="571.34229"
-         y="650.31995"
-         id="tspan4274">+=</tspan><tspan
-         sodipodi:role="line"
-         x="571.34229"
-         y="665.31995"
-         id="tspan4276">to_string()</tspan><tspan
-         sodipodi:role="line"
-         x="571.34229"
-         y="680.31995"
-         id="tspan4278">istream &gt;&gt;</tspan><tspan
-         sodipodi:role="line"
-         x="571.34229"
-         y="695.31995"
-         id="tspan4280">ostream &lt;&lt;</tspan></text>
+         x="609.43176"
+         y="661.67462"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">long()</tspan><tspan
+         sodipodi:role="line"
+         x="609.43176"
+         y="677.67462"
+         id="tspan4272"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">+</tspan><tspan
+         sodipodi:role="line"
+         x="609.43176"
+         y="693.67462"
+         id="tspan4274"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">+=</tspan><tspan
+         sodipodi:role="line"
+         x="609.43176"
+         y="709.67462"
+         id="tspan4276"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">to_string()</tspan><tspan
+         sodipodi:role="line"
+         x="609.43176"
+         y="725.67462"
+         id="tspan4278"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">istream &gt;&gt;</tspan><tspan
+         sodipodi:role="line"
+         x="609.43176"
+         y="741.67462"
+         id="tspan4280"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">ostream &lt;&lt;</tspan></text>
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 320,622.36218 140,0"
-       id="path4282" />
+       style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 341.33333,663.85299 H 490.66667"
+       id="path4282"
+       inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="334.46149"
-       y="639.4118"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="356.75891"
+       y="682.03925"
        id="text4284"><tspan
          sodipodi:role="line"
          id="tspan4286"
-         x="334.46149"
-         y="639.4118">debit()</tspan><tspan
-         sodipodi:role="line"
-         x="334.46149"
-         y="654.4118"
-         id="tspan4288">credit()</tspan><tspan
-         sodipodi:role="line"
-         x="334.46149"
-         y="669.4118"
-         id="tspan4290">~</tspan><tspan
-         sodipodi:role="line"
-         x="334.46149"
-         y="684.4118"
-         id="tspan4292">+</tspan><tspan
-         sodipodi:role="line"
-         x="334.46149"
-         y="699.4118"
-         id="tspan4294">-</tspan><tspan
-         sodipodi:role="line"
-         x="334.46149"
-         y="714.4118"
-         id="tspan4296">+=</tspan><tspan
-         sodipodi:role="line"
-         x="334.46149"
-         y="729.4118"
-         id="tspan4298">int()</tspan><tspan
-         sodipodi:role="line"
-         x="334.46149"
-         y="744.4118"
-         id="tspan4300">ostream &lt;&lt;</tspan></text>
+         x="356.75891"
+         y="682.03925"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">debit()</tspan><tspan
+         sodipodi:role="line"
+         x="356.75891"
+         y="698.03925"
+         id="tspan4288"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">credit()</tspan><tspan
+         sodipodi:role="line"
+         x="356.75891"
+         y="714.03925"
+         id="tspan4290"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">~</tspan><tspan
+         sodipodi:role="line"
+         x="356.75891"
+         y="730.03925"
+         id="tspan4292"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">+</tspan><tspan
+         sodipodi:role="line"
+         x="356.75891"
+         y="746.03925"
+         id="tspan4294"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">-</tspan><tspan
+         sodipodi:role="line"
+         x="356.75891"
+         y="762.03925"
+         id="tspan4296"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">+=</tspan><tspan
+         sodipodi:role="line"
+         x="356.75891"
+         y="778.03925"
+         id="tspan4298"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">int()</tspan><tspan
+         sodipodi:role="line"
+         x="356.75891"
+         y="794.03925"
+         id="tspan4300"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">ostream &lt;&lt;</tspan></text>
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 490,342.36218 140,0"
-       id="path4313" />
+       style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 522.66667,365.18633 H 672"
+       id="path4313"
+       inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="499.92447"
-       y="362.93307"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="533.25275"
+       y="387.1286"
        id="text4315"><tspan
          sodipodi:role="line"
          id="tspan4317"
-         x="499.92447"
-         y="362.93307">number()</tspan><tspan
+         x="533.25275"
+         y="387.1286"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">number()</tspan><tspan
          sodipodi:role="line"
-         x="499.92447"
-         y="377.93307"
-         id="tspan2946">date()</tspan><tspan
+         x="533.25275"
+         y="403.1286"
+         id="tspan2946"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">date()</tspan><tspan
          sodipodi:role="line"
-         x="499.92447"
-         y="392.93307"
-         id="tspan4319">istream &gt;&gt;</tspan><tspan
+         x="533.25275"
+         y="419.1286"
+         id="tspan4319"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">istream &gt;&gt;</tspan><tspan
          sodipodi:role="line"
-         x="499.92447"
-         y="407.93307"
-         id="tspan4321">ostream &lt;&lt;</tspan></text>
+         x="533.25275"
+         y="435.1286"
+         id="tspan4321"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">ostream &lt;&lt;</tspan></text>
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="98.287842"
-       y="379.19653"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="104.84036"
+       y="404.47629"
        id="text4323"><tspan
          sodipodi:role="line"
          id="tspan4325"
-         x="98.287842"
-         y="379.19653">number()</tspan><tspan
-         sodipodi:role="line"
-         x="98.287842"
-         y="394.19653"
-         id="tspan4327">acc_nr()</tspan><tspan
-         sodipodi:role="line"
-         x="98.287842"
-         y="409.19653"
-         id="tspan4329">balance()</tspan><tspan
-         sodipodi:role="line"
-         x="98.287842"
-         y="424.19653"
-         id="tspan4331">istream &gt;&gt;</tspan><tspan
-         sodipodi:role="line"
-         x="98.287842"
-         y="439.19653"
-         id="tspan4333">ostream &lt;&lt;</tspan></text>
+         x="104.84036"
+         y="404.47629"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">number()</tspan><tspan
+         sodipodi:role="line"
+         x="104.84036"
+         y="420.47629"
+         id="tspan4327"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">acc_nr()</tspan><tspan
+         sodipodi:role="line"
+         x="104.84036"
+         y="436.47629"
+         id="tspan4329"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">balance()</tspan><tspan
+         sodipodi:role="line"
+         x="104.84036"
+         y="452.47629"
+         id="tspan4331"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">istream &gt;&gt;</tspan><tspan
+         sodipodi:role="line"
+         x="104.84036"
+         y="468.47629"
+         id="tspan4333"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">ostream &lt;&lt;</tspan></text>
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 180,862.36218 140,0"
-       id="path4335" />
+       style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 192,919.85299 H 341.33333"
+       id="path4335"
+       inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="190.91882"
-       y="881.74841"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="203.64674"
+       y="940.53162"
        id="text4337"><tspan
          sodipodi:role="line"
          id="tspan4339"
-         x="190.91882"
-         y="881.74841">Number()</tspan><tspan
-         sodipodi:role="line"
-         x="190.91882"
-         y="896.74841"
-         id="tspan4341">Name()</tspan><tspan
-         sodipodi:role="line"
-         x="190.91882"
-         y="911.74841"
-         id="tspan4343">==</tspan><tspan
-         sodipodi:role="line"
-         x="190.91882"
-         y="926.74841"
-         id="tspan4345">!=</tspan><tspan
-         sodipodi:role="line"
-         x="190.91882"
-         y="941.74841"
-         id="tspan4347">+= Mutation</tspan><tspan
-         sodipodi:role="line"
-         x="190.91882"
-         y="956.74841"
-         id="tspan4349">BAL()</tspan><tspan
-         sodipodi:role="line"
-         x="190.91882"
-         y="971.74841"
-         id="tspan4351">balance()</tspan><tspan
-         sodipodi:role="line"
-         x="190.91882"
-         y="986.74841"
-         id="tspan4353">sheet()</tspan><tspan
-         sodipodi:role="line"
-         x="190.91882"
-         y="1001.7484"
-         id="tspan4355">Postscript_sheet()</tspan><tspan
-         sodipodi:role="line"
-         x="190.91882"
-         y="1016.7484"
-         id="tspan4357">istream &gt;&gt;</tspan><tspan
-         sodipodi:role="line"
-         x="190.91882"
-         y="1031.7484"
-         id="tspan4359">ostream &lt;&lt;</tspan></text>
+         x="203.64674"
+         y="940.53162"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">Number()</tspan><tspan
+         sodipodi:role="line"
+         x="203.64674"
+         y="956.53162"
+         id="tspan4341"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">Name()</tspan><tspan
+         sodipodi:role="line"
+         x="203.64674"
+         y="972.53162"
+         id="tspan4343"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">==</tspan><tspan
+         sodipodi:role="line"
+         x="203.64674"
+         y="988.53162"
+         id="tspan4345"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">!=</tspan><tspan
+         sodipodi:role="line"
+         x="203.64674"
+         y="1004.5316"
+         id="tspan4347"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">+= Mutation</tspan><tspan
+         sodipodi:role="line"
+         x="203.64674"
+         y="1020.5316"
+         id="tspan4349"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">BAL()</tspan><tspan
+         sodipodi:role="line"
+         x="203.64674"
+         y="1036.5316"
+         id="tspan4351"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">balance()</tspan><tspan
+         sodipodi:role="line"
+         x="203.64674"
+         y="1052.5316"
+         id="tspan4353"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">sheet()</tspan><tspan
+         sodipodi:role="line"
+         x="203.64674"
+         y="1068.5316"
+         id="tspan4355"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">Postscript_sheet()</tspan><tspan
+         sodipodi:role="line"
+         x="203.64674"
+         y="1084.5316"
+         id="tspan4357"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">istream &gt;&gt;</tspan><tspan
+         sodipodi:role="line"
+         x="203.64674"
+         y="1100.5316"
+         id="tspan4359"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">ostream &lt;&lt;</tspan></text>
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 560,872.36218 140,0"
-       id="path4361" />
+       style="fill:none;stroke:#000000;stroke-width:1.06666672px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 597.33333,930.51966 H 746.66667"
+       id="path4361"
+       inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="572.75647"
-       y="893.26318"
+       style="font-style:normal;font-weight:normal;font-size:12.80000019px;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.06666672"
+       x="610.94025"
+       y="952.81409"
        id="text4363"><tspan
          sodipodi:role="line"
          id="tspan4365"
-         x="572.75647"
-         y="893.26318">Account [acc_nr]</tspan><tspan
-         sodipodi:role="line"
-         x="572.75647"
-         y="908.26318"
-         id="tspan4367">read()</tspan><tspan
-         sodipodi:role="line"
-         x="572.75647"
-         y="923.26318"
-         id="tspan4369">start()</tspan><tspan
-         sodipodi:role="line"
-         x="572.75647"
-         y="938.26318"
-         id="tspan4371">next()</tspan><tspan
-         sodipodi:role="line"
-         x="572.75647"
-         y="953.26318"
-         id="tspan4373">ostream &lt;&lt;</tspan><tspan
-         sodipodi:role="line"
-         x="572.75647"
-         y="968.26318"
-         id="tspan4375">accounts_report()</tspan><tspan
-         sodipodi:role="line"
-         x="572.75647"
-         y="983.26318"
-         id="tspan4377">saldi_report()</tspan><tspan
-         sodipodi:role="line"
-         x="572.75647"
-         y="998.26318"
-         id="tspan4379">XML_saldi()</tspan></text>
+         x="610.94025"
+         y="952.81409"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">Account [acc_nr]</tspan><tspan
+         sodipodi:role="line"
+         x="610.94025"
+         y="968.81409"
+         id="tspan4367"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">read()</tspan><tspan
+         sodipodi:role="line"
+         x="610.94025"
+         y="984.81409"
+         id="tspan4369"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">start()</tspan><tspan
+         sodipodi:role="line"
+         x="610.94025"
+         y="1000.8141"
+         id="tspan4371"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">next()</tspan><tspan
+         sodipodi:role="line"
+         x="610.94025"
+         y="1016.8141"
+         id="tspan4373"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">ostream &lt;&lt;</tspan><tspan
+         sodipodi:role="line"
+         x="610.94025"
+         y="1032.8141"
+         id="tspan4375"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">accounts_report()</tspan><tspan
+         sodipodi:role="line"
+         x="610.94025"
+         y="1048.8141"
+         id="tspan4377"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">saldi_report()</tspan><tspan
+         sodipodi:role="line"
+         x="610.94025"
+         y="1064.8141"
+         id="tspan4379"
+         style="font-size:12.80000019px;line-height:1.25;stroke-width:1.06666672">XML_saldi()</tspan></text>
   </g>
 </svg>
diff --git a/makefile b/makefile
index 90bf27b..09ce41c 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,6 @@
 
+CPPFLAGS = -Wall
+
 OBJS = account_main.o account.o postscript.o
 SRCS = account_main.cpp account.cpp postscript.cpp