From 3bc467f622e629cfaafa28e0b664bcd9758eb6ef Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Thu, 24 Sep 2015 21:58:32 +0200 Subject: [PATCH] Some more examples of tables by Mischa --- src/index.xhtml | 26 ++- .../tables/table_fill_colspan_with_char.pef | 82 +++++++ .../tables/table_fill_colspan_with_char.xml | 73 ++++++ .../tables/table_splitting_up_in_parts.pef | 142 ++++++++++++ .../tables/table_splitting_up_in_parts.xml | 214 ++++++++++++++++++ src/test/tables/test.xprocspec | 38 ++++ 6 files changed, 574 insertions(+), 1 deletion(-) create mode 100644 src/resources/tables/table_fill_colspan_with_char.pef create mode 100644 src/resources/tables/table_fill_colspan_with_char.xml create mode 100644 src/resources/tables/table_splitting_up_in_parts.pef create mode 100644 src/resources/tables/table_splitting_up_in_parts.xml diff --git a/src/index.xhtml b/src/index.xhtml index 2bdd299..eae1531 100644 --- a/src/index.xhtml +++ b/src/index.xhtml @@ -627,6 +627,17 @@ Example 3 +
  • + + Example 4: A wide table is split vertically into several parts. Row headers are + repeated for each part. + +
    • +
  • + + Example 5 + +
  • @@ -661,12 +672,18 @@ to render a certain table by trying several alternatives.
    • -
  • +

  • 4.4:62 The system shall be able to cope with column- and rowspan in tables (in a yet undefined way).

    +

    + + SBS example: In the case of matrix layout, a possibility is to fill up empty space in + a cell that spans several columns with some dot pattern. + +

  • @@ -709,6 +726,13 @@ with leaders.

    • +
  • + + Leaders may also be used in tables with more than two columns. In + this example a wide table is split vertically into several parts each existing of 4 + columns. + +
  • diff --git a/src/resources/tables/table_fill_colspan_with_char.pef b/src/resources/tables/table_fill_colspan_with_char.pef new file mode 100644 index 0000000..e66223e --- /dev/null +++ b/src/resources/tables/table_fill_colspan_with_char.pef @@ -0,0 +1,82 @@ + + + + + Ohne Titel + SBS + 0000-00-00 + application/x-pef+xml + org.pef-format.00002 + Ohnee Beschreibung + de + (liblouis-table:'http://www.sbs.ch/pipeline/liblouis/tables/sbs.dis') + + + + +
    + + + ⠩⠵⠑⠟⠉⠀⠸⠒⠒⠒⠒⠒⠒⠒⠒⠀⠎⠏⠻⠍⠊⠉⠀⠒⠒⠒⠒⠒⠒⠒⠒⠒⠇ + ⠀⠀⠀⠀⠀⠀⠘⠙⠓⠀⠀⠀⠀⠨⠙⠓⠀⠀⠀⠀⠠⠙⠘⠓⠀⠀⠀⠠⠙⠓ + ⠒⠒⠒⠒⠒⠀⠒⠒⠒⠒⠒⠒⠀⠒⠒⠒⠒⠒⠒⠀⠒⠒⠒⠒⠒⠒⠀⠒⠒⠒⠒⠒⠒ + ⠘⠙⠓⠀⠀⠀⠘⠙⠙⠓⠓⠀⠀⠘⠙⠙⠓⠠⠓⠀⠨⠙⠙⠘⠓⠓⠀⠨⠙⠙⠨⠓⠓ + ⠨⠙⠓⠀⠀⠀⠘⠙⠙⠓⠠⠓⠀⠘⠙⠙⠠⠓⠓⠀⠨⠙⠙⠨⠓⠓⠀⠨⠙⠙⠓⠓ + ⠠⠙⠘⠓⠀⠀⠨⠙⠙⠘⠓⠓⠀⠨⠙⠙⠨⠓⠓⠀⠠⠙⠙⠘⠓⠓⠀⠠⠙⠙⠨⠓⠓ + ⠠⠙⠓⠀⠀⠀⠨⠙⠙⠨⠓⠓⠀⠨⠙⠙⠓⠓⠀⠀⠠⠙⠙⠨⠓⠓⠀⠠⠙⠙⠓⠓ + + + + + + + + + + + + + + + + + + + + + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠼⠁ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +     + +     diff --git a/src/resources/tables/table_fill_colspan_with_char.xml b/src/resources/tables/table_fill_colspan_with_char.xml new file mode 100644 index 0000000..471b8f3 --- /dev/null +++ b/src/resources/tables/table_fill_colspan_with_char.xml @@ -0,0 +1,73 @@ +]> + + + + + + + + + + + + + + + + + + + + + + Test Tabelle + bla bla + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    EizellenSpermien
    DHDhdHdh
    DHDDHHDDHhDdHHDdHh
    DhDDHhDDhhDdHhDdhh
    dHDdHHDdHhddHHddHh
    dhDdHhDdhhddHhddhh
    +     +     +     +     diff --git a/src/resources/tables/table_splitting_up_in_parts.pef b/src/resources/tables/table_splitting_up_in_parts.pef new file mode 100644 index 0000000..fc2487e --- /dev/null +++ b/src/resources/tables/table_splitting_up_in_parts.pef @@ -0,0 +1,142 @@ + + + + + Ohne Titel + SBS + 0000-00-00 + application/x-pef+xml + org.pef-format.00002 + Ohnee Beschreibung + de + (liblouis-table:'http://www.sbs.ch/pipeline/liblouis/tables/sbs.dis') + + + + +
    + + + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠼⠋⠁⠋⠄⠚⠚⠚⠀⠼⠋⠁⠋⠄⠃⠑⠚⠀⠼⠋⠁⠋⠄⠑⠚⠚ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠒⠒⠒⠒⠒⠒⠒⠒⠀⠒⠒⠒⠒⠒⠒⠒⠒⠀⠒⠒⠒⠒⠒⠒⠒⠒ + ⠼⠁⠋⠛⠄⠚⠚⠚⠀⠼⠁⠋⠛⠚⠀⠄⠄⠀⠼⠁⠛⠚⠚⠀⠄⠄⠀⠼⠁⠋⠓⠚ + ⠼⠁⠋⠋⠄⠛⠑⠚⠀⠼⠁⠓⠓⠚⠀⠄⠄⠀⠼⠁⠓⠋⠚⠀⠄⠄⠀⠼⠁⠛⠓⠚ + ⠼⠁⠋⠋⠄⠑⠚⠚⠀⠼⠃⠚⠃⠚⠀⠄⠄⠀⠼⠃⠚⠋⠚⠀⠄⠄⠀⠼⠁⠊⠊⠚ + ⠼⠁⠋⠋⠄⠃⠑⠚⠀⠼⠃⠁⠚⠚⠀⠄⠄⠀⠼⠃⠃⠓⠚⠀⠄⠄⠀⠼⠃⠁⠓⠚ + ⠼⠁⠋⠋⠄⠚⠚⠚⠀⠤⠤⠤⠀⠄⠄⠄⠄⠀⠤⠤⠤⠀⠄⠄⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠑⠄⠛⠑⠚⠀⠼⠃⠁⠛⠚⠀⠄⠄⠀⠼⠃⠁⠋⠚⠀⠄⠄⠀⠼⠃⠁⠃⠚ + ⠼⠁⠋⠑⠄⠑⠚⠚⠀⠼⠃⠚⠓⠚⠀⠄⠄⠀⠼⠁⠊⠊⠚⠀⠄⠄⠀⠼⠁⠊⠊⠚ + ⠼⠁⠋⠑⠄⠃⠑⠚⠀⠼⠁⠊⠃⠚⠀⠄⠄⠀⠼⠁⠓⠓⠚⠀⠄⠄⠀⠼⠁⠓⠋⠚ + ⠼⠁⠋⠑⠄⠚⠚⠚⠀⠼⠁⠓⠚⠚⠀⠄⠄⠀⠼⠁⠛⠋⠚⠀⠄⠄⠀⠼⠁⠛⠉⠚ + ⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠼⠋⠁⠋⠄⠛⠑⠚⠀⠼⠋⠁⠛⠄⠚⠚⠚⠀⠼⠋⠁⠛⠄⠃⠑⠚ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠒⠒⠒⠒⠒⠒⠒⠒⠀⠒⠒⠒⠒⠒⠒⠒⠒⠀⠒⠒⠒⠒⠒⠒⠒⠒ + ⠼⠁⠋⠛⠄⠚⠚⠚⠀⠼⠁⠑⠃⠚⠀⠄⠄⠀⠼⠁⠃⠋⠚⠀⠄⠄⠀⠼⠁⠁⠋⠚ + ⠼⠁⠋⠋⠄⠛⠑⠚⠀⠼⠁⠋⠚⠚⠀⠄⠄⠀⠼⠁⠙⠚⠚⠀⠄⠄⠀⠼⠁⠃⠃⠚ + ⠼⠁⠋⠋⠄⠑⠚⠚⠀⠼⠁⠛⠉⠚⠀⠄⠄⠀⠼⠁⠑⠛⠚⠀⠄⠄⠀⠼⠁⠑⠃⠚ + ⠼⠁⠋⠋⠄⠃⠑⠚⠀⠼⠁⠓⠓⠚⠀⠄⠄⠀⠼⠁⠛⠓⠚⠀⠄⠄⠀⠼⠁⠋⠛⠚ + ⠼⠁⠋⠋⠄⠚⠚⠚⠀⠤⠤⠤⠀⠄⠄⠄⠄⠀⠤⠤⠤⠀⠄⠄⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠑⠄⠛⠑⠚⠀⠼⠁⠊⠃⠚⠀⠄⠄⠀⠼⠁⠓⠋⠚⠀⠄⠄⠀⠼⠁⠛⠋⠚ + ⠼⠁⠋⠑⠄⠑⠚⠚⠀⠼⠁⠓⠓⠚⠀⠄⠄⠀⠼⠁⠛⠙⠚⠀⠄⠄⠀⠼⠁⠋⠉⠚ + ⠼⠁⠋⠑⠄⠃⠑⠚⠀⠼⠁⠛⠙⠚⠀⠄⠄⠀⠼⠁⠛⠚⠚⠀⠄⠄⠀⠼⠁⠑⠃⠚ + ⠼⠁⠋⠑⠄⠚⠚⠚⠀⠼⠁⠋⠙⠚⠀⠄⠄⠀⠼⠁⠑⠓⠚⠀⠄⠄⠀⠼⠁⠙⠛⠚ + + + + + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠼⠁ + + + ⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠼⠋⠁⠛⠄⠑⠚⠚⠀⠼⠋⠁⠛⠄⠛⠑⠚⠀⠼⠋⠁⠓⠄⠚⠚⠚ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠒⠒⠒⠒⠒⠒⠒⠒⠀⠒⠒⠒⠒⠒⠒⠒⠒⠀⠒⠒⠒⠒⠒⠒⠒⠒ + ⠼⠁⠋⠛⠄⠚⠚⠚⠀⠼⠁⠚⠉⠚⠀⠄⠄⠀⠼⠁⠚⠃⠚⠀⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠋⠄⠛⠑⠚⠀⠼⠁⠃⠚⠚⠀⠄⠄⠀⠼⠁⠁⠚⠚⠀⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠋⠄⠑⠚⠚⠀⠼⠁⠉⠙⠚⠀⠄⠄⠀⠼⠁⠃⠚⠚⠀⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠋⠄⠃⠑⠚⠀⠼⠁⠙⠋⠚⠀⠄⠄⠀⠼⠁⠉⠋⠚⠀⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠋⠄⠚⠚⠚⠀⠤⠤⠤⠀⠄⠄⠄⠄⠀⠤⠤⠤⠀⠄⠄⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠑⠄⠛⠑⠚⠀⠼⠁⠋⠓⠚⠀⠄⠄⠀⠼⠁⠑⠉⠚⠀⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠑⠄⠑⠚⠚⠀⠼⠁⠑⠓⠚⠀⠄⠄⠀⠼⠁⠙⠚⠚⠀⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠑⠄⠃⠑⠚⠀⠼⠁⠙⠋⠚⠀⠄⠄⠀⠼⠁⠑⠚⠚⠀⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠑⠄⠚⠚⠚⠀⠼⠁⠉⠓⠚⠀⠄⠄⠀⠼⠁⠙⠚⠚⠀⠄⠄⠀⠤⠤⠤ + ⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠼⠋⠁⠓⠄⠃⠑⠚⠀⠼⠋⠁⠓⠄⠑⠚⠚⠀⠼⠋⠁⠓⠄⠛⠑⠚ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠒⠒⠒⠒⠒⠒⠒⠒⠀⠒⠒⠒⠒⠒⠒⠒⠒⠀⠒⠒⠒⠒⠒⠒⠒⠒ + ⠼⠁⠋⠛⠄⠚⠚⠚⠀⠼⠛⠚⠚⠀⠄⠄⠄⠀⠼⠋⠛⠚⠀⠄⠄⠄⠀⠼⠛⠚⠚ + ⠼⠁⠋⠋⠄⠛⠑⠚⠀⠼⠛⠓⠚⠀⠄⠄⠄⠀⠼⠛⠃⠚⠀⠄⠄⠄⠀⠼⠋⠓⠚ + ⠼⠁⠋⠋⠄⠑⠚⠚⠀⠼⠓⠋⠚⠀⠄⠄⠄⠀⠼⠓⠚⠚⠀⠄⠄⠄⠀⠼⠛⠃⠚ + ⠼⠁⠋⠋⠄⠃⠑⠚⠀⠼⠊⠋⠚⠀⠄⠄⠄⠀⠼⠓⠋⠚⠀⠄⠄⠄⠀⠼⠛⠑⠚ + ⠼⠁⠋⠋⠄⠚⠚⠚⠀⠤⠤⠤⠀⠄⠄⠄⠄⠀⠤⠤⠤⠀⠄⠄⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠑⠄⠛⠑⠚⠀⠼⠁⠃⠚⠚⠀⠄⠄⠀⠼⠊⠊⠚⠀⠄⠄⠄⠀⠼⠓⠋⠚ + ⠼⠁⠋⠑⠄⠑⠚⠚⠀⠼⠁⠁⠓⠚⠀⠄⠄⠀⠼⠁⠚⠚⠚⠀⠄⠄⠀⠼⠓⠓⠚ + ⠼⠁⠋⠑⠄⠃⠑⠚⠀⠼⠁⠃⠚⠚⠀⠄⠄⠀⠼⠁⠚⠁⠚⠀⠄⠄⠀⠼⠊⠃⠚ + ⠼⠁⠋⠑⠄⠚⠚⠚⠀⠼⠁⠃⠃⠚⠀⠄⠄⠀⠼⠁⠚⠉⠚⠀⠄⠄⠀⠼⠊⠃⠚ + + + + + + + ⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠼⠋⠁⠊⠄⠚⠚⠚⠀⠼⠋⠁⠊⠄⠃⠑⠚⠀⠼⠋⠁⠊⠄⠑⠚⠚ + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠒⠒⠒⠒⠒⠒⠒⠒⠀⠒⠒⠒⠒⠒⠒⠒⠒⠀⠒⠒⠒⠒⠒⠒⠒⠒ + ⠼⠁⠋⠛⠄⠚⠚⠚⠀⠼⠛⠑⠚⠀⠄⠄⠄⠀⠼⠓⠃⠚⠀⠄⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠋⠄⠛⠑⠚⠀⠼⠛⠚⠚⠀⠄⠄⠄⠀⠼⠓⠚⠚⠀⠄⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠋⠄⠑⠚⠚⠀⠼⠋⠓⠚⠀⠄⠄⠄⠀⠼⠛⠙⠚⠀⠄⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠋⠄⠃⠑⠚⠀⠼⠛⠚⠚⠀⠄⠄⠄⠀⠼⠛⠁⠚⠀⠄⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠋⠄⠚⠚⠚⠀⠤⠤⠤⠀⠄⠄⠄⠄⠀⠤⠤⠤⠀⠄⠄⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠑⠄⠛⠑⠚⠀⠼⠛⠑⠚⠀⠄⠄⠄⠀⠼⠋⠊⠚⠀⠄⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠑⠄⠑⠚⠚⠀⠼⠛⠛⠚⠀⠄⠄⠄⠀⠼⠋⠊⠚⠀⠄⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠑⠄⠃⠑⠚⠀⠼⠓⠚⠚⠀⠄⠄⠄⠀⠼⠋⠊⠚⠀⠄⠄⠄⠀⠤⠤⠤ + ⠼⠁⠋⠑⠄⠚⠚⠚⠀⠼⠓⠃⠚⠀⠄⠄⠄⠀⠼⠋⠊⠚⠀⠄⠄⠄⠀⠤⠤⠤ + ⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂⠂ + + + + + + + + + + + + + + + ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠼⠉ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +     + +     diff --git a/src/resources/tables/table_splitting_up_in_parts.xml b/src/resources/tables/table_splitting_up_in_parts.xml new file mode 100644 index 0000000..ae01684 --- /dev/null +++ b/src/resources/tables/table_splitting_up_in_parts.xml @@ -0,0 +1,214 @@ +]> + + + + + + + + + + + + + + + + + + + + + + Test Tabelle + bla bla + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + 616'000616'250616'500616'750617'000617'250617'500617'750618'000618'250618'500618'750619'000619'250619'500
    167'00016701700168015201260116010301020---700670700750820---
    166'75018801860178016001400122012001100---780720680700800---
    166'50020202060199017301570152013401200---860800720680740---
    166'25021002280218018801780167014601360---960860750700710---
    166'000---------------------------------------------
    165'75021702160212019201860176016801530---1200990860750690---
    165'50020801990199018801740163015801400---11801000880770690---
    165'25019201880186017401700152014601500---12001010920800690---
    165'00018001760173016401580147013801400---12201030920820690---
    +     +     +     +     diff --git a/src/test/tables/test.xprocspec b/src/test/tables/test.xprocspec index d49de86..a1b4c0b 100644 --- a/src/test/tables/test.xprocspec +++ b/src/test/tables/test.xprocspec @@ -78,4 +78,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +