From 5e6a1c3dba297e455f38e6496735a9cbd0dc36b8 Mon Sep 17 00:00:00 2001 From: Dirk Roorda Date: Thu, 10 Feb 2022 11:06:02 +0100 Subject: [PATCH] improved dataversion 0.3 --- README.md | 2 + docs/transcription.md | 48 +- parallels/tf/0.3/sim.tf | 398 + programs/parallels.ipynb | 667 +- programs/tfFromJson.py | 127 +- tf/0.3/after.tf | 25848 +++++++++++++++++----------------- tf/0.3/atf.tf | 2 +- tf/0.3/atfpost.tf | 3323 ++++- tf/0.3/atfpre.tf | 3041 +++- tf/0.3/col.tf | 2 +- tf/0.3/collated.tf | 2 +- tf/0.3/collection.tf | 2 +- tf/0.3/colofon.tf | 2 +- tf/0.3/comment.tf | 4 +- tf/0.3/damage.tf | 2 +- tf/0.3/description.tf | 2 +- tf/0.3/det.tf | 2 +- tf/0.3/docnumber.tf | 2 +- tf/0.3/erasure.tf | 2 +- tf/0.3/excised.tf | 2 +- tf/0.3/face.tf | 2 +- tf/0.3/flags.tf | 2 +- tf/0.3/gloss.tf | 2 +- tf/0.3/grapheme.tf | 2 +- tf/0.3/lang.tf | 2 +- tf/0.3/lemma.tf | 2 +- tf/0.3/lln.tf | 2 +- tf/0.3/ln.tf | 2 +- tf/0.3/lnno.tf | 2 +- tf/0.3/missing.tf | 2 +- tf/0.3/modifiers.tf | 2 +- tf/0.3/museum.tf | 2 +- tf/0.3/note.tf | 6 +- tf/0.3/number.tf | 2 +- tf/0.3/oslots.tf | 2 +- tf/0.3/otext.tf | 2 +- tf/0.3/otype.tf | 2 +- tf/0.3/pnumber.tf | 2 +- tf/0.3/primecol.tf | 2 +- tf/0.3/primeln.tf | 2 +- tf/0.3/publication.tf | 2 +- tf/0.3/question.tf | 2 +- tf/0.3/reading.tf | 2 +- tf/0.3/remarkable.tf | 2 +- tf/0.3/ruling.tf | 4 +- tf/0.3/seal.tf | 2 +- tf/0.3/supplied.tf | 2 +- tf/0.3/sym.tf | 2 +- tf/0.3/tr@en.tf | 4 +- tf/0.3/trans.tf | 2 +- tf/0.3/type.tf | 2 +- tf/0.3/uncertain.tf | 2 +- tf/0.3/variant.tf | 2 +- tutorial/display.ipynb | 1154 +- tutorial/exportExcel.ipynb | 449 +- tutorial/search.ipynb | 716 +- tutorial/similarLines.ipynb | 454 +- tutorial/start.ipynb | 701 +- 58 files changed, 21846 insertions(+), 15182 deletions(-) create mode 100644 parallels/tf/0.3/sim.tf diff --git a/README.md b/README.md index 75c022f..346fd0a 100644 --- a/README.md +++ b/README.md @@ -56,4 +56,6 @@ Click the DOI badge to be taken to the archive. There you find ways to cite this # Status +* 2022-02-10 Improved conversion results, + encoding decisions are now in better agreement with Old Babylonian and Old Assyrian * 2022-02-06 First conversion result delivered as fully functional TF corpus. diff --git a/docs/transcription.md b/docs/transcription.md index 0638609..9fd4fca 100644 --- a/docs/transcription.md +++ b/docs/transcription.md @@ -54,37 +54,41 @@ There are several types of sign, stored in the feature `type`. type | examples | description ------- | ------ | ------ -`reading` | `ma` `qa2` | normal cintent sign with a reading (lowercase) -`unknown` | `x` `n` | representation of an unknown sign, the `n` stands for an unknown numeral -`numeral` | `5` `5/6` | a numeral, either with a repeat or with a fraction `ellipsis` | `...` | representation of an unknown number of missing signs -`erasure` | `° \ °` | representation of an erasure -`grapheme` | `ARAD2` `GAN2` | cintent sign given as a grapheme (uppercase) -`joiner` | `-` `.` | in-word character that joins two content signs -`wdiv` | ` / ` | word divider -`mark` | `[` `(` | any character that is not a reading or grapheme in itself -`lang` | ` %sux %sb %akk ` | language shift `empty` | | empty sign, usually due to an empty line +`grapheme` | `ARAD2` `GAN2` | content sign given as a grapheme (uppercase) +`numeral` | `5` `5/6` | a numeral, either with a repeat or with a fraction +`reading` | `ma` `qa2` | normal content sign with a reading (lowercase), may contain a grapheme as well as in `raš!(BI)` +`unknown` | `x` `n` | representation of an unknown sign, the `n` stands for an unknown numeral +`wdiv` | ` / ` | word divider feature | example values | description ------- | ------ | ------ **after** | `-` ` ` | what comes after a sign before the next sign **atf** | `lam` `GIG` | full atf of a sign +**atfpost** | `}` | clustering characters attached at the end of a sign +**atfpre** | `{` | clustering characters attached at the start of a sign **collated** | `1` | indicates the presence of the *collated* flag `*` **comment** | `(erased line)` | value of a comment **damage** | `1` | indicates the presence of the *damage* flag `#` **det** | `1` | indicates whether the sign is (part of) a determinative, marked by being within braces `{ }` +**erasure** | `1` `2` | whether the sign is in an erasure; the value is `1` if `°` and ` \ `; the value is `2` if between ` \ ` and `°` **excised** | `1` | whether a sign is excised by the editor, marked by being within double angle brackets `<< >>` +**flags** | `#` `?` | flags that follow a sign +**gloss** | `1` | whether a sign is a gloss, marked by being within `{( )}` **grapheme**| `GIG` | the grapheme name of a [*sign*](#sign) when its atf is capitalized -**lang** | `sux` `akk` `sb` | language shift: `sux` = Sumerian; `akk` = Akkadian; `sb` = Standard Babylonian +**lang** | `sux` `sb` | language shift: `sux` = Sumerian; absent = Akkadian; `sb` = Standard Babylonian **missing** | `1` | whether a sign is missing, marked by being within square brackets `[ ]` +**modifiers** | `@v` | modifiers that follow a sign +**number** | `3` | numeric value of a sign with type `numeral` **question** | `1` | indicates the presence of the *question* flag `?` **reading** | `lam` | reading (lowercase) of a sign **remarkable** | `1` | indicates the presence of the *remarkable* flag `!` -**sym**| `lam` `GIG` | essential parts of a sign, composed of **reading**, **grapheme** +**sym** | `lam` `GIG` | essential parts of a sign, composed of **reading**, **grapheme** **supplied** | `1` | whether a sign is supplied by the editor, marked by being within angle brackets `< >` **type** | type of sign, see table above **uncertain** | `1` | whether a sign is uncertain, marked by being within brackets `( )` +**variant** | `1` `2` | whether the sign is in variant pair, separated by '/'; the value is `1` for the first member of the pair and `2` for the second member ## Node type [*word*](#word) @@ -96,6 +100,7 @@ feature | example values | description ------- | ------ | ------ **after** | ` ` | | what comes after a word before the next word, including word dividers **atf**| `šu-ru-uš#` | full atf of a word, including flags and clustering characters, but no word dividers +**lemma** | `pilšu` | the lemma of the word **sym**| `šu-ru-uš` | essential parts of a word, composed of the **sym** values of its individual signs ## Node type [*cluster*](#cluster) @@ -108,15 +113,17 @@ The type of a cluster is stored in the feature `type`. type | examples | description ------- | ------ | ------ -`langalt` | `_ _` | alternate language `det` | `{ }` | gloss, determinative -`uncertain` | `( )` | uncertain +`erasure` | `° \ °` | erasure: two parts, before a and after the ` \ ` +`excised` | `<< >>` | excised by the editor in order to get a reading +`langalt` | `_ _` | alternate language `missing` | `[ ]` | missing `supplied` | `< >` | supplied by the editor in order to get a reading -`excised` | `<< >>` | excised by the editor in order to get a reading +`uncertain` | `( )` | uncertain Each cluster induces a sign feature with the same name as the type of the cluster, which gets value 1 precisely when the sign is in that cluster. +For erasures, the first part gets value 1, the second part value 2. ## Node type [*line*](#line) @@ -124,14 +131,17 @@ Subdivision of a containing [*face*](#face). Corresponds to a transcription or comment line in the source data. feature | example values | description -------- | ------ | ------ | ----------- +------- | ------ | ------ +**atf**| `1'. D[U₃.DU₃.BI ...]` | full atf of a line **col** | `1` | number of the column in which the line occurs; without prime, see also `primecol` **ln** | `1` | ATF line number of a numbered transcription line; without prime, see also `primeln` **lln** | `1` | logical line number within a face: a number from 1 to the number of lines on the face **lnno** | `1:1` | combination of **col**, **primecol**, **ln**, **primeln** to identify a line +**note** | `pace CADS242a` | note or comment to a line **primecol** | `1` | whether the column number has a prime `'` **primeln** | `1` | whether the line number has a prime `'` -**atf**| `1'. D[U₃.DU₃.BI ...]` | full atf of a line +**ruling** | `single ruling` | ruling comment to a line +**seal** | `about 20 lines missing` | seal comment to a line **trans** | `1` | indicates whether a line has a translation (in the form of a following meta line (`#tr.en`)) **tr@en** | `If a man suffers from phlegm` | English translation in the form of a meta line (`#tr.en`) @@ -141,7 +151,7 @@ One of the sides of an *object* belonging to a document [*document*](#document). In most cases, the object is a *tablet*, but it can also be an *envelope*, or yet an other kind of object. feature | example values | description -------- | ------ | ------ | ----------- +------- | ------ | ------ **face** | `obverse` `reverse` | type of face ## Node type [*document*](#document) @@ -149,8 +159,8 @@ feature | example values | description The main entity of which the corpus is composed, representing the transcription of all objects associated with it. -feature | values | in ATF | description -------- | ------ | ------ | ----------- +feature | example values | description +------- | ------ | ------ **collection** | `Kuyunjik` | the collection in which a document is included **description** | `Fragment of a clay tablet` | short description **docnumber** | `K.11317` | identification diff --git a/parallels/tf/0.3/sim.tf b/parallels/tf/0.3/sim.tf new file mode 100644 index 0000000..cc4a687 --- /dev/null +++ b/parallels/tf/0.3/sim.tf @@ -0,0 +1,398 @@ +@edge +@edgeValues +@converters=Cale Johnson, Dirk Roorda +@description=similarity between lines, as a percentage of the common material wrt the combined material +@editor=Cale Johnson et. al. +@institute=Institut für Wissensgeschichte des Altertums +@name=Nineveh Medical Encyclopedia Cuneiform +@valueType=int +@writtenBy=Text-Fabric +@dateWritten=2022-02-10T07:40:36Z + +59315 59324,59787,61647 100 +59319 61949 80 +59324 59787,61647 100 +59333 59764 83 +59345 59346,59773 100 +59773 100 +59363 60263 88 +59368 59914 81 +59372 59921 100 +59376 60380 100 +59381 59391 100 +59384 59388 80 +59392 59393 100 +59417 59419 100 +59421 100 +59424 59428 100 +59443 61275 81 +59455 59457 82 +59463 60993 100 +59470 59481 80 +59506 59552,59588,59597,59611 100 +59511 59608 100 +59593 80 +59512 59599 89 +59528 59590 100 +59550 60982 80 +59552 59588,59597,59611 100 +59588 59597,59611 100 +59593 59599 89 +60856-60857,60859,61969-61971 100 +59597 59611 100 +59606 59942,62290-62291 100 +59944 100 +59637 61513 100 +61149 86 +59640 60841 86 +59642 60802 80 +59642 61421 81 +59642 61774,62240 83 +59642 60409 93 +60160,60410,61543,61775,62241 88 +59643 60803 100 +60161,60411,60804,62379 83 +59644 59893,61436,61544,61776,62242 91 +61545 82 +59645 59894,60412,60805,61437,61777,62243,62380 100 +60413 100 +60808 81 +59647 61780,62382 93 +59647 59897,60164,60414,61440,61548,62246 100 +59693 59694 81 +59775 59811 100 +59780 59805 83 +59784 59810 80 +59787 61647 100 +59868 61668 94 +59889 61973 93 +62239 93 +61542 81 +60160,60410,61543,61775,62241 88 +60161,60411,60804,62379 91 +59893 61436,61544,61776,62242 100 +61545 82 +59894 60412,60805,61437,61777,62243,62380 100 +61778 88 +59895 60806,61438,61546,62244 100 +60807 85 +59896 61439,61547,61779,62245 100 +60808 81 +59897 61780,62382 93 +59897 60164,60414,61440,61548,62246 100 +61493 100 +61500 86 +59899 61494 100 +59901 61496 90 +61497 80 +59913 59919,59922 88 +59919 59952 88 +59919 59922 100 +59922 59952 88 +59927 61145 80 +59927 61153 100 +59938 59939 100 +59942 62290-62291 100 +59945 59950 80 +59949 60011 80 +59952 59956 84 +59965 59966 93 +59980 60000 81 +59982 60128 81 +60001 61357 100 +60018 60046 82 +60018 60041 83 +60020 60046 83 +60020 60021-60022 92 +60022 100 +60026 60042-60043 100 +60040 60045 100 +60046 83 +60043 100 +60157 62376 80 +60157 61420 90 +60157 60408,61541 100 +60160 60803,61422,62378 88 +60160 60410,61543,61775,62241 100 +60804 83 +60161 61436,61544,61776,62242 91 +60161 60411,62379 100 +60164 60808 81 +60164 61780,62382 93 +60164 60414,61440,61548,62246 100 +60193 60196 100 +60200 61490,61507,61509,62371 100 +60253 60258 100 +60257 100 +60306 60333 100 +60386 61523 100 +60389 61526 80 +60404 61536 100 +60407 61540 100 +62376 80 +60408 61420 90 +60408 61541 100 +60802 80 +60409 61421 87 +60409 61774,62240 90 +60803,61422,62378 88 +60410 61543,61775,62241 100 +60804 83 +60411 61436,61544,61776,62242 91 +60411 62379 100 +61545 82 +60412 60805,61437,61777,62243,62380 100 +60414 60808 81 +60414 61780,62382 93 +60414 61440,61548,62246 100 +60459 60463,60469 100 +60461 60471 93 +60463 60469 100 +60474 60486 89 +60489 60492 89 +60499 60619 89 +60536 61719,62032 80 +60670-60672,60684,60686 100 +60560 60572,60576 86 +60560 60565 100 +60563 60571 95 +60565 60572,60576 86 +60572 60576 100 +60595 60597 81 +60628 60634 86 +60628 60629-60630 100 +60634 86 +60629 60630 100 +60634 86 +60633 89 +60642 60646 83 +60663 60674,60685,60687 100 +60691 80 +60666 100 +60670 60671-60672,60684,60686 100 +60672,60684,60686 100 +60684,60686 100 +60674 60685,60687 100 +60676 60677 100 +60678 60679-60681,60688,61483 100 +60680-60681,60688,61483 100 +60681,60688,61483 100 +60688,61483 100 +60684 60686 100 +60687 100 +60688 61483 100 +60695 60697-60698 100 +60697 60698 100 +60759 61344-61345 100 +60763 60769 100 +60802 61421 86 +60802 61774,62240 89 +61543,61775,62241 88 +62379 83 +60804 61436,61544,61776,62242 91 +61545 82 +60805 61437,61777,62243,62380 100 +61778 88 +60806 61438,61546,62244 100 +61439,61547,61779,62245 85 +61440,61548,62246 81 +60808 61780,62382 88 +60856 60857,60859,61969-61971 100 +60859,61969-61971 100 +60859 61969-61971 100 +60913 60914 100 +60919 60920 80 +60950 61811 100 +61510 100 +60960 61129 87 +61130 92 +61131 96 +61132 100 +61133 100 +60999 61155 100 +61156 95 +61004,61010,61160,61166 82 +61001 61157 100 +61003 61159 100 +61157 82 +61004 61010,61160,61166 100 +61161 100 +61162 100 +61163 100 +61164 100 +61165 86 +61157 82 +61010 61160,61166 100 +61167 100 +61168 100 +61169 100 +61170 100 +61171 100 +61172 100 +61173 95 +61174 88 +61175 100 +61176 100 +61177 100 +61031,61042,61178,61187,61199 100 +61043 83 +61023 61032 85 +61023 61179 100 +61180 88 +61181 100 +61182 100 +61183 100 +61184 85 +61048,61205,61224 88 +61029 61040,61108,61185,61197,61213,61250,61254 100 +61186 100 +61042,61178,61187,61199 100 +61179 85 +61189 92 +61035 61192 83 +61037 61194 90 +61195 100 +61196 100 +61048,61205,61224 88 +61040 61108,61185,61197,61213,61250,61254 100 +61198 100 +61178,61187,61199 100 +61179 83 +61043 61200 91 +61201 100 +61202 100 +61203 95 +61204 100 +61108,61185,61197,61213,61250,61254 88 +61048 61205,61224 100 +61206 100 +61207 100 +61208 100 +61209 100 +61210 100 +61211 93 +61057 61073,61220 92 +61057 61064,61080,61228 100 +61215 100 +61216 100 +61217 100 +61218 100 +61219 100 +61064 61073,61220 92 +61064 61080,61228 100 +61073 61080,61228 92 +61073 61220 100 +61075 61222 100 +61223 100 +61080 61220 92 +61080 61228 100 +61082 61086,61232 100 +61229 88 +61230 100 +61231 100 +61232 100 +61233 100 +61234 100 +61094 61240 100 +61241 100 +61104 61246 100 +61247 100 +61248 100 +61249 100 +61205,61224 88 +61108 61185,61197,61213,61250,61254 100 +61251 94 +61145 61153 80 +61157 61160,61166 82 +61160 61166 100 +61178 61187,61199 100 +61185 61205,61224 88 +61185 61197,61213,61250,61254 100 +61187 61199 100 +61197 61205,61224 88 +61197 61213,61250,61254 100 +61205 61213,61250,61254 88 +61205 61224 100 +61213 61224 88 +61213 61250,61254 100 +61220 61228 92 +61224 61250,61254 88 +61250 61254 100 +61328 61379 82 +61330 61339 82 +61330 62256 100 +61338 62255 100 +62256 82 +61344 61345 100 +61352 62251 83 +61352 62248 100 +62249 100 +61360 62387 100 +61381 61384,61387,61392 100 +61384 61387,61392 100 +61387 61392 100 +61400 61403 80 +61420 61541 90 +61774,62240 96 +61543,61775,62241 88 +61422 62378 100 +61436 62379 91 +61436 61544,61776,62242 100 +61545 82 +61437 61777,62243,62380 100 +61778 88 +61438 61546,62244 100 +61547,61779,62245 100 +61780,62382 93 +61440 61548,62246 100 +61459 61460 81 +61464 61466 83 +61481 61487 100 +61488 61495 80 +61490 61507,61509,62371 100 +61492 61504-61505 80 +61494 61500 86 +61498 61502 100 +61504 61505 100 +61506 61720 100 +61509,62371 100 +61509 62371 100 +61541 62376 80 +61543 62378 88 +61543 61775,62241 100 +62379 91 +61544 61776,62242 100 +61777,62243,62380 82 +61778 88 +61546 62244 100 +61779,62245 100 +61780,62382 93 +61548 62246 100 +62238 89 +61705 61767 88 +61774 62240 100 +62378 88 +61775 62241 100 +62379 91 +61776 62242 100 +62243,62380 100 +62244 88 +62245 100 +62246 93 +61780 62382 100 +61810 61816 91 +61810 61813 100 +61813 61816 91 +61841 61845 100 +61969 61970-61971 100 +61971 100 +62031 62033 100 +62200 62210 87 +62241 62378 88 +62379 91 +62380 100 +62246 62382 93 +62248 62251 83 +62269 62384 100 +62271 62385 100 +62290 62291 100 diff --git a/programs/parallels.ipynb b/programs/parallels.ipynb index 46ee79f..6d920e8 100644 --- a/programs/parallels.ipynb +++ b/programs/parallels.ipynb @@ -44,7 +44,7 @@ { "data": { "text/html": [ - "data: ~/github/Nino-cunei/ninmed/tf/0.2" + "data: ~/github/Nino-cunei/ninmed/tf/0.3" ], "text/plain": [ "" @@ -60,7 +60,7 @@ "This is Text-Fabric 9.2.5\n", "Api reference : https://annotation.github.io/text-fabric/tf/cheatsheet.html\n", "\n", - "45 features found and 0 ignored\n" + "48 features found and 0 ignored\n" ] }, { @@ -72,7 +72,7 @@ "\n", "
\n", "
\n", - "after\n", + "after\n", "
\n", "
str
\n", "
\n", @@ -86,7 +86,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:36Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -115,7 +115,7 @@ "\n", "
\n", "
\n", - "atf\n", + "atf\n", "
\n", "
str
\n", "
\n", @@ -129,7 +129,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -158,7 +158,93 @@ "\n", "
\n", "
\n", - "col\n", + "atfpost\n", + "
\n", + "
str
\n", + "
\n", + " cluster characters that follow a sign or word\n", + "
\n", + "\n", + "
\n", + "
converters:
\n", + "
Cale Johnson, Dirk Roorda
\n", + "
\n", + "\n", + "
\n", + "
dateWritten:
\n", + "
2022-02-10T07:10:40Z
\n", + "
\n", + "\n", + "
\n", + "
editor:
\n", + "
Cale Johnson et al.
\n", + "
\n", + "\n", + "
\n", + "
name:
\n", + "
NinMed Medical Texts from Nineveh
\n", + "
\n", + "\n", + "
\n", + "
project:
\n", + "
BabMed
\n", + "
\n", + "\n", + "
\n", + "
writtenBy:
\n", + "
Text-Fabric
\n", + "
\n", + "\n", + "
\n", + "
\n", + "
\n", + "\n", + "
\n", + "
\n", + "atfpre\n", + "
\n", + "
str
\n", + "
\n", + " cluster characters that precede a sign or word\n", + "
\n", + "\n", + "
\n", + "
converters:
\n", + "
Cale Johnson, Dirk Roorda
\n", + "
\n", + "\n", + "
\n", + "
dateWritten:
\n", + "
2022-02-10T07:10:40Z
\n", + "
\n", + "\n", + "
\n", + "
editor:
\n", + "
Cale Johnson et al.
\n", + "
\n", + "\n", + "
\n", + "
name:
\n", + "
NinMed Medical Texts from Nineveh
\n", + "
\n", + "\n", + "
\n", + "
project:
\n", + "
BabMed
\n", + "
\n", + "\n", + "
\n", + "
writtenBy:
\n", + "
Text-Fabric
\n", + "
\n", + "\n", + "
\n", + "
\n", + "
\n", + "\n", + "
\n", + "
\n", + "col\n", "
\n", "
int
\n", "
\n", @@ -172,7 +258,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -201,7 +287,7 @@ "\n", "
\n", "
\n", - "collated\n", + "collated\n", "
\n", "
int
\n", "
\n", @@ -215,7 +301,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -244,7 +330,7 @@ "\n", "
\n", "
\n", - "collection\n", + "collection\n", "
\n", "
str
\n", "
\n", @@ -258,7 +344,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -287,7 +373,7 @@ "\n", "
\n", "
\n", - "colofon\n", + "colofon\n", "
\n", "
str
\n", "
\n", @@ -301,7 +387,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -330,7 +416,7 @@ "\n", "
\n", "
\n", - "comment\n", + "comment\n", "
\n", "
str
\n", "
\n", @@ -344,7 +430,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -373,7 +459,7 @@ "\n", "
\n", "
\n", - "damage\n", + "damage\n", "
\n", "
int
\n", "
\n", @@ -387,7 +473,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -416,7 +502,7 @@ "\n", "
\n", "
\n", - "description\n", + "description\n", "
\n", "
str
\n", "
\n", @@ -430,7 +516,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -459,7 +545,7 @@ "\n", "
\n", "
\n", - "det\n", + "det\n", "
\n", "
int
\n", "
\n", @@ -473,7 +559,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -502,7 +588,7 @@ "\n", "
\n", "
\n", - "docnumber\n", + "docnumber\n", "
\n", "
str
\n", "
\n", @@ -516,7 +602,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -545,7 +631,50 @@ "\n", "
\n", "
\n", - "excised\n", + "erasure\n", + "
\n", + "
int
\n", + "
\n", + " whether a sign is in an erasure - between ° / °: 1: between ° and /; 2: between / and °\n", + "
\n", + "\n", + "
\n", + "
converters:
\n", + "
Cale Johnson, Dirk Roorda
\n", + "
\n", + "\n", + "
\n", + "
dateWritten:
\n", + "
2022-02-10T07:10:40Z
\n", + "
\n", + "\n", + "
\n", + "
editor:
\n", + "
Cale Johnson et al.
\n", + "
\n", + "\n", + "
\n", + "
name:
\n", + "
NinMed Medical Texts from Nineveh
\n", + "
\n", + "\n", + "
\n", + "
project:
\n", + "
BabMed
\n", + "
\n", + "\n", + "
\n", + "
writtenBy:
\n", + "
Text-Fabric
\n", + "
\n", + "\n", + "
\n", + "
\n", + "
\n", + "\n", + "
\n", + "
\n", + "excised\n", "
\n", "
int
\n", "
\n", @@ -559,7 +688,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -588,7 +717,7 @@ "\n", "
\n", "
\n", - "face\n", + "face\n", "
\n", "
str
\n", "
\n", @@ -602,7 +731,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -631,7 +760,7 @@ "\n", "
\n", "
\n", - "flags\n", + "flags\n", "
\n", "
str
\n", "
\n", @@ -645,7 +774,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -674,7 +803,7 @@ "\n", "
\n", "
\n", - "gloss\n", + "gloss\n", "
\n", "
int
\n", "
\n", @@ -688,7 +817,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -717,7 +846,7 @@ "\n", "
\n", "
\n", - "grapheme\n", + "grapheme\n", "
\n", "
str
\n", "
\n", @@ -731,7 +860,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -760,7 +889,7 @@ "\n", "
\n", "
\n", - "lang\n", + "lang\n", "
\n", "
str
\n", "
\n", @@ -774,7 +903,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -803,7 +932,7 @@ "\n", "
\n", "
\n", - "lemma\n", + "lemma\n", "
\n", "
str
\n", "
\n", @@ -817,7 +946,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -846,7 +975,7 @@ "\n", "
\n", "
\n", - "lln\n", + "lln\n", "
\n", "
int
\n", "
\n", @@ -860,7 +989,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -889,7 +1018,7 @@ "\n", "
\n", "
\n", - "ln\n", + "ln\n", "
\n", "
int
\n", "
\n", @@ -903,7 +1032,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -932,7 +1061,7 @@ "\n", "
\n", "
\n", - "lnno\n", + "lnno\n", "
\n", "
str
\n", "
\n", @@ -946,7 +1075,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -975,7 +1104,7 @@ "\n", "
\n", "
\n", - "missing\n", + "missing\n", "
\n", "
int
\n", "
\n", @@ -989,7 +1118,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1018,7 +1147,7 @@ "\n", "
\n", "
\n", - "modifiers\n", + "modifiers\n", "
\n", "
str
\n", "
\n", @@ -1032,7 +1161,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1061,7 +1190,7 @@ "\n", "
\n", "
\n", - "museum\n", + "museum\n", "
\n", "
str
\n", "
\n", @@ -1075,7 +1204,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1104,7 +1233,7 @@ "\n", "
\n", "
\n", - "note\n", + "note\n", "
\n", "
str
\n", "
\n", @@ -1118,7 +1247,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1147,7 +1276,7 @@ "\n", "
\n", "
\n", - "number\n", + "number\n", "
\n", "
int
\n", "
\n", @@ -1161,7 +1290,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1190,7 +1319,7 @@ "\n", "
\n", "
\n", - "otype\n", + "otype\n", "
\n", "
str
\n", "
\n", @@ -1204,7 +1333,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1233,7 +1362,7 @@ "\n", "
\n", "
\n", - "pnumber\n", + "pnumber\n", "
\n", "
str
\n", "
\n", @@ -1247,7 +1376,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1276,7 +1405,7 @@ "\n", "
\n", "
\n", - "primecol\n", + "primecol\n", "
\n", "
int
\n", "
\n", @@ -1290,7 +1419,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1319,7 +1448,7 @@ "\n", "
\n", "
\n", - "primeln\n", + "primeln\n", "
\n", "
int
\n", "
\n", @@ -1333,7 +1462,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1362,7 +1491,7 @@ "\n", "
\n", "
\n", - "publication\n", + "publication\n", "
\n", "
str
\n", "
\n", @@ -1376,7 +1505,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1405,7 +1534,7 @@ "\n", "
\n", "
\n", - "question\n", + "question\n", "
\n", "
int
\n", "
\n", @@ -1419,7 +1548,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1448,7 +1577,7 @@ "\n", "
\n", "
\n", - "reading\n", + "reading\n", "
\n", "
str
\n", "
\n", @@ -1462,7 +1591,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1491,7 +1620,7 @@ "\n", "
\n", "
\n", - "remarkable\n", + "remarkable\n", "
\n", "
int
\n", "
\n", @@ -1505,7 +1634,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1534,7 +1663,7 @@ "\n", "
\n", "
\n", - "ruling\n", + "ruling\n", "
\n", "
str
\n", "
\n", @@ -1548,7 +1677,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1577,7 +1706,7 @@ "\n", "
\n", "
\n", - "seal\n", + "seal\n", "
\n", "
str
\n", "
\n", @@ -1591,7 +1720,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1620,7 +1749,7 @@ "\n", "
\n", "
\n", - "supplied\n", + "supplied\n", "
\n", "
int
\n", "
\n", @@ -1634,7 +1763,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1663,7 +1792,7 @@ "\n", "
\n", "
\n", - "sym\n", + "sym\n", "
\n", "
str
\n", "
\n", @@ -1677,7 +1806,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1706,7 +1835,7 @@ "\n", "
\n", "
\n", - "tr@ll\n", + "tr@ll\n", "
\n", "
str
\n", "
\n", @@ -1720,7 +1849,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1749,7 +1878,7 @@ "\n", "
\n", "
\n", - "trans\n", + "trans\n", "
\n", "
int
\n", "
\n", @@ -1763,7 +1892,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1792,7 +1921,7 @@ "\n", "
\n", "
\n", - "type\n", + "type\n", "
\n", "
str
\n", "
\n", @@ -1806,7 +1935,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1835,7 +1964,7 @@ "\n", "
\n", "
\n", - "uncertain\n", + "uncertain\n", "
\n", "
int
\n", "
\n", @@ -1849,7 +1978,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1878,7 +2007,7 @@ "\n", "
\n", "
\n", - "variant\n", + "variant\n", "
\n", "
int
\n", "
\n", @@ -1892,7 +2021,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1921,7 +2050,7 @@ "\n", "
\n", "
\n", - "oslots\n", + "oslots\n", "
\n", "
none
\n", "
\n", @@ -1935,7 +2064,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -2693,7 +2822,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "2920 lines\n" + "2925 lines\n" ] } ], @@ -2811,10 +2940,10 @@ "name": "stdout", "output_type": "stream", "text": [ - "4261740 comparisons to make\n", - " 0.07s 1% - 42617 comparisons and 6 similarities\n", - " 0.13s 2% - 85234 comparisons and 10 similarities\n", - " 0.13s 2% - 85234 comparisons and 10 similarities\n" + "4276350 comparisons to make\n", + " 0.07s 1% - 42763 comparisons and 6 similarities\n", + " 0.13s 2% - 85526 comparisons and 10 similarities\n", + " 0.13s 2% - 85526 comparisons and 10 similarities\n" ] } ], @@ -2867,8 +2996,8 @@ "name": "stdout", "output_type": "stream", "text": [ - "9\n", - "1\n" + "8\n", + "2\n" ] } ], @@ -2886,8 +3015,8 @@ "name": "stdout", "output_type": "stream", "text": [ - "((85973, 85982), 100)\n", - "((85977, 88607), 80)\n" + "((59315, 59324), 100)\n", + "((59319, 61949), 80)\n" ] } ], @@ -2904,7 +3033,8 @@ { "data": { "text/html": [ - "
P285136 obverse:2'  5 KA#.INIM.MA [x x x x]
" + "
P285136 obverse:2'  5 KA#.INIM.MA [x x x x]\n", + "
" ], "text/plain": [ "" @@ -2916,7 +3046,8 @@ { "data": { "text/html": [ - "
P285136 obverse:11'  2 KA.INIM.MA [x x x x x x]
" + "
P285136 obverse:11'  2 KA.INIM.MA [x x x x x x]\n", + "
" ], "text/plain": [ "" @@ -2939,7 +3070,8 @@ { "data": { "text/html": [ - "
P285136 obverse:6'  EN₂ ma-mit GIM šar-ra-<qi₂> ina KA₂ pil-ši un gi ha ba# [x x x x x x x x x x x x]
" + "
P285136 obverse:6'  EN₂ ma-mit GIM šar-ra-<qi₂> ina KA₂ pil-ši un gi ha ba# [x x x x x x x x x x x x]\n", + "
" ], "text/plain": [ "" @@ -2951,7 +3083,8 @@ { "data": { "text/html": [ - "
P396392 reverse:1:71'  [EN₂ ma]-mit GIM šar-ra-qi₂ ina KA₂ pil-ši# un?# [...]
" + "
P396392 reverse:1:71'  [EN₂ ma]-mit GIM šar-ra-qi₂ ina KA₂ pil-ši# [un? ...]\n", + "
" ], "text/plain": [ "" @@ -3017,110 +3150,110 @@ "name": "stdout", "output_type": "stream", "text": [ - "File not found: /Users/werk/github/Nino-cunei/ninmed/_temp/parallels/sim-0.2.zip\n", - "4261740 comparisons to make\n", - " 0.08s 1% - 42617 comparisons and 6 similarities\n", - " 0.13s 2% - 85234 comparisons and 10 similarities\n", - " 0.19s 3% - 127851 comparisons and 10 similarities\n", - " 0.25s 4% - 170468 comparisons and 13 similarities\n", - " 0.30s 5% - 213085 comparisons and 15 similarities\n", - " 0.37s 6% - 255702 comparisons and 15 similarities\n", - " 0.42s 7% - 298319 comparisons and 18 similarities\n", - " 0.48s 8% - 340936 comparisons and 20 similarities\n", - " 0.55s 9% - 383553 comparisons and 21 similarities\n", - " 0.61s 10% - 426170 comparisons and 23 similarities\n", - " 0.68s 11% - 468787 comparisons and 23 similarities\n", - " 0.74s 12% - 511404 comparisons and 27 similarities\n", - " 0.80s 13% - 554021 comparisons and 30 similarities\n", - " 0.87s 14% - 596638 comparisons and 31 similarities\n", - " 0.93s 15% - 639255 comparisons and 35 similarities\n", - " 1.00s 16% - 681872 comparisons and 35 similarities\n", - " 1.06s 17% - 724489 comparisons and 37 similarities\n", - " 1.11s 18% - 767106 comparisons and 46 similarities\n", - " 1.16s 19% - 809723 comparisons and 49 similarities\n", - " 1.22s 20% - 852340 comparisons and 52 similarities\n", - " 1.29s 21% - 894957 comparisons and 87 similarities\n", - " 1.36s 22% - 937574 comparisons and 87 similarities\n", - " 1.43s 23% - 980191 comparisons and 87 similarities\n", - " 1.50s 24% - 1022808 comparisons and 88 similarities\n", - " 1.56s 25% - 1065425 comparisons and 88 similarities\n", - " 1.63s 26% - 1108042 comparisons and 88 similarities\n", - " 1.69s 27% - 1150659 comparisons and 88 similarities\n", - " 1.75s 28% - 1193276 comparisons and 90 similarities\n", - " 1.81s 29% - 1235893 comparisons and 92 similarities\n", - " 1.88s 30% - 1278510 comparisons and 92 similarities\n", - " 1.96s 31% - 1321127 comparisons and 92 similarities\n", - " 2.02s 32% - 1363744 comparisons and 92 similarities\n", - " 2.09s 33% - 1406361 comparisons and 93 similarities\n", - " 2.15s 34% - 1448978 comparisons and 94 similarities\n", - " 2.21s 35% - 1491595 comparisons and 138 similarities\n", - " 2.28s 36% - 1534212 comparisons and 143 similarities\n", - " 2.33s 37% - 1576829 comparisons and 149 similarities\n", - " 2.40s 38% - 1619446 comparisons and 152 similarities\n", - " 2.47s 39% - 1662063 comparisons and 152 similarities\n", - " 2.53s 40% - 1704680 comparisons and 153 similarities\n", - " 2.59s 41% - 1747297 comparisons and 159 similarities\n", - " 2.66s 42% - 1789914 comparisons and 164 similarities\n", - " 2.73s 43% - 1832531 comparisons and 164 similarities\n", - " 2.80s 44% - 1875148 comparisons and 164 similarities\n", - " 2.87s 45% - 1917765 comparisons and 164 similarities\n", - " 2.93s 46% - 1960382 comparisons and 164 similarities\n", - " 2.99s 47% - 2002999 comparisons and 164 similarities\n", - " 3.05s 48% - 2045616 comparisons and 189 similarities\n", - " 3.12s 49% - 2088233 comparisons and 189 similarities\n", - " 3.18s 50% - 2130850 comparisons and 194 similarities\n", - " 3.24s 51% - 2173467 comparisons and 194 similarities\n", - " 3.30s 52% - 2216084 comparisons and 196 similarities\n", - " 3.37s 53% - 2258701 comparisons and 196 similarities\n", - " 3.43s 54% - 2301318 comparisons and 196 similarities\n", - " 3.50s 55% - 2343935 comparisons and 196 similarities\n", - " 3.56s 56% - 2386552 comparisons and 196 similarities\n", - " 3.63s 57% - 2429169 comparisons and 196 similarities\n", - " 3.69s 58% - 2471786 comparisons and 197 similarities\n", - " 3.75s 59% - 2514403 comparisons and 230 similarities\n", - " 3.82s 60% - 2557020 comparisons and 230 similarities\n", - " 3.88s 61% - 2599637 comparisons and 234 similarities\n", - " 3.94s 62% - 2642254 comparisons and 236 similarities\n", - " 4.01s 63% - 2684871 comparisons and 237 similarities\n", - " 4.07s 64% - 2727488 comparisons and 245 similarities\n", - " 4.14s 65% - 2770105 comparisons and 251 similarities\n", - " 4.20s 66% - 2812722 comparisons and 252 similarities\n", - " 4.27s 67% - 2855339 comparisons and 252 similarities\n", - " 4.32s 68% - 2897956 comparisons and 261 similarities\n", - " 4.37s 69% - 2940573 comparisons and 294 similarities\n", - " 4.43s 70% - 2983190 comparisons and 298 similarities\n", - " 4.49s 71% - 3025807 comparisons and 298 similarities\n", - " 4.54s 72% - 3068424 comparisons and 301 similarities\n", - " 4.61s 73% - 3111041 comparisons and 301 similarities\n", - " 4.67s 74% - 3153658 comparisons and 330 similarities\n", - " 4.73s 75% - 3196275 comparisons and 343 similarities\n", - " 4.79s 76% - 3238892 comparisons and 343 similarities\n", - " 4.85s 77% - 3281509 comparisons and 344 similarities\n", - " 4.91s 78% - 3324126 comparisons and 345 similarities\n", - " 4.98s 79% - 3366743 comparisons and 351 similarities\n", - " 5.05s 80% - 3409360 comparisons and 387 similarities\n", - " 5.11s 81% - 3451977 comparisons and 449 similarities\n", - " 5.18s 82% - 3494594 comparisons and 478 similarities\n", - " 5.24s 83% - 3537211 comparisons and 492 similarities\n", - " 5.30s 84% - 3579828 comparisons and 495 similarities\n", - " 5.37s 85% - 3622445 comparisons and 509 similarities\n", - " 5.44s 86% - 3665062 comparisons and 519 similarities\n", - " 5.50s 87% - 3707679 comparisons and 520 similarities\n", - " 5.56s 88% - 3750296 comparisons and 520 similarities\n", - " 5.62s 89% - 3792913 comparisons and 530 similarities\n", - " 5.68s 90% - 3835530 comparisons and 537 similarities\n", - " 5.75s 91% - 3878147 comparisons and 562 similarities\n", - " 5.80s 92% - 3920764 comparisons and 576 similarities\n", - " 5.87s 93% - 3963381 comparisons and 594 similarities\n", - " 5.94s 94% - 4005998 comparisons and 594 similarities\n", - " 6.00s 95% - 4048615 comparisons and 594 similarities\n", - " 6.07s 96% - 4091232 comparisons and 596 similarities\n", - " 6.14s 97% - 4133849 comparisons and 611 similarities\n", - " 6.20s 98% - 4176466 comparisons and 613 similarities\n", - " 6.27s 99% - 4219083 comparisons and 617 similarities\n", - " 6.33s 100% - 4261700 comparisons and 626 similarities\n", - " 6.34s 100% - 4261740 comparisons and 626 similarities\n", - "Data written to /Users/werk/github/Nino-cunei/ninmed/_temp/parallels/sim-0.2.zip\n" + "File not found: /Users/werk/github/Nino-cunei/ninmed/_temp/parallels/sim-0.3.zip\n", + "4276350 comparisons to make\n", + " 0.07s 1% - 42763 comparisons and 6 similarities\n", + " 0.14s 2% - 85526 comparisons and 10 similarities\n", + " 0.20s 3% - 128289 comparisons and 10 similarities\n", + " 0.26s 4% - 171052 comparisons and 14 similarities\n", + " 0.32s 5% - 213815 comparisons and 17 similarities\n", + " 0.38s 6% - 256578 comparisons and 17 similarities\n", + " 0.44s 7% - 299341 comparisons and 20 similarities\n", + " 0.50s 8% - 342104 comparisons and 21 similarities\n", + " 0.57s 9% - 384867 comparisons and 22 similarities\n", + " 0.64s 10% - 427630 comparisons and 24 similarities\n", + " 0.71s 11% - 470393 comparisons and 24 similarities\n", + " 0.77s 12% - 513156 comparisons and 28 similarities\n", + " 0.84s 13% - 555919 comparisons and 31 similarities\n", + " 0.91s 14% - 598682 comparisons and 32 similarities\n", + " 0.97s 15% - 641445 comparisons and 36 similarities\n", + " 1.05s 16% - 684208 comparisons and 36 similarities\n", + " 1.12s 17% - 726971 comparisons and 38 similarities\n", + " 1.17s 18% - 769734 comparisons and 47 similarities\n", + " 1.23s 19% - 812497 comparisons and 50 similarities\n", + " 1.28s 20% - 855260 comparisons and 53 similarities\n", + " 1.36s 21% - 898023 comparisons and 91 similarities\n", + " 1.43s 22% - 940786 comparisons and 91 similarities\n", + " 1.51s 23% - 983549 comparisons and 91 similarities\n", + " 1.58s 24% - 1026312 comparisons and 92 similarities\n", + " 1.65s 25% - 1069075 comparisons and 92 similarities\n", + " 1.72s 26% - 1111838 comparisons and 92 similarities\n", + " 1.78s 27% - 1154601 comparisons and 92 similarities\n", + " 1.85s 28% - 1197364 comparisons and 94 similarities\n", + " 1.91s 29% - 1240127 comparisons and 96 similarities\n", + " 1.98s 30% - 1282890 comparisons and 96 similarities\n", + " 2.04s 31% - 1325653 comparisons and 96 similarities\n", + " 2.11s 32% - 1368416 comparisons and 96 similarities\n", + " 2.18s 33% - 1411179 comparisons and 97 similarities\n", + " 2.24s 34% - 1453942 comparisons and 98 similarities\n", + " 2.31s 35% - 1496705 comparisons and 143 similarities\n", + " 2.37s 36% - 1539468 comparisons and 148 similarities\n", + " 2.43s 37% - 1582231 comparisons and 155 similarities\n", + " 2.50s 38% - 1624994 comparisons and 157 similarities\n", + " 2.58s 39% - 1667757 comparisons and 159 similarities\n", + " 2.64s 40% - 1710520 comparisons and 160 similarities\n", + " 2.70s 41% - 1753283 comparisons and 166 similarities\n", + " 2.78s 42% - 1796046 comparisons and 171 similarities\n", + " 2.85s 43% - 1838809 comparisons and 171 similarities\n", + " 2.93s 44% - 1881572 comparisons and 171 similarities\n", + " 3.01s 45% - 1924335 comparisons and 171 similarities\n", + " 3.10s 46% - 1967098 comparisons and 171 similarities\n", + " 3.17s 47% - 2009861 comparisons and 171 similarities\n", + " 3.24s 48% - 2052624 comparisons and 196 similarities\n", + " 3.33s 49% - 2095387 comparisons and 196 similarities\n", + " 3.39s 50% - 2138150 comparisons and 201 similarities\n", + " 3.47s 51% - 2180913 comparisons and 201 similarities\n", + " 3.54s 52% - 2223676 comparisons and 203 similarities\n", + " 3.62s 53% - 2266439 comparisons and 203 similarities\n", + " 3.70s 54% - 2309202 comparisons and 203 similarities\n", + " 3.78s 55% - 2351965 comparisons and 204 similarities\n", + " 3.86s 56% - 2394728 comparisons and 204 similarities\n", + " 3.94s 57% - 2437491 comparisons and 204 similarities\n", + " 4.01s 58% - 2480254 comparisons and 206 similarities\n", + " 4.08s 59% - 2523017 comparisons and 239 similarities\n", + " 4.16s 60% - 2565780 comparisons and 239 similarities\n", + " 4.24s 61% - 2608543 comparisons and 243 similarities\n", + " 4.32s 62% - 2651306 comparisons and 245 similarities\n", + " 4.40s 63% - 2694069 comparisons and 246 similarities\n", + " 4.47s 64% - 2736832 comparisons and 253 similarities\n", + " 4.55s 65% - 2779595 comparisons and 259 similarities\n", + " 4.63s 66% - 2822358 comparisons and 261 similarities\n", + " 4.70s 67% - 2865121 comparisons and 261 similarities\n", + " 4.77s 68% - 2907884 comparisons and 269 similarities\n", + " 4.82s 69% - 2950647 comparisons and 302 similarities\n", + " 4.89s 70% - 2993410 comparisons and 306 similarities\n", + " 4.97s 71% - 3036173 comparisons and 306 similarities\n", + " 5.03s 72% - 3078936 comparisons and 309 similarities\n", + " 5.10s 73% - 3121699 comparisons and 309 similarities\n", + " 5.18s 74% - 3164462 comparisons and 338 similarities\n", + " 5.25s 75% - 3207225 comparisons and 350 similarities\n", + " 5.32s 76% - 3249988 comparisons and 350 similarities\n", + " 5.40s 77% - 3292751 comparisons and 352 similarities\n", + " 5.47s 78% - 3335514 comparisons and 354 similarities\n", + " 5.55s 79% - 3378277 comparisons and 359 similarities\n", + " 5.63s 80% - 3421040 comparisons and 390 similarities\n", + " 5.71s 81% - 3463803 comparisons and 457 similarities\n", + " 5.78s 82% - 3506566 comparisons and 486 similarities\n", + " 5.85s 83% - 3549329 comparisons and 500 similarities\n", + " 5.92s 84% - 3592092 comparisons and 504 similarities\n", + " 5.99s 85% - 3634855 comparisons and 518 similarities\n", + " 6.06s 86% - 3677618 comparisons and 528 similarities\n", + " 6.13s 87% - 3720381 comparisons and 529 similarities\n", + " 6.19s 88% - 3763144 comparisons and 529 similarities\n", + " 6.25s 89% - 3805907 comparisons and 539 similarities\n", + " 6.32s 90% - 3848670 comparisons and 546 similarities\n", + " 6.39s 91% - 3891433 comparisons and 572 similarities\n", + " 6.46s 92% - 3934196 comparisons and 587 similarities\n", + " 6.54s 93% - 3976959 comparisons and 605 similarities\n", + " 6.62s 94% - 4019722 comparisons and 605 similarities\n", + " 6.70s 95% - 4062485 comparisons and 605 similarities\n", + " 6.78s 96% - 4105248 comparisons and 606 similarities\n", + " 6.86s 97% - 4148011 comparisons and 621 similarities\n", + " 6.94s 98% - 4190774 comparisons and 621 similarities\n", + " 7.02s 99% - 4233537 comparisons and 625 similarities\n", + " 7.10s 100% - 4276300 comparisons and 634 similarities\n", + " 7.10s 100% - 4276350 comparisons and 634 similarities\n", + "Data written to /Users/werk/github/Nino-cunei/ninmed/_temp/parallels/sim-0.3.zip\n" ] } ], @@ -3139,7 +3272,7 @@ { "data": { "text/plain": [ - "626" + "634" ] }, "execution_count": 17, @@ -3167,7 +3300,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "492 out of 2920 lines have at least one similar line\n" + "502 out of 2925 lines have at least one similar line\n" ] } ], @@ -3195,83 +3328,83 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 23, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - " 10 siblings of 87687 = [KA.INIM.MA] IGI GIG.GA.A.KAM₂ \n", - " 10 siblings of 87698 = KA.INIM.MA [IGI GIG.GA.A.KAM₂] \n", - " 10 siblings of 87706 = KA.INIM.MA IGI GIG.GA.[KAM₂] \n", - " 10 siblings of 87766 = KA#.INIM#[.MA IGI GIG.GA].A#.KAM₂ \n", - " 10 siblings of 87843 = [KA.INIM.MA] IGI GIG.GA.A.[KAM₂] \n", - " 10 siblings of 87855 = KA.INIM.MA IGI GIG.GA.A.KAM₂ \n", - " 10 siblings of 87863 = KA.[INIM.MA] [IGI GIG.GA.KAM₂] \n", - " 10 siblings of 87871 = [KA.INIM.MA] IGI GIG.[GA.A.KAM₂] \n", - " 10 siblings of 87882 = [KA.INIM.MA ] IGI# GIG.GA.[KAM₂] \n", - " 10 siblings of 87908 = [KA.] INIM#.MA IGI GIG.GA.A.KAM₂ \n" + " 10 siblings of 61029 = [KA.INIM.MA] IGI GIG.GA.A.KAM₂\n", + " 10 siblings of 61040 = KA.INIM.MA [IGI GIG.GA.A.KAM₂]\n", + " 10 siblings of 61048 = KA.INIM.MA IGI GIG.GA.[KAM₂]\n", + " 10 siblings of 61108 = KA#.[INIM.MA IGI GIG.GA].A#.KAM₂\n", + " 10 siblings of 61185 = [KA.INIM.MA] IGI GIG.GA.A.[KAM₂]\n", + " 10 siblings of 61197 = KA.INIM.MA IGI GIG.GA.A.KAM₂\n", + " 10 siblings of 61205 = KA.[INIM.MA] [IGI GIG.GA.KAM₂]\n", + " 10 siblings of 61213 = [KA.INIM.MA] IGI GIG.[GA.A.KAM₂]\n", + " 10 siblings of 61224 = [KA.INIM.MA IGI] GIG.GA.[KAM₂]\n", + " 10 siblings of 61250 = [KA.INIM].MA IGI GIG.GA.A.KAM₂\n" ] } ], "source": [ "for (ln, paras) in rankedParallels[0:10]:\n", - " print(f\"{len(paras):>4} siblings of {ln} = {T.text(ln)}\")" + " print(f\"{len(paras):>4} siblings of {ln} = {T.text(ln).rstrip()}\")" ] }, { "cell_type": "code", - "execution_count": 21, + "execution_count": 24, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - " 1 siblings of %sux [x x x x gi] pisan#-gen₇ keš₂-da \n", - " 1 siblings of [x x GAZI] sar# SILA₁₁-aš LAL-ma UD.3.KAM₂# [NU DU₈] \n", - " 1 siblings of [EGIR na]-aṣ-ma-da-te an-na-ti 10 GIN₂ ZA₃.HI.LI ša₂ KA# [x x] \n", - " 1 siblings of [DIŠ NA ] SAG#.KI.DAB.BA TUKU.TUKU [x x x x] \n", - " 1 siblings of [x x x x x x x x x x x x x ŠEŠ₂]-su#-ma# TI \n", - " 1 siblings of [x x x x x x x] ŠEŠ₂-su-ma# [TI] \n", - " 1 siblings of [x x x x x x x x x] tu#-bal ta-sak₃ ina I₃ HI.HI ŠEŠ₂-MEŠ#-su#-[ma TI] \n", - " 1 siblings of [x x x x x x x ] tu#-bal ta-sak₃ ina I₃ HI.HI ŠEŠ₂-MEŠ-su#[-ma TI] \n", - " 1 siblings of DIŠ NA ki-is ŠA₃# [GIG ...] \n", - " 1 siblings of ul-tu x [...] \n" + " 1 siblings of [x x x x x x x ZI₃ ŠE.SA].A ina A GAZI{[sar} x x x x x x x x x x x]\n", + " 1 siblings of [EGIR na]-aṣ-ma-da-te an-na-ti 10 GIN₂ ZA₃.HI.LI ša₂ KA# [x x]\n", + " 1 siblings of [x x x x x x] ZA?#.BA?#.LAM?# 1/3 SILA₃ {u₂}[x x x]\n", + " 1 siblings of [DIŠ NA SAG].KI.DAB.BA TUKU.TUKU [x x x x]\n", + " 1 siblings of [x x x x x x x x x x x x x ŠEŠ₂]-su#-ma# TI\n", + " 1 siblings of [x x x x x x x x x x x TI-šu₂] I₃.GIŠ {šim}GUR₂.GUR₂ ŠEŠ₂-su\n", + " 1 siblings of [x x x x x x x x x x ana TI]-šu₂ I₃.GIŠ {šim}GUR₂.GUR₂ I₃.GIŠ {šim}LI ŠEŠ₂-[su]\n", + " 1 siblings of [x x x x x x x] ŠEŠ₂-su-[ma TI]\n", + " 1 siblings of [x x x x x x x x x] tu#-bal ta-sak₃ ina I₃ HI.HI ŠEŠ₂-MEŠ#-su#-[ma TI]\n", + " 1 siblings of [x x x x x x x tu]-bal ta-sak₃ ina I₃ HI.HI ŠEŠ₂-MEŠ-[su-ma TI]\n" ] } ], "source": [ "for (ln, paras) in rankedParallels[200:210]:\n", - " print(f\"{len(paras):>4} siblings of {T.text(ln)}\")" + " print(f\"{len(paras):>4} siblings of {T.text(ln).rstrip()}\")" ] }, { "cell_type": "code", - "execution_count": 22, + "execution_count": 25, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - " 1 siblings of [...] ina# KAŠ.SAG NAG \n", - " 1 siblings of [GUR-ma ] HAD₂#.A GAZ ina A ZU₂.LUM ina dugGAN tara-bak ina TUG₂.HI.A SUR-ri ur-ri u GE₆ LAL \n", - " 1 siblings of ina A GAZIsar tara-bak GUR-ma HAD₂.A GAZ ina A ZU₂.LUM.MA ina dugGAN tara-bak ina TUG₂.HI.A SUR-ri ur-ri u GE₆ [] LAL# \n", - " 1 siblings of DIŠ NA SAG ŠA₃-šu₂ GU₇-šu₂ ina ge-ši-šu₂ ZE₂ im-ta-na-ʾ NA BI qer-be₂-na GIG \n", - " 1 siblings of DUB 2.KAM₂ DIŠ NA su-a-lam GIG ana ki-is ŠA₃ GUR \n", - " 1 siblings of %sux sag sahar₂-ra mu-un#-[dab x x x x x x x] \n", - " 1 siblings of %sux šu du₃.du₃.meš šu ne.ne#[.a.meš] eridu#ki#.ga# mu#.un#.[tum₂ TU₆.EN₂] \n", - " 1 siblings of %sux [] EN₂# sag-ki-ni sag-ki [x x x x] \n", - " 1 siblings of %sux [] mu#-ru-ub-bi-ni mu-ru-ub#[-bi x x x x] \n", - " 1 siblings of %sux [] EN₂# sag-ki#[-ni x x x x x x x x x x x x x x x] \n" + " 1 siblings of BAR {giš}NU#.UR₂#.[MA ...]\n", + " 1 siblings of sah#-le₂#-[e ...]\n", + " 1 siblings of NUMUN {giš}bi-ni SUD₂ ina I₃ u KAŠ NAG SUHUŠ {giš}šu-ši ina I₃ u KAŠ NAG {u₂}IGI.NIŠ SUD₂# [ina KAŠ NAG].MEŠ#\n", + " 1 siblings of [x x] x {šim}GUR₂.GUR₂ {[šim} ...]\n", + " 1 siblings of [KA].INIM.MA MAŠ.TAB.BA.[KE₄]\n", + " 1 siblings of [KA].INIM.MA MAŠ.TAB.[BA.KE₄]\n", + " 1 siblings of [EN₂ ma]-mit GIM šar-ra-qi₂ ina KA₂ pil-ši# [un? ...]\n", + " 1 siblings of DIŠ NA ŠA₃-šu₂ GIG GA {gud}AB₂ KUG.GA I₃.NUN UD.2.KAM₂ [NAG ...]\n", + " 1 siblings of [...] ina KAŠ.SAG NAG\n", + " 1 siblings of [...] x PA {giš}NU.UR₂.MA\n" ] } ], "source": [ "for (ln, paras) in rankedParallels[480:490]:\n", - " print(f\"{len(paras):>4} siblings of {T.text(ln)}\")" + " print(f\"{len(paras):>4} siblings of {T.text(ln).rstrip()}\")" ] }, { @@ -3285,14 +3418,14 @@ }, { "cell_type": "code", - "execution_count": 23, + "execution_count": 26, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "There are 293 exclusively parallel pairs of lines\n" + "There are 304 exclusively parallel pairs of lines\n" ] } ], @@ -3312,7 +3445,7 @@ }, { "cell_type": "code", - "execution_count": 24, + "execution_count": 27, "metadata": {}, "outputs": [ { @@ -3320,8 +3453,8 @@ "output_type": "stream", "text": [ " 11 lines have n sisters where 10 < n <= 20\n", - " 188 lines have n sisters where 2 < n <= 10\n", - " 293 lines have n sisters where n <= 2\n" + " 187 lines have n sisters where 2 < n <= 10\n", + " 304 lines have n sisters where n <= 2\n" ] } ], @@ -3382,7 +3515,7 @@ }, { "cell_type": "code", - "execution_count": 25, + "execution_count": 28, "metadata": {}, "outputs": [], "source": [ @@ -3403,7 +3536,7 @@ }, { "cell_type": "code", - "execution_count": 26, + "execution_count": 29, "metadata": {}, "outputs": [], "source": [ @@ -3414,7 +3547,7 @@ }, { "cell_type": "code", - "execution_count": 27, + "execution_count": 30, "metadata": {}, "outputs": [], "source": [ @@ -3427,16 +3560,16 @@ }, { "cell_type": "code", - "execution_count": 28, + "execution_count": 31, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - " 0.00s Exporting 0 node and 1 edge and 0 config features to ~/github/Nino-cunei/ninmed/parallels/tf/0.2:\n", - " | 0.00s T sim to ~/github/Nino-cunei/ninmed/parallels/tf/0.2\n", - " 0.00s Exported 0 node features and 1 edge features and 0 config features to ~/github/Nino-cunei/ninmed/parallels/tf/0.2\n" + " 0.00s Exporting 0 node and 1 edge and 0 config features to ~/github/Nino-cunei/ninmed/parallels/tf/0.3:\n", + " | 0.00s T sim to ~/github/Nino-cunei/ninmed/parallels/tf/0.3\n", + " 0.00s Exported 0 node features and 1 edge features and 0 config features to ~/github/Nino-cunei/ninmed/parallels/tf/0.3\n" ] }, { @@ -3445,7 +3578,7 @@ "True" ] }, - "execution_count": 28, + "execution_count": 31, "metadata": {}, "output_type": "execute_result" } @@ -3469,7 +3602,7 @@ }, { "cell_type": "code", - "execution_count": 29, + "execution_count": 33, "metadata": {}, "outputs": [ { @@ -3477,26 +3610,24 @@ "output_type": "stream", "text": [ "This is a TF dataset\n", - "Create release data for Nino-cunei/oldbabylonian/parallels/tf\n", - "Found 4 versions\n", - "zip files end up in ~/Downloads/Nino-cunei-release/oldbabylonian\n", - "zipping Nino-cunei/oldbabylonian 1.0.1 with 1 features ==> parallels-tf-1.0.1.zip\n", - "zipping Nino-cunei/oldbabylonian 1.0.4 with 1 features ==> parallels-tf-1.0.4.zip\n", - "zipping Nino-cunei/oldbabylonian 1.0.5 with 1 features ==> parallels-tf-1.0.5.zip\n", - "zipping Nino-cunei/oldbabylonian 1.0.6 with 1 features ==> parallels-tf-1.0.6.zip\n" + "Create release data for Nino-cunei/ninmed/parallels/tf\n", + "Found 2 versions\n", + "zip files end up in ~/Downloads/Nino-cunei-release/ninmed\n", + "zipping Nino-cunei/ninmed 0.2 with 1 features ==> parallels-tf-0.2.zip\n", + "zipping Nino-cunei/ninmed 0.3 with 1 features ==> parallels-tf-0.3.zip\n" ] } ], "source": [ "%%bash\n", - "text-fabric-zip 'Nino-cunei/oldbabylonian/parallels/tf'" + "text-fabric-zip 'Nino-cunei/ninmed/parallels/tf'" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "I have added this file to a new release of the Oldbabylonian Github repo." + "I have added this file to a new release of this Github repo." ] }, { diff --git a/programs/tfFromJson.py b/programs/tfFromJson.py index 5b15339..1c3a8e5 100644 --- a/programs/tfFromJson.py +++ b/programs/tfFromJson.py @@ -12,7 +12,10 @@ python3 tfFromJson.py Generate TF and if successful, load it python3 tfFromJson.py -Pnumber - Generate TF, only this Pnumber, do not load it +python3 tfFromJson.py -Pnumber:obverse +python3 tfFromJson.py -Pnumber:obverse:2:1 + Generate TF, only this Pnumber, face, line, do not load it + Primes in numbers are not relevant python3 tfFromJson.py -skipgen Load TF python3 tfFromJson.py -skipload @@ -158,8 +161,8 @@ def readYaml(fileName): featureMeta = { "after": {"description": "what comes after a sign or word (- or space)"}, "atf": {"description": "full atf of a sign"}, - "atfpre": {"description": "cluster characters that precede a sign or word"}, "atfpost": {"description": "cluster characters that follow a sign or word"}, + "atfpre": {"description": "cluster characters that precede a sign or word"}, "col": {"description": "ATF column number"}, "collated": {"description": "whether a sign is collated (*)"}, "collection": {"description": 'collection name from metadata field "collection"'}, @@ -171,15 +174,15 @@ def readYaml(fileName): "description": "whether a sign is a determinative gloss - between { }", }, "docnumber": {"description": 'document number from metadata field "number"'}, - "excised": { - "description": "whether a sign is excised - between << >>", - }, "erasure": { "description": ( "whether a sign is in an erasure - between ° \\ °: " "1: between ° and \\; 2: between \\ and °" ), }, + "excised": { + "description": "whether a sign is excised - between << >>", + }, "face": {"description": "full name of a face including the enclosing object"}, "flags": {"description": "sequence of flags after a sign"}, "gloss": { @@ -209,6 +212,7 @@ def readYaml(fileName): "description": "whether a sign is missing - between [ ]", }, "modifiers": {"description": "sequence of modifiers after a sign"}, + "museum": {"description": 'museum name from metadata field "museum.name"'}, "note": {"description": "note comment to a line"}, "number": {"description": "numeric value of a number sign"}, "pnumber": {"description": "P number of a document"}, @@ -229,14 +233,13 @@ def readYaml(fileName): "trans": {"description": "whether a line has a translation"}, "tr@en": {"description": "english translation of a line"}, "type": {"description": "name of a type of cluster or kind of sign"}, + "uncertain": {"description": "whether a sign is uncertain - between ( )"}, "variant": { "description": ( "if sign is part of a variant pair, " "this is the sequence number of the variant (1 or 2)" ) }, - "uncertain": {"description": "whether a sign is uncertain - between ( )"}, - "museum": {"description": 'museum name from metadata field "museum.name"'}, } @@ -278,6 +281,8 @@ def getConverter(): PNUMBER = None +FACE = None +LINE = None def convert(): @@ -377,14 +382,12 @@ def doModifiers(data, cur): cv.feature(cur, modifiers=f"@{modifiers}") def doSign(data, wordAfter, isLast, **features): - nonlocal prevSign nonlocal curSign nonlocal nextPre - nonlocal after nonlocal lang signType = data["type"] - debug(f"A {signType=}") + after = wordAfter if isLast else "" if signType in { "AccidentalOmission", @@ -401,26 +404,22 @@ def doSign(data, wordAfter, isLast, **features): elif status is False: cv.feature( curSign, - atfpost=(cv.get(curSign, "atfpost") or "") + after=(cv.get("after", curSign) or "") + after, + atfpost=(cv.get("atfpost", curSign) or "") + clusterChar[cluster][status], ) elif status is None: nextPre += clusterChar[cluster][status] - debug("skip") - elif signType == "LanguageShift": lang = data["cleanValue"][1:] nextPre += f"%{lang} " if lang == "akk": lang = None - debug("skip") elif signType == "Joiner": - after += data["value"] - if prevSign is not None: - cv.feature(prevSign, after=f"{cv.get(prevSign, 'after') or ''}{after}") - debug("skip") + if curSign is not None: + cv.feature(curSign, after=data["value"]) else: atf = data["value"] @@ -445,22 +444,27 @@ def doSign(data, wordAfter, isLast, **features): atfPre = "[" doCluster(data, "missing", on=True, off=False) - prevSign = curSign curSign = cv.slot() - debug("slot") if endMissingInternal and not startMissingInternal: atf = atf.replace("]", "") - atfPost = "]" + atfPost += "]" doCluster(data, "missing", on=False, off=True) thisPre = nextPre + atfPre - atfPre = dict(atfpre=thisPre) if thisPre else {} + atfPreFeat = dict(atfpre=thisPre) if thisPre else {} + atfPre = "" nextPre = "" - atfPost = dict(atfpost=atfPost) if atfPost else {} + atfPostFeat = dict(atfpost=atfPost) if atfPost else {} + atfPost = "" cv.feature( - curSign, **atfPre, **atfPost, atf=atf, **getClusters(), **features + curSign, + **atfPreFeat, + **atfPostFeat, + atf=atf, + **getClusters(), + **features, ) doFlags(data, curSign, extraFlag) doModifiers(data, curSign) @@ -500,6 +504,7 @@ def doSign(data, wordAfter, isLast, **features): elif signType == "Divider": tp = "wdiv" + after = wordAfter elif signType == "Determinative" or signType == "Variant": error(f"nested {signType} Signs", stop=True) @@ -507,11 +512,12 @@ def doSign(data, wordAfter, isLast, **features): else: error(f"unrecognized sign type {signType}", stop=True) - after += wordAfter if isLast else "" cv.feature(curSign, type=tp, after=after, sym=sym, **feats) - after = "" paths = getJsonFiles() + skipFace = FACE is not None + skipLine = LINE is not None + for (i, path) in enumerate(paths): fileName = path.split("/")[-1].rsplit(".", 1)[0] docData = readJsonFile(path) @@ -546,19 +552,22 @@ def doSign(data, wordAfter, isLast, **features): for lineData in textData: lang = None - prevSign = None lineType = lineData["type"] content = " ".join(c["value"] for c in lineData["content"]) atf = f"{lineData['prefix']} {content}" - debug(atf) isFaceLine = lineType == "SurfaceAtLine" if isFaceLine: thisFaceValue = lineData["label"]["surface"].lower() + if FACE is not None: + skipFace = thisFaceValue != FACE if thisFaceValue == curFaceValue: continue + if skipFace: + continue + if isFaceLine or not curFace: if isFaceLine and curFace: terminateClusters() @@ -572,6 +581,7 @@ def doSign(data, wordAfter, isLast, **features): ) cv.feature(curFace, face=curFaceValue) if isFaceLine: + debug(atf) continue if lineType == "ColumnAtLine": @@ -579,6 +589,7 @@ def doSign(data, wordAfter, isLast, **features): primeInfo = lineData["label"]["status"] primecol = len(primeInfo) > 0 and "PRIME" in primeInfo primecolAtt = dict(primecol=1) if primecol else {} + debug(atf) continue if lineType == "ControlLine": @@ -611,7 +622,8 @@ def doSign(data, wordAfter, isLast, **features): cv.feature(curLine, lln=lln, atf=atf) if isEmptyLine: - prevSign = curSign + if not skipLine: + debug(atf) curSlot = cv.slot() cv.feature(curSlot, type="empty") prevLine = curLine @@ -629,15 +641,23 @@ def doSign(data, wordAfter, isLast, **features): primeln = numberData["hasPrime"] primelnAtt = dict(primeln=1) if primeln else {} - cv.feature(curLine, ln=ln, **primelnAtt) lnprime = "'" if primeln else "" lnno = f"{ln}{lnprime}" + if col is not None: cv.feature(curLine, col=col, **primecolAtt) colprime = "'" if primecol else "" colno = f"{col}{colprime}" lnno = f"{colno}:{lnno}" - cv.feature(curLine, lnno=lnno) + + if LINE is not None: + skipLine = lnno.replace("'", "") != LINE + + if skipLine: + continue + + debug(atf) + cv.feature(curLine, ln=ln, **primelnAtt, lnno=lnno) lineContent = lineData["content"] @@ -676,9 +696,10 @@ def doSign(data, wordAfter, isLast, **features): if isWord: entry[2] = True break + + atWordEnd = True for entry in reversed(lineSigns): isWord = entry[0] - atWordEnd = True if isWord is False: if atWordEnd: entry[2] = True @@ -689,7 +710,6 @@ def doSign(data, wordAfter, isLast, **features): curWord = None curSign = None nextPre = "" - after = "" for (e, entry) in enumerate(lineSigns): isWord = entry[0] @@ -718,15 +738,26 @@ def doSign(data, wordAfter, isLast, **features): where = entry[4] atEnd = entry[5] atts = {} - debug(f"COMPLEX {tp=} {where=} {atEnd=}") if tp == "Determinative": if where == 0: doCluster(data, "det", on=True, off=False) + nextPre += "{" doSign(data, wordAfter, isLast) if atEnd: + cv.feature( + curSign, + atfpost=(cv.get("atfpost", curSign) or "") + + "}", + ) doCluster(data, "det", on=False, off=True) elif tp == "Variant": doSign(data, wordAfter, isLast, variant=where + 1) + if not atEnd: + cv.feature( + curSign, + atfpost=(cv.get("atfpost", curSign) or "") + + "/", + ) else: error(f"Unknown complex type: {tp}", stop=True) else: @@ -740,25 +771,17 @@ def doSign(data, wordAfter, isLast, **features): stop=True, ) - if after: - if prevSign is not None: - cv.feature( - prevSign, - after=f"{cv.get(prevSign, 'after') or ''}{after}", - ) - after = "" - if after != "": - error( - f"dangling after material at last sign of line: {after}", - stop=True, - ) - cv.terminate(curWord) prevLine = curLine cv.terminate(curLine) else: + if skipLine: + continue + + debug(atf) + if lineType == "ControlLine": error(f"Unknown ControlLine: {atf[0:40]}") continue @@ -799,7 +822,7 @@ def doSign(data, wordAfter, isLast, **features): elif lineType == "SealDollarLine": tp = "seal" - orig = cv.get(prevLine, tp) + orig = cv.get(tp, prevLine) content = content if not orig else f"{orig}\n{content}" contents[tp] = content cv.feature(prevLine, **contents) @@ -848,7 +871,13 @@ def loadTf(): loadTf() elif command.startswith("P"): generateTf = True - PNUMBER = command + parts = command.split(":", 1) + PNUMBER = parts[0] + if len(parts) > 1: + parts = parts[1].split(":", 1) + FACE = parts[0] + if len(parts) > 1: + LINE = parts[1].replace("'", "") convert() elif command == "-skipload": generateTf = True diff --git a/tf/0.3/after.tf b/tf/0.3/after.tf index 68adcb3..e07f5e1 100644 --- a/tf/0.3/after.tf +++ b/tf/0.3/after.tf @@ -6,69 +6,69 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z . -. -. +. + \n + . . -. -. + \n + . . . -. + . -. \n + . . -. + . . . . -. -. + + . . . -. -. + \n . -. +. + . - . . -. -. + \n + - -- + - - -- -- + + - -- @@ -86,8 +86,9 @@ \n . -. -. +. + + @@ -95,8 +96,7 @@ - - -- -- + @@ -118,12 +118,12 @@ + - -- @@ -147,9 +147,9 @@ + - -- @@ -162,13 +162,13 @@ \n + . -. + - -- @@ -180,10 +180,10 @@ \n + . . -. -. + @@ -191,19 +191,19 @@ \n + . - -. + - - -- + - - -- + - - -- -- + @@ -224,16 +224,16 @@ \n + . - -. + - . . -. @@ -257,22 +257,22 @@ \n + . - -. + - - -- -- -\n +\n + + . . -. -. + \n 268 @@ -285,14 +285,15 @@ + - - -- + - - - --\n --\n +\n + @@ -301,21 +302,21 @@ - \n --\n + . - \n --\n + - - \n --\n + @@ -328,10 +329,10 @@ - - -- + - \n --\n + @@ -345,17 +346,17 @@ - - --\n --\n +\n + - -- + - - \n --\n + @@ -369,8 +370,8 @@ - - --\n --\n +\n + @@ -388,12 +389,12 @@ - - -- + - - - --\n --\n +\n + @@ -410,8 +411,8 @@ - - - --\n --\n +\n + @@ -422,8 +423,8 @@ - - - --\n --\n +\n + @@ -448,24 +449,24 @@ - \n --\n \n -448 - +448 - -- +- + - - --\n --\n +\n + - - -- + - - --\n --\n +\n + @@ -483,36 +484,35 @@ - - - -- + - \n --\n + . - -. + - - -- + - - --\n --\n +\n + - - -- + - - - -- + - - --\n --\n +\n + - - -- \n @@ -528,18 +528,19 @@ + - -- + - - - - -- + - \n --\n + @@ -554,13 +555,13 @@ - - - -- + - - -- + - \n --\n + @@ -581,13 +582,12 @@ . - -. + - - -- + - -- \n @@ -606,23 +606,24 @@ + - - - -- + . - -. + - - -- + - - - --\n --\n +\n + @@ -637,12 +638,12 @@ - -- + - - --\n --\n +\n + @@ -653,11 +654,11 @@ - - -- + - - --\n --\n +\n + @@ -671,12 +672,11 @@ - - -- + - - \n --\n @@ -684,42 +684,43 @@ \n + - - - - --\n --\n +\n + - - - -- -- + + . - - -- + - -- + - \n --\n + - - -- -- + + - - --\n --\n +\n + @@ -729,7 +730,6 @@ - -- @@ -752,13 +752,13 @@ + . . -. -. + @@ -773,14 +773,14 @@ \n + - -- + . . -. @@ -788,15 +788,15 @@ \n + - - -- + - - -- + . -. @@ -807,18 +807,18 @@ \n + . . -. -. + + . . . -. -. + @@ -829,6 +829,7 @@ \n + - @@ -836,40 +837,39 @@ . . -. -. + \n + - - - - -- + - - -- -- + + . . -. -. + \n + - -- + - -- + . . -. -. + @@ -880,31 +880,31 @@ + . . -. + - -- + - - -- + - - - - -- -- + \n + . -. @@ -917,14 +917,14 @@ + . . -. -. - + + \n @@ -937,12 +937,12 @@ + - . . -. -. + \n @@ -963,12 +963,12 @@ + - -- + . -. @@ -977,13 +977,13 @@ \n + . . . -. + . -. @@ -992,9 +992,9 @@ + - -- \n @@ -1026,9 +1026,10 @@ + . \n -.\n + @@ -1043,8 +1044,7 @@ - - -- -- + \n @@ -1058,17 +1058,18 @@ + . - - -- -- + + - - - --\n --\n +\n + @@ -1081,8 +1082,7 @@ - - - -- -- + \n @@ -1094,16 +1094,17 @@ + - . -. + . - \n --\n + @@ -1117,14 +1118,13 @@ - -- + - - - - -- -- + \n @@ -1133,21 +1133,21 @@ + . - -. -- + + - . -. + - - -- + - \n --\n @@ -1156,12 +1156,12 @@ + . - - -- -- + \n @@ -1173,20 +1173,21 @@ + - . -. + . . -. + - \n --\n + @@ -1197,12 +1198,11 @@ - - -- + - - - -- -- + \n @@ -1215,14 +1215,14 @@ + - - -- -- + + - - -- -- + @@ -1233,10 +1233,10 @@ + - - -- -- + \n @@ -1246,19 +1246,19 @@ + - - -- + . - - - -- -- + \n @@ -1266,54 +1266,54 @@ + - - -- + . - - - -- -- + \n + - - -- + - - - - --\n --\n +\n + - . -- + - - -- -- + \n + - -- @@ -1325,41 +1325,41 @@ + - - - -- + - - - -- + - - - -- -- + \n +. . -. + . . -. -. + + . . -. + - -- @@ -1367,31 +1367,32 @@ \n + - -- \n \n + - - -- + - - -- -- + + . - -. -- + \n + - - -- -- + + @@ -1399,102 +1400,101 @@ . -. \n + - - -- + - - -- + . - -. -- + \n + - - -- + - - - - -- -- + \n + - . - -. -- + + - - -- -- + \n + - - -- -- + \n + - - -- -- + + - . - -. -- + \n -. -. . + -. +. + \n + - -- + . -. \n + - - -- + - - -- -- + \n @@ -1504,46 +1504,46 @@ \n + . . -. -. + \n + . -. \n + - - -- -- + \n + - -- \n +- -- \n + - -- \n - + \n +- -- \n @@ -1552,78 +1552,78 @@ \n \n + . - - -- -- + \n + - -- + - - . -. + - \n --\n -. -. +. + + - \n --\n - + + \n -\n + . - - -- -- + \n + - -- + - \n --\n + - -- + - - -- + - \n --\n \n + . -. @@ -1632,11 +1632,11 @@ \n + . . . -. -. + @@ -1647,120 +1647,121 @@ \n + - -- \n + - -- \n + . . -. -. + \n + - - -- -- + \n + - \n --\n + - -- \n + . \n -.\n \n \n + - - -- + - - -- -- + + - - -- -- + + . . -. -. + + - -- + . . -. + . - -. -- + \n +- - - -- + - -- + . - . - -. + - - - -- -- + + . - -. -- + \n +. - -. + - - -- + - - @@ -1773,143 +1774,143 @@ . - -. -- + + . - - -- + . . - -. -- + + - \n --\n + - -- + - . -. + . - -. -- + + . - -. + - - -- -- + \n +- - - -- + - - -- -- -. -. + +. + + . + -. - -\n + \n . -. +. + - - -- + . - - -- -- + + . - -. -- + + . - -. + - . . -. -. + \n + - - - -- + . - -. + - - -- -- + + - . - -. + . - \n --\n - . -. +. + + - - -- -- + + - - -- + . -. + . . . -.\n -.\n +\n + @@ -1919,113 +1920,112 @@ - -- + . - -. + . - - -- -- + + - - -- -- + \n +. + -. - - -- -- + + - - -- + - - -- + - -- + . \n -.\n + . -. + . . -. -. + + - - -- + - -- + . \n -.\n + . - -. + . . . -. + - - -- -- + + - - -- + - -- + - - -- \n + . . - -. -- + + . . - - - - -- + - -- \n +- + -- - - -- + - -- + - - -- @@ -2033,36 +2033,36 @@ + . . - -. -- + + . - - - -- + - -- \n + . - -. + - - -- -- -. - -. + +. + + @@ -2071,37 +2071,38 @@ \n + . - -. -- + + - - -- -- + + . - -. + - - -- -- + + - . -. \n + . . . -. + - - -- -- + + . @@ -2109,96 +2110,96 @@ . - -. -- + + - - -- -- + \n + . - -. -- + + - - -- + - -- + - -- \n + . . . -. -. - + + \n + - -- + . -. - + \n + . - -. -- + + - - -- + - -- + - -- \n + . . + -. - + - - -- + - -- \n + + -+ + . @@ -2206,59 +2207,59 @@ - -- + . -. + . - -. -- + \n + . - -. -- -. -. +. + + + . . . -. -\n + \n +. + -. - - -- + . - - -- + - -- \n + . - -. + - - -- + . - @@ -2266,31 +2267,30 @@ - - - -- -- + \n + - -- + - -- + - - -- + - -- \n + - - -- -- + @@ -2300,14 +2300,14 @@ \n + . . . -. + . -. @@ -2318,49 +2318,50 @@ + - - -- -- + + . . -. + . -. \n + . -. + . . -. -. + + . - -. -- + \n + . - -. -- + + . -. + . . @@ -2369,22 +2370,22 @@ . -. + . . . -. + . -. + - - --\n --\n +\n + - -- + @@ -2394,8 +2395,8 @@ - - - -- -- + + - @@ -2403,14 +2404,14 @@ . - -. + - - --\n --\n +\n + - -- + @@ -2420,31 +2421,31 @@ . -. + . - -. + . \n -.\n + . - -. + - - - -- -- + + . -. + . . -. -. + + @@ -2452,208 +2453,208 @@ . - -. -- + \n +. + -. - - -- -- + + - - -- + . . -. + - -- + . \n -.\n + . - -. + - -- + - - -- -- + + . -. \n + - -- + - - -- + - -- \n + . - -. -- + + . - -. -- + \n + . - -. + - -- + . -. + . -. + . - -. -- + \n + . -. + - - -- + - -- + . -. + . . -. -. + \n + . - -. + - - - -- + . . -. + - - - -- + . - -. -- + + - \n --\n + - -- + . - - -- -- + + . -. + . -. \n + . . -. -. + + - - -- -- + + - - -- + - - -- -- + + - - -- -- -\n -. +\n +. + + . -. + - - -- + . -. + . -. + . - -. -- + \n + - - -- + - -- + - - @@ -2661,86 +2662,86 @@ - - - --\n --\n +\n + . -. + . -. + - - -- + - - - -- + - - -- -- + + - -- \n + - + . - -. -- + \n + . . . -. + - -- + . -. - + + . -. + . . . -. -. + \n + . + -. - -- + . - @@ -2749,11 +2750,10 @@ . -. + . -. \n @@ -2762,48 +2762,49 @@ + . -. + . -. \n 2772 + . -. + . . -. -. + + + -+ + . - -. -- + \n + . . . -. - + + . @@ -2811,43 +2812,43 @@ . -. + . . -. -. + + - -- \n . -. -. +. + + - -- + . . -. -. + + - - -- -- + + . -. \n + . - -. + - -- + @@ -2855,54 +2856,54 @@ . -. + . - -. + - - --\n --\n +\n + - -- -+ -+ ++ + \n - -- +- + . . . -. -. + + - - -- -- + + . -. + . - -. + . - -.\n --\n +\n + @@ -2916,44 +2917,44 @@ . -. \n + . - -. -- + + - \n --\n + . - - -- -- + \n + - - -- + - - - - -- + - - - --\n --\n +\n \n + + - @@ -2961,91 +2962,91 @@ . . . -. -. + + . -. \n + - - - -- -- + + + -+ + - \n --\n + . . -. -. + + . - - \n --\n + . . -. + - - -- + . - - \n --\n + - \n --\n + - -- + . - -. + - - --\n --\n +\n + - - -- -- + + - - - -- + - -- + - \n --\n + @@ -3053,437 +3054,437 @@ . - -. + - \n --\n + . -. + . + -. - - -- + . \n -.\n + . -. + . -. \n + . - - -- -- + + . . \n -.\n + . -. + . - - - -- -- + + - -- \n + - - - -- + . \n -.\n + - . -. + - - -- -- + + . - -. + - \n --\n +- . - - - -- + - - -- -- + + - . - -. + - - -- + - - -- + - - - -- -- + + - \n --\n - -- -- +- + + - - -- -- + + . . -. + - . - -. -- + + . -. + - . - -. + . - -. -- + \n + . -. + . . -. -. + + . . -.\n -.\n +\n +- - -- + . -. + - - -- -- + + . - -. -- + \n + - - - - -- -- + + . -. \n + - -- + - - -- + - -- + . -. \n + . -. \n + . - - -- -- + + - - --\n --\n +\n + . -. + . - -. + - - --\n --\n +\n + - - - \n --\n + - - -- -- + + . -. + - . - -.\n --\n +\n +- - -- -- + + - - - -- -- + + - - -- + - -- + - - - --\n --\n +\n +- - - -- -- + + - -- + . . -. + . \n -.\n + . - - -- -- + + - - -- + . -. + - - -- -- + + - - -- + - - --\n --\n +\n + - -- + . -. + . . -. -. + + . - - -- -- + + . . -.\n -.\n +\n + . . . -. -. + + - - -- + . . . -. + - -- + . -. + - - --\n --\n +\n + - - -- + . . -. + . . . -. + . . . -. + - - --\n --\n +\n + . - -. + . . -. -. + + . . -. -. + + . -. + . - -. -- + \n + . - -. + . . -. -. + + . . -. -. + + @@ -3491,22 +3492,22 @@ - - -- -- + \n + . - -. + - -- + - - - -- -- + + @@ -3514,67 +3515,67 @@ . - -. -- + \n + . - -. + - - -- -- + + - - . . -. + - - -- -- + + . - \n --\n + . -. + . -. + - -- + . - -. -- + + - - - -- + . \n -.\n + . . -. + . . -. -. + + . . @@ -3582,148 +3583,147 @@ - - - --\n --\n +\n + . - -. + - - - -- -- + + . - -. + - . . -. + - . - -. -- + + - \n --\n + . - - -- -- + + . . -. -. + + . . + \n -.\n -\n + . . -. + - - -- + - -- + . -. + . . - -. + - -- \n + . - -. + - - - -- -- + + . - -. + - - - -- -- + + . - -. -- + \n + - -- + . . - -. + . - -. -- + \n + . - -. + - -- + - - -- -- + \n + . - -. -- + \n @@ -3737,80 +3737,81 @@ \n + . -. \n + - -- \n + . -. + . - -. + - \n --\n \n + - -- + - - - --\n --\n +\n + - - -- + - -- + - \n --\n + - - - -- + . - -. + . - -. -- + \n + . - -. -- + + - -- + - -- + . \n -.\n + @@ -3821,35 +3822,35 @@ - -- \n + . - -. + - - -- -- + + . -. + . -. \n + . + -. @@ -3857,23 +3858,22 @@ - - -- -- + \n + . + -. . -. - + @@ -3882,19 +3882,20 @@ \n + - - -- -- + + . -. + . - -. -- + \n -3894 - +3894 +- - @@ -3902,124 +3903,124 @@ . -. \n + . -. + - -- + . + -. . -. + - -- + . \n -.\n + . . -. + - - -- + . - -. -- + + . . . . -. -. + + - -- + . - -. + - - - --\n --\n +\n + - - -- + - - -- + . . -. + . - -- \n + . -. + . - - -- + . -. \n + - + . -. + . -. + . . -. -. + + . - -. + - - --\n --\n +\n + @@ -4028,96 +4029,96 @@ - \n --\n + . . -. \n + - - -- -- + \n + . + -. - - -- -- + + . . -. \n + - - - - -- + - -- + - -- + . - - --\n --\n +\n + . - - - -- + . - - -- + . -. + . - -. -- + \n + . - - -- + . -. \n + . - - -- -- + + . - \n --\n + . @@ -4127,188 +4128,187 @@ . -. + . . -. \n + . - -. + - - -- + . -. + . -. \n + . - -. + - - - -- + . -. + . . -. -. + + . - -.\n --\n +\n + . . . . -. -. + \n + . . . . -. + - - -- -- + \n + . -. \n + . . -. + . -. \n \n + . . -. \n + . - - -- -- + + - - --\n --\n +\n + . -. \n + - - -- + . -. + . -. \n + . - -. + - - --\n --\n +\n \n + - - -- -- + \n + - - --\n --\n +\n \n + - \n --\n + . - -. + - - --\n --\n +\n + - - --\n --\n +\n + . . -. + . \n -.\n + - -- \n \n @@ -4316,45 +4316,45 @@ + - \n --\n + - - -- + . - -. -- + \n + - \n --\n + - \n --\n + - \n --\n + - -- + - \n --\n + - - \n --\n \n @@ -4364,71 +4364,72 @@ \n + . \n -.\n + . - -. -- + + - \n --\n + . - -. -- + + . . -.\n -.\n +\n + - - -- -- -. -. + +. + \n +- - - -- -- + + . -. \n +. + -. . - -. -- + + . -. + . -. \n + - -- + - -- + @@ -4437,143 +4438,142 @@ . -. \n + . - -. + - - -- -- + + - . -. + . . . -.\n -.\n -4459 -. +\n +4459 . + \n +. + -. . -. \n + . - -. + - - -- \n + - - -- \n + . . -. + - - -- -- + \n + - - -- \n + . . -. -. + \n + . - -. + . . -. \n + - + . -. \n + . . . -. + - - -- + . . -. + . -. \n + . . - -. -- + \n +. - -. -- + + . -. \n + - - - -- -- + \n @@ -4581,8 +4581,8 @@ \n - -- -- +- + \n @@ -4590,10 +4590,10 @@ \n + . - -. -- + @@ -4601,22 +4601,23 @@ \n + - - -- -- + \n + . - -. + . -. + . @@ -4625,91 +4626,91 @@ . -. \n . -. -. +. + + . - -. -- + \n +. -. + - - . -- -. -. -. +. + + + - - -- + . - - - -- + +- - - +\n - --\n --\n - - -- + . - - -- + - - - - --\n --\n +\n + . - -. + - - - -- + - - - - -- -- + + +- - - +\n - --\n --\n -- + - -- + - @@ -4717,150 +4718,148 @@ - - -- + - \n --\n - - - -- -- - -- + +- + + - - - - -- -- + + - - - -- + - - . - -.\n --\n +\n +- - - -- + - - - -- + - . - -. + - \n --\n + - - -- -- + + - -- + - - - -- -- + + . - - -- -- + + - \n --\n + - -- + - -- + . -. + - -- + . . -. -. + + . -. \n + - -- + - -- + . . . -. -. + + - - - -- + - \n --\n + - -- + - -- + . - - - -- -- + + - - -- + - \n --\n + . . -. -. @@ -4868,61 +4867,63 @@ - + + + . . . . -. -. + + - - - --\n --\n +\n + . . -. + . . . -. + . . . -. + . -. + - -- + . -. \n + . -. + - - -- + - - -- -- + \n + . . @@ -4933,18 +4934,18 @@ - -- - + + - - -- -- + + - -- + - - @@ -4953,13 +4954,13 @@ - -- \n + - - @@ -4968,27 +4969,27 @@ - -- \n + - - -- -- + + - - - -- \n + - -- + @@ -4996,41 +4997,41 @@ - - -- + - - - --\n --\n +\n + - - -- + - -- + - - -- \n + - - -- + - - - - -- + - -- + @@ -5039,112 +5040,111 @@ - - - --\n --\n +\n + . - -. -- + + - - -- + - - - -- -- + + . - -. + +- - + + - -- -- - +\n - --\n --\n - - -- -- + + - - -- + - - - - - -- -- + + - . -. + . - -. + - \n --\n + - . - -. + - - . - -. + - -- + - - -- + - \n --\n + . -. + - -- + - -- + - -- + - \n --\n + . . -. -. + + . -. @@ -5154,6 +5154,7 @@ \n + - - @@ -5161,75 +5162,74 @@ - - - -- -- + \n + . . . - -. -- + + . -. \n + - -- + - - -- + - . - -. + - - - - - -- + - \n --\n + - -- + . -. + - - - - -- -- + + - - -- + - -- @@ -5237,190 +5237,191 @@ \n - -- -- +- + + - -- + - - - - -- -- + + - - . - -. -- + \n + . -. - + + . -. + . -. + . -. + - - --\n --\n +\n +- + -- . -. + . -. + . - -- + - - -- \n + - -- + - -- + - - -- -- + + - . - -. + - - - - --\n --\n +\n +- - - -- + - - -- + - - - - -- -- + + - -- + - - -- + - -- + - \n --\n + . . -. -. + + . . -. -. + + - -- + . \n -.\n + - -- + - -- + . . . -. -. + + - - \n --\n +- -- + - - -- + - -- + - . @@ -5428,22 +5429,22 @@ - - - -- + - \n --\n + - -- + - - -- + . -. + @@ -5451,140 +5452,139 @@ - -- + - -- + - . - -. + - - - -- -- + \n + . . -. -. + + - -- + - . -. + . -. + - - -- + - -- + - . - -. -- + \n + . . -. -. + + - - -- + - - -- + . . -. + . -. + - -- + - \n --\n +- + -- - -- + - -- + - - - -- + - - - - -- -- + \n + . -. + - -- + - -- + - - -- -- + + - - - --\n --\n +\n + . -. + - -- + - -- @@ -5596,208 +5596,209 @@ \n + - -- + - - -- -- + + . -. - - - + + + + - -- - + + \n -\n - + + . -. + . -. + - - - -- -- - + + + . -. - + + . \n -.\n - - - + + + + - . -. + . . -. -. + \n + . . -. -. + + . -. + . -. + - - - -- + . -. \n + . -. + . -. + - - -- + - -- + - -- + - - - -- + - - - - -- -- + \n + - - - - - -- -- + + - -- + - - - -- + - - - -- + - \n --\n + . -. + - - -- -- + + - - -- + @@ -5805,23 +5806,23 @@ - - -- + - \n --\n + - - -- -- + + . -. + . -. + @@ -5829,48 +5830,48 @@ - -- \n + . - - -- -- + + . . -. -. + + . -. + - - - -- -- + \n + - - - -- -- + + - - -- + - -- + @@ -5879,83 +5880,82 @@ - -- + - - - -- -- + \n + - - - -- -- + + - - -- + - -- + - -- + - -- + - - - -- -- + \n + . -. + - - -- + - -- + . + -. - - -- + - -- \n + - -- + - -- + - -- @@ -5972,13 +5972,14 @@ + - - - -- + @@ -5986,7 +5987,6 @@ - -- \n @@ -6004,14 +6004,15 @@ \n 6007 + - - -- + . -. + @@ -6027,17 +6028,16 @@ - -- \n + - - -- + . -. @@ -6046,50 +6046,50 @@ \n + - - -- + - - - -- -- + + - -- + . -. \n + - -- - + + . -. - + + . -. @@ -6097,61 +6097,63 @@ \n + - - -- + - - -- -- + + . . -. -. + + . . -. -. -. +. + \n + . - - - -- + - - -- + . -. + - -- + - - \n --\n +- . -. + + @@ -6159,13 +6161,12 @@ - . + -. - + @@ -6175,29 +6176,28 @@ - -- \n +- - . . . -. -. + + . . -. -. - + + + . . -. -. + @@ -6205,64 +6205,65 @@ + - -- - + \n + - - - -- -- + + - -- + . . -. + - -- + - - \n --\n . -. -. +. + + . -. + . -. \n + . -. + @@ -6271,42 +6272,42 @@ - -- \n + - -- + . -. + - -- + . -. + - - -- + . \n -.\n + - - -- -- + + - -- + - - @@ -6315,37 +6316,37 @@ - -- + - -- \n + - - - - - -- + - - -- + - - -- + . -. + . -. -\n + \n + - @@ -6356,42 +6357,42 @@ - - -- -- + + - -- + - - -- \n + - - - -- + - - - - - -- + - - -- + - - -- + . \n -.\n + - - @@ -6400,81 +6401,81 @@ . -. + - -- + - - -- -- + + . -. + . -. -\n + \n + - + . -. + . . -. -. + + . - - -- -- + + - - \n --\n - -- -- +- + + . - -- -- -- +- + + - - -- -- + + - - -- + - - -- -- + + - -- \n + - - - - - -- + - - @@ -6485,8 +6486,7 @@ - - - -- -- + @@ -6495,60 +6495,61 @@ + - - -- + - - - - -- + - - - -- + +- - + - -- - +\n - --\n --\n -- + - - -- + - - - - -- -- + + - - -- + - - --\n --\n +\n +- - - - -- + - - - -- + - - - - -- + - - @@ -6556,59 +6557,59 @@ - - - -- + - -- \n - -- -- - + - + - - -- - + - -- +- + . . . -. -. + + - - -- + - - \n --\n + . - - - -- + - - - - -- + - - -- + - - \n --\n +- + -- - @@ -6617,155 +6618,154 @@ - - -- -- + + - - -- + - - -- -- + \n . -. -. +. + + - -- + - \n --\n + - - - - -- -- + + - - -- + . - - -- + - - --\n --\n +\n +. - -. + - - -- -- + + . . -. -. + + . . -. -. -. + -. . + -. +. + \n + . - - -- -- + + . -. + . -. + - -- \n + . . -. + . -. + . -. + . -. - + + . -. \n + - -- + - -- + - -- + - -- + . -. + - -- + - \n --\n + . -. @@ -6777,39 +6777,40 @@ + . . -. + - - -- -- + \n + - - - -- -- -- + + - -- - -- +- + + - -- \n + . . -. -. - + + + @@ -6826,7 +6827,7 @@ - \n --\n + - @@ -6834,75 +6835,75 @@ . - -. -- + + - - -- -- + + . -. + - - --\n --\n +\n + . . -. -. + + . - - -- -- + + - -- + - -- + . -. + - \n --\n + . . -. -. + + . . -. -. + + - - -- + - \n --\n + - - - - -- -- + + . . -. -. + + @@ -6914,115 +6915,115 @@ - \n --\n + - -- + . -. + - -- + - -- + . -. + . -. + . \n -.\n + - - -- + - - -- \n + - - -- -- + + . -. + - -- \n + - -- + - -- + - - \n --\n + - - -- + - - -- + - - -- + - - -- + - - -- + - - --\n --\n +\n + - - -- + - - - -- -- + + - - - --\n --\n +\n +- - -- -- + + @@ -7037,10 +7038,10 @@ - - - -- + - \n --\n + @@ -7053,14 +7054,14 @@ - - - -- + - - -- + - - --\n --\n +\n + @@ -7076,12 +7077,11 @@ - -- + - - --\n --\n +\n @@ -7098,6 +7098,7 @@ + - . @@ -7106,7 +7107,6 @@ - -- \n @@ -7121,16 +7121,17 @@ + - - . -. + - \n --\n + @@ -7143,14 +7144,14 @@ - -- + - - -- + - \n --\n + @@ -7160,27 +7161,27 @@ - -- + - - - --\n --\n +\n + - - -- -- + + - \n --\n + @@ -7191,15 +7192,14 @@ - - - -- + - - -- + - - - --\n --\n +\n @@ -7212,20 +7212,20 @@ + . - \n --\n + - - \n --\n @@ -7234,15 +7234,15 @@ - + + - - - -- + - \n --\n @@ -7250,107 +7250,108 @@ - + + - - -- -- + + - - --\n --\n +\n + - - -- -- - + + + - -- + - - \n --\n + - -- - + + +- - + + - -- -- - +\n - --\n --\n -- + - - - - -- -- + + - - -- -- + + - - -- + - - -- + - - - --\n --\n +\n + - - -- + - - - -- + - - -- -- + + - - - - -- -- + + - - - - - -- + - - - - --\n --\n +\n . -. -. +. + + @@ -7359,46 +7360,46 @@ - -- + - - - - -- -- + + - - \n --\n -7378 - +7378 - -- - + - --\n --\n +- +\n + - - -- -- + + - - -- + - - -- + - - --\n --\n +\n . -. -. +. + + @@ -7407,85 +7408,84 @@ - -- + - - - - -- + - \n --\n + - - -- + - - - -- -- + + . - -. + - - -- + - - --\n --\n +\n + - - - -- + +- - + + - -- -- - + - -- - - + - -- - +\n - --\n --\n -- + - - -- \n . -. -. +. + + - - -- + - -- + - -- @@ -7495,40 +7495,40 @@ \n + - -- + - -- + - - - -- + - - - -- -- + \n +- -- + . - -. -- + - -- - -- +- + @@ -7546,19 +7546,19 @@ \n +- + -- . - -. + - - -- + - -- @@ -7578,18 +7578,18 @@ \n +- -- + - - - - -- + - -- @@ -7600,16 +7600,16 @@ \n +- + -- - - -- + - -- @@ -7619,10 +7619,10 @@ + - - -- -- + @@ -7632,50 +7632,50 @@ \n +- -- \n . -. -. +. + \n . -. -. +. + \n +- + -- - -- \n + - - -- -- + \n + - -- + - -- \n + - - -- -- + @@ -7687,9 +7687,10 @@ \n + - -- + @@ -7697,336 +7698,335 @@ - - - -- + - \n --\n + - -- + - -- - + + - + -- - - -- -- + + - - --\n --\n +\n + - - -- + - - -- -- + + - -- + - - - - - --\n --\n +\n +- - -- -- + + - - -- + - - -- + - - -- -- + + - - -- + - - \n --\n +- -- + - - -- + - -- + - - -- + - - --\n --\n +\n +- + -- . -. + - - -- + - -- + - - --\n --\n +\n +- + -- . -. + - - -- + - -- + - - --\n --\n +\n +- + -- - - -- + - -- + . -. + - - --\n --\n +\n +- -- + +- - - + - -- - - +\n - --\n --\n - - - - -- + - - -- + - - - -- + - -- \n . -. -. +. + + - - -- -- + + . . -. -. + + - - -- -- + + . \n -.\n +- + -- - -- + - -- + - - -- \n + - -- + - -- + - - - -- + - - - -- + - - -- + - \n --\n + - - -- + - - -- -- + + \n -\n + - -- + - - - -- + - - -- -- + \n + - - -- + . - -. + - - -- -- + + - - -- + - -- + - -- + - - - --\n --\n +\n +- - - -- + - -- + - - -- + - - -- + - - - --\n --\n +\n +- + -- - - -- + - - -- @@ -8035,8 +8035,9 @@ \n . -. -. +. + + @@ -8045,16 +8046,15 @@ - -- + - - - - -- + - \n --\n @@ -8064,37 +8064,38 @@ + +- - +\n - --\n --\n - -- + - - -- -- + + - -- + . -. + - -- + - -- \n + - -- + - @@ -8104,29 +8105,27 @@ - - -- -- + + - -- + - - - --\n --\n +\n + - -- + - - -- -- + + . - -. -- @@ -8136,50 +8135,51 @@ + + +- - +\n - --\n --\n - - - -- + - - -- -- + \n . -. -. +. + + - - -- -- + \n +. + -. - - - - -- + - - -- + - -- \n @@ -8193,15 +8193,15 @@ \n + - - -- -- + + - - -- -- + \n @@ -8209,13 +8209,14 @@ + . -. + . -. \n + - - @@ -8225,165 +8226,165 @@ - - - -- + - - - --\n --\n +\n +. - -- + - - -- + - -- \n . -. -. +. + + . - - -- + - -- + . - -. + - - \n --\n + - - -- -- + + - - - -- -- + \n . -. -. +. + + . - - -- + - -- + . - -. + - - - -- + - \n --\n + - - - -- + - - -- + - - - -- + - - \n --\n + - - - -- + - - - - -- + - - - - -- + - - - -- -- + + . - -. -- + \n . -. -. +. + + . . -. + . - -- + - - - -- + - \n --\n + - - -- + - - @@ -8394,156 +8395,155 @@ - -- + . - - - --\n --\n +\n +- . . -. + - - -- + - -- + - - -- -- + + - \n --\n + - - -- -- + + . -. + - - - -- -- + + . -. + - \n --\n - -- -- +- + + . -. + - - - -- + - - - -- + - - - -- + - - - --\n --\n +\n +- - - -- + - - - -- + - -- \n . -. -. +. + + . -. + . -. + - -- + - - - \n --\n + - - - - - -- + - - -- + - - - -- + - \n --\n + - -- + - - -- + - -- + - - - -- -- + + - - - -- -- + @@ -8556,39 +8556,40 @@ + - - - -- + - - - -- -- + + - -- \n . -. -. +. + + . . -. -. + + - - -- -- + + - - --\n --\n +\n + @@ -8600,13 +8601,13 @@ - -- + - - - --\n --\n +\n + @@ -8615,38 +8616,37 @@ - - - -- + - - - --\n --\n +\n + - -- + - \n --\n + - - - - --\n --\n +\n + - -- + - - --\n --\n +\n @@ -8655,8 +8655,9 @@ \n . -. -. +. + + @@ -8665,37 +8666,37 @@ - \n --\n + - - - - - -- + - - --\n --\n +\n + - -- + - -- \n . -. -. +. + + - - \n --\n + @@ -8706,83 +8707,83 @@ - - - -- -- + + - - -- + - - -- + - -- \n + - - -- + . - -- + - - - --\n --\n +\n + - - -- -- + + - - -- -- + + - -- \n . -. -. . + + . -. -. +. + + - -- + - -- + - - - - -- -- + \n + - - @@ -8791,65 +8792,65 @@ - -- + - - - -- + +- - + - -- - + + - -- -- - +\n - --\n --\n - - - -- + - - -- -- + + - - -- + - - -- + - - - - -- -- + \n + - -- + . - - - -- + - - -- + - - --\n --\n +\n +- . @@ -8861,22 +8862,22 @@ - - -- + - - \n --\n + - - - -- + - - - - -- + - - @@ -8889,41 +8890,41 @@ - - - --\n --\n +\n +- - -- + - - -- -- + + - - -- -- + + - - -- -- + + - - -- + - - -- -- + \n . -. -. +. + + - -- + - @@ -8931,113 +8932,113 @@ - - -- + - \n --\n + - - - - -- + - -- + - - -- + - - - --\n --\n +\n +- - - -- -- + + - - - - -- -- + + - - -- + +- - +\n - --\n --\n - - -- + - - -- + - - - -- + - - - - -- + - \n --\n - - -- - - + +- +- + - -- - +\n - --\n --\n - - -- + - - - -- + - - - -- + - - \n --\n +- - - -- -- + + - - -- -- + + - - -- + - - @@ -9046,66 +9047,66 @@ - - - --\n --\n +\n + - - -- -- + + - -- + - - -- -- + + - -- + - \n --\n + . -. \n . -. -. +. + + - -- + . . -. -. + + - - --\n --\n +\n + - - -- + - - - -- + - - @@ -9114,15 +9115,15 @@ - \n --\n + - - -- + - - -- + @@ -9130,40 +9131,39 @@ - - -- + - - - --\n --\n +\n +- - - - -- + - - - - -- + - - -- + - \n --\n + . . -. -. + @@ -9182,10 +9182,11 @@ \n + - - -- -- + + @@ -9195,16 +9196,16 @@ - - -- + - - --\n --\n +\n + - -- + @@ -9214,95 +9215,95 @@ - - -- -- + \n . -. -. +. + + - \n --\n . -. +. + . - - -- + - - -- + - - \n --\n + . - -. -- - -- - +- + + + -\n + \n + . . -. -. + + . -. + . -. + . - -. + - - --\n --\n +\n +. . -. + - -- + - - -- + - -- + . -. + - \n --\n + @@ -9313,53 +9314,52 @@ - - - -- -- + \n + - - -- -- + + . -. \n + - -- + - -- \n + . - -. + - - -- -- + + - -- + - - - -- -- + @@ -9371,64 +9371,65 @@ + . - - -- -- + \n + - -- + . . . -. + . . -. -. + \n + . -. + - - -- -- + + - -- + - \n --\n +. -. + . - - -- -- -. -. +. + + + - - -- + - - @@ -9436,50 +9437,50 @@ - - - --\n --\n +\n +- - - -- + - - - -- + - - - - --\n --\n +\n + - - -- + - - - -- + - - - - -- -- + + +- - - +\n - --\n --\n -- + - -- + - @@ -9487,58 +9488,57 @@ - - -- + - \n --\n - - - -- -- - -- + +- + + - - - - --\n --\n +\n + - - - -- + - - . - -.\n --\n +\n +- - - -- + - - - -- + - . - -. + - \n --\n + . -. @@ -9562,11 +9562,11 @@ \n + . - -- @@ -9582,12 +9582,12 @@ \n + . . . -. -. + @@ -9603,18 +9603,18 @@ \n + . - - -- + - - - -- + - - -- -- + @@ -9630,12 +9630,12 @@ \n . . -. +. + - - - -- -- + @@ -9649,33 +9649,34 @@ \n + . - - -- + - -- \n - + \n + - -- + - -- + . @@ -9683,64 +9684,64 @@ - - -- + - \n --\n - -- +- + - - -- + - - -- + - - -- + - - -- + - - -- + - - --\n --\n +\n + . - -. -- + + . . -. + - - -- -- + + - -- \n +- - -- + - -- + - @@ -9750,26 +9751,26 @@ . . -. -. + \n + - - -- -- + + . . -. -. + + - - @@ -9778,71 +9779,71 @@ . . -. -. + \n - -- - -- +- + + . . -. + - -- \n + - - -- + - - -- + . -. + . -. + - - -- + - \n --\n + . . -. -. + + . . . -. -. + + - - -- -- + \n + - @@ -9852,28 +9853,27 @@ . . -. -. + \n + - - - - -- + - - -- -- + + . . -. -. + + - -- @@ -9881,18 +9881,18 @@ \n + . . -. -. + + . -. + - - -- -- + @@ -9901,14 +9901,14 @@ \n + . - - -- + - -- @@ -9917,24 +9917,24 @@ \n . -. . -. +. + \n + . -. - + @@ -9944,6 +9944,7 @@ + - @@ -9953,14 +9954,14 @@ . . -. -. + \n . . -. -. +. + + @@ -9968,7 +9969,6 @@ . -. @@ -9980,11 +9980,11 @@ + . . -. -. + @@ -9995,6 +9995,7 @@ + - @@ -10004,153 +10005,153 @@ . . -. -. + \n + . . . -. + . -. + - -- \n + . . . -. + . -. \n . -. +. + - -- + . - -. -- + \n + . - -. + - -- + - - -- + - - -- \n + - - + \n + . + -. - + . - -. + \n + . -. - + \n + - - -- -- + \n \n + - -- \n . . . -. -. . -. -- -\n --\n + +. +- +\n + + + . . -. + - -- + - \n --\n +- . -. + @@ -10162,21 +10163,21 @@ - -- \n + + + - - - + . + -. @@ -10185,63 +10186,63 @@ - -- \n +. + -. - -- + . -. + - \n --\n + - -- \n + - -- \n \n \n + - \n --\n \n + - \n --\n + - - - -- \n + . -. + - @@ -10249,29 +10250,29 @@ - -- \n + . . -. + . -. \n + . - - -- + . -. + - \n --\n + - - @@ -10280,31 +10281,30 @@ . . -. -. + \n + - - - -- \n + - - . -. \n @@ -10317,6 +10317,7 @@ + - @@ -10326,8 +10327,7 @@ . . -. -. + \n @@ -10336,10 +10336,11 @@ + - - -- -- + + . - @@ -10350,37 +10351,37 @@ . . -. -. + \n + - - - -- + - - -- -- + + - \n --\n + . . . -. -. + + - - @@ -10389,19 +10390,19 @@ . . -. -. + \n + . . -. -. + + - - @@ -10410,33 +10411,33 @@ . . -. -. + \n + - \n --\n - + + . - + . . -. -. + + - - @@ -10445,15 +10446,15 @@ . . -. -. + \n +. - - -- -- + + - @@ -10463,37 +10464,37 @@ - -- \n + . . -. -. + + - - -- + . -. + - \n --\n + . . -. + - - -- -- + + - - -- + . - @@ -10504,24 +10505,24 @@ . . -. -. + \n + - - - -- -- + + . -. + - - -- -- + + . - @@ -10532,24 +10533,24 @@ . . -. -. -\n +\n + + . -. + . . -. + . - -- + - @@ -10559,23 +10560,23 @@ . . -. -. + \n +. + -. - \n --\n + . . -. -. + + @@ -10588,16 +10589,16 @@ . . -. -. + \n + . . -. -. + + - - @@ -10606,23 +10607,23 @@ . . -. -. + \n +. . -. \n + . -. + - - @@ -10631,20 +10632,20 @@ . . -. -. + \n -10642 +10642 + - -- + - - -- -- + + - - @@ -10653,11 +10654,11 @@ . . -. -. + \n + . @@ -10665,70 +10666,70 @@ - - -- + - -- + . - -- + . - \n --\n +- - - -- -- + + . -. \n + . -. - + + . -. + . - -- - + + . . -.\n -.\n +\n + . -. + - - -- -- + + . -. + . - @@ -10737,24 +10738,24 @@ - - -- + . \n -.\n - -- -- +- + + - - -- -- + + . - -- + - @@ -10768,96 +10769,96 @@ - \n --\n + . -. + - -- + . . -. + - -- + - -- + - -- + - . - -.\n --\n +\n + . . -. + . -. + . - -. + - - - -- + . - -. + - -- + . . . -. -. + \n + . -. + . - -. -- + + - - -- + - - . . -. + - . - -.\n --\n +\n + - . - -. + . . @@ -10868,106 +10869,106 @@ . . -. + . . -. \n +- . -. + . - -. + - - --\n --\n +\n + - -- + - - - -- + - - - -- -- + + - - -- -- + + . . -. -. + \n + - . - -. + - - . . -. -. + \n + . . -. -. + + . -. + . . -. + - . - -. + - - . . -. -. -\n +\n + + @@ -10975,12 +10976,12 @@ - -- - + + @@ -10988,84 +10989,84 @@ - -- \n + - + - - -- -- + + - - -- \n + - + - - -- -- + + - - -- \n + - - -- -- + + - - -- \n + - . -. -. -. +. + + . \n -.\n + - - -- + . . . -. -. + + - -- \n + - . @@ -11074,38 +11075,38 @@ - - -- + - - - -- -- -- -- + +- + + . . -.\n -.\n +\n + - - -- -- + + . . . -. + - -- + @@ -11113,93 +11114,92 @@ . - -. + - \n --\n + . . -. -. - - - + + + + + . -. - + + - -- - + + - - - --\n --\n +\n + . . . -. -. + + . -. + . . \n -.\n + . -. + - - -- \n + - . - -. -- + + . - -. + . - -. -- -. -. + +. + \n @@ -11210,57 +11210,58 @@ + . - - -- + . - -. -- + \n + - . . -. -. + + - -- \n + . -. - - + + + - . . -. -. + + - -- \n + . . @@ -11271,86 +11272,86 @@ . . -. + . . -. + . . -. -. + \n +. + -. - . -. + . - -. + - - --\n --\n +\n + - - -- + - - - - -- + - - -- + - - - - --\n --\n +\n +- +- - - + - -- - - + - -- - - +\n - --\n --\n - - - - - -- + - - - - - - -- -- + \n . -. -. +. + + - @@ -11358,15 +11359,15 @@ - - - --\n --\n +\n . -. -. +. + + - -- + @@ -11375,48 +11376,48 @@ - -- \n + - - - - -- + - - - -- -- + + - - \n --\n + - -- + - - - -- -- + + - - -- + - -- \n + - -- + @@ -11428,7 +11429,6 @@ - -- @@ -11437,27 +11437,27 @@ \n + - - \n --\n + . \n -.\n + - - . . -. -. + \n @@ -11466,49 +11466,49 @@ + - - - -- -- + \n + - - -- -- + + - - -- -- + \n + - - -- -- + + - - -- -- + + . . -. + - -- @@ -11519,22 +11519,23 @@ + - - -- -- + + - - -- \n + @@ -11542,12 +11543,12 @@ - -- \n + @@ -11555,13 +11556,12 @@ - + - - -- \n @@ -11571,10 +11571,10 @@ + - -- \n @@ -11582,11 +11582,11 @@ + - - -- \n @@ -11595,12 +11595,12 @@ + - - -- \n @@ -11608,12 +11608,12 @@ + - - -- \n @@ -11622,27 +11622,27 @@ + - - -- \n + - - -- -- + + - - -- \n @@ -11654,23 +11654,23 @@ + - - -- -- -- + -- +- + + . \n -.\n - + @@ -11682,16 +11682,16 @@ + - . - -. -- + + - -- \n @@ -11700,17 +11700,17 @@ + . . -. + - -- \n @@ -11718,23 +11718,23 @@ + . -. + - - -- + - - . . -. -. + \n @@ -11743,24 +11743,24 @@ + . . -. -. + + . . -. + . -. + - -- \n @@ -11769,245 +11769,245 @@ + - - -- -- + + - -- + - -- \n + . - -. + . - -. + - -- + . . -. -. + + - . . -. -. + + . . -. -. + \n + . . . -. + - . . -. -. + \n + - . - -. -- - + + + . - -. + - - - -- + - - -- + - -- + - -- \n + . - - - -- -- + + . . . -. + . -. + - . - -. -- + \n + - - -- + - - -- -- + + . . -. -. + + - -- - + + - - -- -- + + - -- \n + . -. + - -- \n + - - -- -- + + - -- - + + - - - -- -- + + . -. + - -- \n + . . -. + - -- - + + . . . -. -. + + - -- \n @@ -12015,75 +12015,75 @@ + . . -. -. + + - -- \n 12034 + - - -- -- + + - -- \n + . -. + - -- \n + . . -. + - -- \n + . . -. + - -- \n @@ -12091,12 +12091,13 @@ + - -- - + + - @@ -12105,29 +12106,28 @@ - - - -- -- + + - -- \n + - - -- -- + + - -- \n @@ -12135,41 +12135,41 @@ + - -- \n + . - -. + - - - -- -- + + . . \n -.\n + . - -. + - - - -- + - . . -. -. + \n @@ -12177,52 +12177,53 @@ + . -. + . -. - + + . \n -.\n + . -. + . -. + . . -. -. + + . . -.\n -.\n +\n + @@ -12234,7 +12235,7 @@ . -. + - @@ -12242,22 +12243,22 @@ . -. \n +- - -- + - -- + - @@ -12265,175 +12266,174 @@ - -- \n + . . -. + - -- + . . - -- + - - -- \n + . -. + . - + . -. + . -. + . . -. -. + + - -- + - - -- \n + . -. - + + . . -. + . - -- + - - -- \n + . - -. + . - -- + - - . - -. + - - -- -- + + . . . -.\n -.\n +\n + . -. + . -. + . . -. + - -- + - - -- -- + + - - -- \n + . . . -. + . - -. -- + + . -. + . -. + - - -- -- + + - - -- \n @@ -12441,31 +12441,32 @@ + . -. + . -. + . -. + - - -- \n + . -. + @@ -12473,283 +12474,283 @@ - -- \n + . - -. + - -- + . - -. + - - - -- -- + + . - -. + - \n --\n + - - -- + - -- + - - -- -- + + - -- + . . - -. + - \n --\n . -. -. +. + + . - -. + - - -- -- + + . - -. + - -- + - -- + - - --\n --\n +\n + . . -. -. + + . -. + . + -. - -- + . . - -. + - \n --\n + - - -- -- + + - - --\n --\n +\n + - - - - -- -- + + - - -- -- + \n . -. -. . + . + . -. . + . -.\n -.\n . -. -. +\n . . -. -. - + +. . -. - + + . -. + + + +. + + \n -\n + . . -. -. + + . . -. -. + + - -- + . -. + . . -. -. + + . . . -.\n -.\n +\n + - - - -- -- + + . . -. + - -- + - . - -. -- + + - - - --\n --\n +\n + - - - - -- + +- - - + - -- - - + - -- - - + - -- - - +\n - --\n --\n - -- + - - - -- + - - -- + - - -- + - - -- -- + \n . -. -. +. + + - - - -- -- + + . - -- + - - -- + - -- + . -. + - \n --\n +- - @@ -12760,101 +12761,100 @@ - - - -- + - - -- + - - - - -- -- + + - -- + . - -. + - \n --\n + - -- + - -- + - - - -- + - -- + - -- + - - - -- + - -- + - -- \n - - -- - -- +- + + - - - -- + - - -- + - - - - -- + - - -- \n . -. . -. +. + + . . -. + . . . -. -. + + . . -. -. -\n + + \n @@ -12863,23 +12863,23 @@ + - -- + - - - - -- -- + + - - - -- -- + @@ -12891,239 +12891,240 @@ + - -- + - - - \n --\n . -. -. +. + + - - - -- -- + + . -. + - -- + . -. + . - - - -- + . - -.\n --\n +\n + . . . -. + . -. + - -- + +- - +\n - --\n --\n - - - - -- + - - - -- + - - - - - -- + - - - -- + - - . . -.\n -.\n +\n + - - - -- + - - - -- + - - - -- + - - - - -- + - - - -- -- + \n . -. -. +. + + . . -.\n -.\n +\n + - - -- + - - - - -- -- + + - -- + - - -- + - - - --\n --\n +\n +. . -. -. + + - - -- -- + + . . -. -. + + - . . . -. -. + + . . -. + - \n --\n + - -- - + + . -. + . - - -- -- + + - . -. + . -\n + . - - --\n --\n - +\n + + . -. + - -- + . -. + . -. + - -- + - - -- + - - \n --\n +- + -- - - -- -- + + @@ -13137,21 +13138,21 @@ - \n --\n +- + -- - - -- + - - - -- + - - @@ -13159,85 +13160,85 @@ . - - -- + - \n --\n . -. +. + - - - -- + - . . . -. + - - - -- + - \n --\n + . -. + - - -- -- + + - - -- -- + + - - - -- -- + + - - -- -- + + . . . -. -. + + - - \n --\n + . . -. -. + + . . -.\n -.\n +\n + - -- + - -- + . - -. + - - @@ -13246,53 +13247,53 @@ - - -- + . - -. + - . - -.\n --\n +\n +- - -- -- + + - - - -- + - - -- + - - - - -- + - - -- -- + + - - - --\n --\n +\n +- - -- -- + + - . -. + @@ -13302,94 +13303,94 @@ . -. \n + . . -. -. + + - -- + - . -. + - -- + - - - - --\n --\n +\n + . . -. -. + + - -- + - . -. + - \n --\n + - -- + . . -. + . -. + . . -. -. + + - \n --\n + @@ -13397,73 +13398,73 @@ . -. + - -- + - - -- -- + + . -. \n + - - . - -. -- + + - - -- -- + + - . - -. -- + + - - \n --\n + - - -- + - - -- + - - -- + - - -- + - - -- + - - -- -- + + - . -. \n +- - @@ -13473,93 +13474,93 @@ . . -. -. -- -- + - + - -- +- + \n + - + - - -- + - - - - -- -- + + - -- + . - -. -- + \n - -- +- + - - - - -- -- + + - - - - - - -- + - - -- + - - - -- + - -- \n 13549 . -. . . -. +. + + - - - --\n --\n +\n . -. +. + - - - - -- -- + + @@ -13568,91 +13569,91 @@ - -- + - - - -- + - \n --\n + - - -- + - - - -- -- + + . -. + . -. + - -- \n + - -- + . - -. + - - -- + - \n --\n + . - -. -- + + - - - -- + - - - -- -- + + - - - -- + - - \n --\n + - - - - -- -- + + - -- + @@ -13661,131 +13662,130 @@ . . -. -. + \n + . . -. + - - - - -- + - - - -- + - - - - -- -- + \n + . - -. + - - -- + - - \n --\n + . - -. + - - - - - -- -- + + - - -- -- + + . -. + . -. + - - --\n --\n - - +\n + + + . . . -. -. + + . . -. -. + + - \n --\n - -- -- +- + + . . -. -. + + . -. + . - - -- + - - -- + - \n --\n + . - -. + - - - - -- -- -. -. + +. + + . . -. -\n + \n @@ -13793,21 +13793,21 @@ + . -. + - -- + - - -- -- + + - - - -- -- + \n @@ -13816,19 +13816,20 @@ + . -. + . -. + - -- + @@ -13837,49 +13838,49 @@ . - -. -- + \n + - - - -- -- + + - - - -- + - - -- -- + + . \n -.\n - -- +- + . . + -. - - -- -- + + - -- + @@ -13887,12 +13888,12 @@ . . -.\n -.\n +\n + - -- + . - @@ -13900,16 +13901,15 @@ . . . -. + - - -- + - - -- + . -. @@ -13919,124 +13919,125 @@ \n + . - - -- -- + \n +- . -. + . . + -. - + - - -- + - - -- -- + \n +- - - -- -- + + . -. + - - - --\n --\n +\n + . - -. -- + + - - - -- -- + + . . -. -. + + - - - --\n --\n +\n + - - -- + - . - -. + - - . . -. -. + \n + . - -. -- -. -. + +. + + . -. - + -\n + \n + . -. + - @@ -14044,8 +14045,7 @@ . . -. -. + \n @@ -14056,53 +14056,54 @@ + . . -. + - - -- -- + + - -- \n + . - -. -- + + - -- + - . - -.\n --\n +\n + . . . -. -. + \n + . - -. + - - --\n --\n +\n + @@ -14110,142 +14111,141 @@ . - -. + - \n --\n + . -. \n + - - -- + . . -. -. + \n + . - -. -- + + - . - -.\n --\n +\n - -- -- - + + - -- -- - + + - -- - -- - -- -. -\n -.\n +- + . +\n + -. + +. + + . . -.\n -.\n +\n + - \n --\n +. - -. -- + + - . . -. -. + \n + - - -- + - \n --\n + . - -. -- + + - - - -- -- + \n - -- - -- +- + + - - - --\n --\n +\n + - -- + \n -\n + . . -. -. + + - \n --\n \n \n @@ -14256,128 +14256,129 @@ + - -- \n + - + . -. \n + . -. \n + . . . -. + . -. + . \n -.\n + . -. + - -- + - \n --\n +. -. + . - - -- -- + + . + \n -.\n -\n - + + - - -- + - - - - -- + - - - --\n --\n +\n - - -- +- + - - - -- + - - - - --\n --\n +\n + - - -- + - - - -- + - - - - -- -- + + - - - --\n --\n +\n +- + -- - -- + - @@ -14385,55 +14386,55 @@ - - -- + - - - - - -- -- + + - \n --\n + - - - - -- -- + + - - - -- + - - . - -.\n --\n +\n +- - - -- + - - - -- + - . - -. + - \n --\n + @@ -14442,72 +14443,72 @@ - - - -- -- + \n + - -- + . -. \n + . -. + - - -- -- -\n + + \n + . . . -. -. + \n + - - - - -- + - - -- \n + - - - - -- + - - - -- + - -- \n +. . @@ -14515,114 +14516,114 @@ . -. + - . - -. -- -\n +\n + + . -. - + + - -- + . -. \n + . - - -- + - - - -- -- + + - -- + . -. + . -. \n + - + . . . -. -. + \n + . . . -. + . . . -. -. + + - -- \n + - -- + - - - - -- + - . -. \n +. . -. + - -- + - -- + - -- \n + . . @@ -14631,22 +14632,21 @@ - -- \n + - - - - -- + - - - -- + . - -. -- + @@ -14660,24 +14660,25 @@ \n +. . -. + . -. -. -. +. + + @@ -14686,116 +14687,115 @@ - -- + - -- \n + . -. + . . . -. + . . -. + . -. + - - -- -- + + . . . -.\n -.\n +\n +- . . -. -. + + . . . -. + - -- + - - -- -- + + - - -- -- + \n + - -- + . -. \n + - - - - -- + - - - -- + . - -. + - - -- + . - -. + - - - --\n --\n +\n +. . . -. + - -- + - - -- -- + + . -. @@ -14805,6 +14805,7 @@ + - - @@ -14812,110 +14813,108 @@ - - - -- + - -- + - -- + . . -. + - \n --\n + - -- + - -- + . -. + - - -- -- + + . -. + - -- \n . . -. . + . -. . -. +. + + . . . -. -. + + . -. \n +- -- + . . -. -. + + . . . -. -. + + - -- + - - - -- -- + \n + - -- + . -. + - - - -- -- @@ -14923,28 +14922,29 @@ + + - -- \n + . . -. + . . . -. -. + + - - -- -- + @@ -14953,6 +14953,7 @@ + - - @@ -14960,46 +14961,45 @@ - - - -- + - -- + - -- + . . \n -.\n + . -. + - - - -- + . - -- \n + . -. + . . . -. -. + @@ -15008,39 +15008,39 @@ + - - - -- + - - - -- + - - -- + . - -. + . . \n -.\n + . -. + - - - -- + . - -- \n @@ -15048,6 +15048,7 @@ + - - @@ -15055,22 +15056,21 @@ - - - -- + - - - -- + - - -- + - -- + . . \n -.\n 15081 \n @@ -15095,52 +15095,52 @@ \n + - -- + - -- \n +- - -- \n + - - - -- + . - -. -- + \n - - -- -- +- + + . - -. -- + \n + . -. + - - -- -- + \n +- -- @@ -15149,11 +15149,11 @@ + - . -. \n @@ -15161,98 +15161,98 @@ \n + . . . -. + . - -. -- + + . -. + . . . -.\n -.\n +\n + . -. + . -. + - - -- -- + + - - --\n --\n +\n +. + -. . . -. + - -- + . . -. -. + + . . -. + - -- + - - --\n --\n +\n + . - -. + - - -- + - - \n --\n - + + . -. + . -. + . . . -. -. + @@ -15261,13 +15261,14 @@ \n - -- +- + . -. + . -. + @@ -15275,52 +15276,52 @@ . . -. + - - -- + . - -- \n + - + . -. + . -. + . -. - + + . -. -\n + \n - -. . -. - + +. + + + . -. + @@ -15328,59 +15329,59 @@ - -- + . . -.\n -.\n +\n + . . -. -. + + - - -- -- + + - . - -. + - - -- + - -- \n + - + - -- -. -. +. + + \n -\n + . - -- + @@ -15391,54 +15392,54 @@ . . -. -. + + . . -.\n -.\n +\n +- + -- - - -- -- + + . - -. + - - -- \n + . -. + . -. + - - -- -- + + . . -. -. + \n + @@ -15449,33 +15450,33 @@ - -- \n + . -. - + + - - -- -- + + . . -. -. -\n + + \n + - -- + @@ -15486,13 +15487,13 @@ - -- \n + . -. + @@ -15500,7 +15501,6 @@ - -- @@ -15508,61 +15508,62 @@ \n + - - -- -- + + . - -. + - - -- \n + . -. + . - + . -. + . -. + . . -. -. + + - -- \n + - . - -. + - - -- \n + @@ -15571,100 +15572,100 @@ - - - -- + - \n --\n + . . -. + - -- \n + - - -- -- + + . -. + - - - -- -- + + - \n --\n + . . . -. -. + + . . . . -. + - -- + - -- + . - -. -- + \n + . - - -- -- + + - - - --\n --\n +\n + . - - -- -- + + . -. + . . -.\n -.\n +\n + @@ -15674,10 +15675,10 @@ - - - -- + - \n --\n + @@ -15688,39 +15689,39 @@ . . -. + . + -. - -- \n + . . -. -. + + . - -. + - \n --\n + - - -- -- + + . - -. + . \n -.\n + @@ -15728,21 +15729,20 @@ . - -. -- + \n + . . -. -. + + . . -. -. + @@ -15753,14 +15753,14 @@ + . . -. -. + + . -. @@ -15774,12 +15774,12 @@ \n +. . . -. @@ -15790,15 +15790,15 @@ \n + - - -- -- + + - - -- @@ -15809,12 +15809,12 @@ \n + . . -. + - -- @@ -15824,6 +15824,7 @@ \n +. . @@ -15831,7 +15832,6 @@ - -- @@ -15842,14 +15842,14 @@ \n +. + -. - -- @@ -15859,10 +15859,10 @@ \n +. . -. @@ -15876,10 +15876,10 @@ \n + . - -. -- + @@ -15887,8 +15887,8 @@ \n +. -. @@ -15903,8 +15903,8 @@ \n -15916 -. +15916 . + @@ -15922,10 +15922,10 @@ \n + . - -. -- + @@ -15934,9 +15934,9 @@ \n + . -. @@ -15956,14 +15956,14 @@ \n - -- - -- +- + + . . -. -. + @@ -15980,11 +15980,11 @@ + - . -. @@ -16006,116 +16006,117 @@ \n + . -. + - - -- + . -. \n + . . -. -. + \n + . - -- + - - -- -- + + . -. \n - -- -- +- + + . -. + . - -- \n + . . -. + . + -. . . -. -. + + . -. + . -. + - -- \n +- . . -. -. + + . . -. -. + + . . \n -.\n +- -- + @@ -16126,117 +16127,117 @@ . -. \n + . + -. . -. + . . . -. -. + + . - -- \n + . - - - -- + - - -- + - - - - -- -- + + . . -. -. + + . . -.\n -.\n +\n + . . -. -. + + . -. + . -. + . - -- + - - -- -- + + - - -- \n + . . -. -. + + . . -. -. + + - -- + . -. + . \n -.\n +- + -- - - -- + . - @@ -16245,18 +16246,18 @@ - \n --\n + . - -. + - - -- -- + + - - -- + - - @@ -16265,146 +16266,146 @@ - - -- -- + + - - - -- -- + + - \n --\n -16292 . +16292 +. . . -. -. + + - -- + - -- + - - . -. + . . -. + - \n --\n + . - - -- + . . . -. + - -- + . -. - - + + + - - --\n --\n +\n + . -. + . - -- \n + . - - -- + . . . -. -. + + . -. + - -- + . . -. + . \n -.\n + - - -- + - - - -- -- + \n + . - -. -- + + . . . -. + . -. + - -- + - @@ -16412,18 +16413,18 @@ - \n --\n + - -- + - - -- + . -. + . @@ -16434,19 +16435,19 @@ - \n --\n + . - -. + - - -- + - - -- -- + + @@ -16454,14 +16455,14 @@ . -. + . \n -.\n + @@ -16472,76 +16473,76 @@ . . . -. + . . -. + - - -- + . - -. -- + \n +- - - -- -- + + . . -. + . . -. + . . -. + . - - -- + . -. + . - -- \n + . - -. + - - -- + - -- + - - --\n --\n +\n \n + - - -- + . . . -.\n -.\n +\n + @@ -16551,46 +16552,45 @@ - - -- -- + + - - - --\n --\n +\n + - - -- + - - - -- -- + \n + - -- + . . . -. -. + + . . -. + - -- \n @@ -16601,22 +16601,22 @@ + - - - -- + . -. + . - - -- + - - --\n --\n +\n @@ -16624,9 +16624,10 @@ + . -. + @@ -16634,8 +16635,7 @@ . - - -- -- + \n @@ -16644,12 +16644,13 @@ + . - - -- -- + + . @@ -16657,7 +16658,7 @@ - \n --\n + . @@ -16665,21 +16666,21 @@ - - -- -- + + - -- + - - - -- -- + + . . -.\n -.\n +\n + @@ -16687,20 +16688,20 @@ . -. + - . - -. + - - \n --\n + . @@ -16708,88 +16709,88 @@ - - -- -- + + - -- + - - - -- -- + + . -. \n + . . -. + - . - -. + - - \n --\n + . - - -- + - - - -- + - - -- -- + + - - -- + - - -- -- + + . -. -\n + \n + . . -. + . . -. -. -- -- + +- + + - . - - -- + - - \n --\n + . @@ -16797,47 +16798,47 @@ - - -- -- + + - -- + - - - -- -- + + . . \n -.\n + . -. + . . -. + . . -. -. + + - -- + . . -. + - . . . -.\n -.\n +\n + . @@ -16845,28 +16846,28 @@ - - -- -- + + - -- + - -- + . . . . -.\n -.\n +\n + . . -. -. + + - -- + @@ -16876,18 +16877,18 @@ - -- \n + - - - -- -- + + @@ -16902,8 +16903,7 @@ . . -.\n -.\n +\n @@ -16923,146 +16923,147 @@ \n -16939 . +16939 +. -. + . . . -. -. + \n + - - -- -- + + - - - -- -- + \n + . . -. + . - -- + - -- \n + - - -- + . - -. + - - -- + - -- + . -. \n +- -- + . -. + - - -- + - - -- -- + + - . . -. -. + \n - -- -- +- -. -. + +. + + - -- + . . -. + - - - -- -- + + . -. + . - -.\n --\n +\n +- - - - -- -- + + - - - -- -- + + . . - - -- + - \n --\n + . @@ -17070,260 +17071,260 @@ - - -- -- + + - - -- + - . . -. + - -- + - \n --\n + - -- + - -- + - - -- -- + + - - - -- -- -. -. +. + + + . \n -.\n . -. -. +. + + . . -. + - -- - + + - - -- + - - -- + - - -- + . . -. + . \n -.\n - -- +- + . . . . -. -. + + . -. + . -. + - \n --\n 17182 + . - - - -- -- + + - - -- + - . . . -.\n -.\n + \n + - - -- -- + + - -- + - -- + - -- \n + . - - -- -- + + . -. + . -. -\n + \n + - . - -. + - -- \n + . - - -- + - - - -- + - - -- + - - - -- + +. . +\n . -.\n -.\n . -. + . . . -. + - -- + - - - -- -- + \n + . - - -- -- + + . -. + . . -. + - . . -. + - - -- -- + + +- - +\n - --\n --\n - - - -- + . - - -- + . -. + @@ -17331,54 +17332,53 @@ - -- + . . \n -.\n + - -- + . . -. -. + + - - -- + - - \n --\n 17378 \n + - -- + . . -. -. + \n + - -- + . - -. -- + + - -- @@ -17389,199 +17389,200 @@ + . - - -- + - - -- -- + + - -- + . -. + . . -.\n -.\n +\n + . . -. + . -. + . -. + - -- + - -- \n + . - -. + . - - -- + - - -- -- + + - - - -- + - \n --\n + . -. + . - -- -- -- +- + + . \n -.\n - + + . -. + - - -- -- + + . \n -.\n - + + . -. - + + . \n -.\n - -. -. +. + + \n + . . . -. -. + + . -. + - - --\n --\n +\n + - -- + . -. + . - -- \n + . -. + - -- + . . -.\n -.\n +\n + - - -- -- + + - @@ -17589,188 +17590,188 @@ . - - -- + - - \n --\n -. -. +. + + - . . -.\n -.\n +\n +. + -. - -- + - - - -- + - \n --\n + . . . -. -. + + . -. + - - -- -- + + - -- \n + . . . -. -. -. +. + + . . -. -. + + . \n -.\n + . . -. -. + + - - -- -- + + . -. + . -. \n + + + - - - + - -- + - - - - --\n --\n +\n + . - - -- -- + + - - -- -- + + - - -- + - -- \n +- -- + . - - -- + - - - -- + - - -- + - - -- -- + \n +- . -. + - - -- -- + + - - -- + - - -- + . - @@ -17779,101 +17780,101 @@ - - --\n --\n +\n + . -. + . - -. + - - - -- + - \n --\n - + + . -. + - - -- -- + \n + - - -- -- + \n + . . . -. + . - - -- + - - - -- + - - -- + - - - - --\n --\n +\n +. - -. + - - -- + . - - -- -- + + +- - + - -- - - - + - -- - - - +\n - --\n --\n - -- + - - @@ -17882,56 +17883,56 @@ - - - -- -- + + - \n --\n - - -- -- - -- + +- + + . - -- + . -. \n + - -- - + + . . -. -. + + . -. + . . -. -. + + - \n --\n + @@ -17939,96 +17940,96 @@ - - -- + . . -. + . . . -. + +- - - +\n +17974 - --\n --\n -17974 - -- + . -. + . - - -- -- + \n + . . . -. + . -. + - -- + . -. + - -- + - - - --\n --\n +\n + . . -. -. + + . . . -. + - - - - -- -- + + . -. + - - --\n --\n +\n +- - -- -- + + - -- + @@ -18036,25 +18037,25 @@ - -- \n + - -- + . -. - + + - \n --\n +. + -. @@ -18066,17 +18067,17 @@ - \n --\n + . . -. + . . - - -- -- + + @@ -18084,47 +18085,47 @@ - - -- + - - - --\n --\n +\n + - -- + - -- + - - - - -- + - \n --\n + . -. + . . . -. -. + + @@ -18134,19 +18135,19 @@ - - -- + - \n --\n + - -- + . -. + @@ -18159,14 +18160,13 @@ - \n --\n - -- -- +- + @@ -18183,17 +18183,17 @@ \n + - -- + . . -. -. + \n +. -. @@ -18201,79 +18201,79 @@ \n + - - -- -- + \n + . . . -. + . -. \n + . . -. -. + \n + - - -- -- + \n +. -. \n -18252 - +18252 +- -- \n . -. +. + - - -- -- + \n + . -. + . . -. + - -- \n + . - - -- + - - -- -- + \n +- -- \n + . - -. -- + @@ -18281,53 +18281,53 @@ \n + - - -- + - - -- -- + + - -- \n + . - - -- + - -- \n - -- - -- +- + \n + . -. \n + . - - -- + - - -- + - - - -- -- + @@ -18341,9 +18341,10 @@ \n + - -- + @@ -18352,8 +18353,7 @@ - - -- -- + @@ -18370,16 +18370,16 @@ + - . . -. + . . . -. -. + @@ -18396,13 +18396,13 @@ + . - - -- -- + \n @@ -18410,42 +18410,42 @@ + . - - -- + - - -- + . . -. -. + + - -- + - - --\n --\n +\n + - - - -- + . . -. -. + + - - \n --\n @@ -18454,19 +18454,19 @@ + . -. + . . . . -. + - - -- \n @@ -18476,59 +18476,59 @@ + . - -. + . . -. + - - -- -- + + - -- \n + . . . - -. + - -- + . -. + - - - -- -- + \n + . . . - -. + - . - -. -- + + . - -. + - - - -- -- + @@ -18536,8 +18536,9 @@ \n - -- -- +- + + @@ -18545,116 +18546,116 @@ . . . -. -. + + . . \n -.\n +- . . . -. + . . -. -. + + - - - - -- -- + \n + . -. + - -- + - \n --\n +. -. + . - - -- -- -. -. +. + + + - - -- + - - - - -- + +- - - +\n - --\n --\n - - -- + - - - -- + - - - - --\n --\n +\n + - - -- + - - - -- + - - - - -- -- + + +- - - +\n - --\n --\n -- + - -- + - @@ -18662,253 +18663,253 @@ - - -- + - \n --\n - - - -- -- - -- + +- + + - - - - -- -- + + - - - -- + - - . - -.\n --\n +\n +- - - -- + - - - -- + - . - -. + - \n --\n + . . - -. + - -- \n + . . -. -. -\n + + \n + - -- + - -- \n + . . -. + - - -- -- + \n +- + -- . -. \n + . - -. + - -- \n + - + . . . -. -. + \n + . . -. -. + + . -. + . -. \n +- + -- - - -- -- + \n - - -- +- + - - -- -- + \n + - . . -. + . - -. + - - - -- -- -\n +\n + + - . . -. -. + \n + . . -. -. + \n . +. - -. -- + + . - -. + - - - -- -- + \n +- + -- - - -- -- + + - - -- \n +- + -- - - -- -- + \n + - - -- + . - -. + - - - -- -- + + . . -. -. + + . \n -.\n + - . . -. -. + + . - -- + . - \n --\n + @@ -18916,43 +18917,43 @@ . . -. -. + \n + . . -. + - - -- + . - -. + - - - -- -- + + . . -. -. + + . . -. -. + \n + - -- + @@ -18962,484 +18963,484 @@ - -- \n + - - -- + - . . . -. + . . -. -. + + - - - -- -- + + - - - -- -- + + - - --\n --\n +\n + - - - -- + . -. - + + - - -- + - -- + - - -- + . - -. + - \n --\n + . -. + . -. + . -. + - -- + - -- + - -- + - . . -. -. + \n + . -. + - -- + . - -. + - - -- - + + . -. + + -+ + . - -. + - \n --\n - + + . . -. -. + + . -. + . - -- \n + . -. + . - -. -- + + . - -. -- + \n + - . . -. + . - -. + - - - -- -- + + - - - -- -- + + . \n -.\n - -- -- +- + + - . . -. -. + + . . . -. -. + + . - -. + - - --\n --\n +\n + - . . -. + . - -. + - - - -- -- + + . - - -- -- + + . . . -. -. + + . - -. -- + \n + . -. - - + + + . . -. -. - + + + . \n -.\n + . . -. + - -- + . -. + . - -. -- + \n + - -- + . . . -. + . . . -. -. + + - . . -. + . . -.\n -.\n +\n + . -. + . - -. + +- - +\n - --\n --\n - -- -- + + . - - -- + . . -. -. + + . . . -. -. + + . - -. + - - --\n --\n +\n +. . -. -. + + - - -- -- + + . - - -- -- + + - - - --\n --\n +\n +. . -. + . . . -. -. + + . - -. -- + \n + . - -. + - - - -- -- + + - - - -- -- + + . -. + - \n --\n + . - -- + - -- + . - -. + - -- \n + . - -. + - - - -- -- + + . . -. + . - -. -- + + . - -. + - -- \n + - - - -- + - - - -- + - - - - -- + +- - - +\n - --\n --\n - -- + - - - -- + - - - -- + - - - -- + . \n -.\n + - - @@ -19455,196 +19456,196 @@ - - - -- + +- - + - -- - - - +\n - --\n --\n - -- -- + + - - - -- + - - -- + - - - -- + . \n -.\n + . . -. -. + + . - -. + - - - --\n --\n +\n +. . -. -. + + . . -. -. + + . . -. -. + + . \n -.\n + - -- + - -- + - -- + . - -. + - \n --\n + - - -- + - -- + - . . -. + . . -. + - - - -- + - - -- + . \n -.\n + . . -. -. + + . - -. + - - - --\n --\n +\n +. . -. -. + + . . -. -. + + . . -. + - - -- -- + + . -. + - -- + - \n --\n + - -- + . - -. + - -- + - - -- + - - - -- + - \n --\n +- -- + - - - - -- + - \n --\n + - - - - -- + - \n --\n + - - @@ -19652,138 +19653,137 @@ - - - -- + - \n --\n + . . -. -. + + . - -. + - - - --\n --\n +\n . -. -. +. + + . . -. -. + + - - -- + . -. + . \n -.\n + - -- + - -- + - -- + . - -. + - \n --\n + +- - + - -- - + - -- - - + - -- - - - + - -- - - + - -- - +\n - --\n --\n - -- + - - -- + - - - -- + - - -- + - - - -- + - - -- + - \n --\n + . . -. -. + + . - -. + - - - -- + - -- + - - -- + - -- \n @@ -19794,82 +19794,83 @@ \n \n \n + - - - - -- + - \n --\n +- - - -- + +- - + - -- - +\n - --\n --\n - -- -- + + - -- + +- - +\n - --\n --\n - -- + - - - -- + - - - - - --\n --\n +\n + - - -- -- + + - \n --\n - -- +- + - - - - - -- + - - -- + - - - - - --\n --\n +\n + - -- + - - @@ -19877,196 +19878,196 @@ - - - --\n --\n +\n +- - - -- + - - - -- + - \n --\n + . . -. -. + + . - -. + - - - -- + - -- + - - -- + - -- \n + - - - -- + +- - - + - -- - - + - -- - +\n - --\n --\n - - - -- + - - -- + - - -- + - - -- + - - - -- + - - -- + - \n --\n + . . -. -. + + . - -. + - - - -- + - -- + - - - --\n --\n +\n + +- - - - + - -- - - + - -- - - - + - -- - + - -- - +\n - --\n --\n - -- + - - -- + - - -- + - - -- + - \n --\n . -. -. +. + + . - -. + - - - -- + - -- + - - - --\n --\n +\n + - - - --\n --\n +\n \n + . - -. + . - -. + - - -- + - - -- + . -. + - - -- -- + + - @@ -20075,123 +20076,123 @@ - -- + . - -. + - \n --\n + - - -- + . - -. + - - - -- + - - -- -- + + . . -.\n -.\n - +\n + + . -. + . - -. + - . . -. + - - \n --\n + . . -. -. + + . - -. + - - - -- -- + + . - - - --\n --\n +\n . . . -. -. +. + + . . -. -. + + . - -. + - \n --\n + . - -. + - - - -- + - - -- -- + + @@ -20199,22 +20200,22 @@ + -+ + - - --\n --\n +\n ++ . . -. -. + + . - -. + - -- + - @@ -20223,25 +20224,25 @@ - -- + . - -. + - \n --\n - -- +- + - - - -- -- + + - -- + @@ -20249,169 +20250,168 @@ . . . -. -. + \n + - - - - -- -- + + . - -. + - - - -- + . - -. -- + + . + \n -.\n -\n + . - -. + - - - -- + - - -- -- + + . -. + - - -- -- + + . - -. + - - \n --\n + . - -. -- + + . . -. + . -. + . - -. + + -+ + + . . -.\n -.\n +\n ++ -+ + - - -- + - - -- + - . -. + . - -. -- + + - - --\n --\n +\n + . - -. -- + + . -. + . -. + . \n -.\n - + + - -- + - -- + - \n --\n + . - -. + - -- + . - -. + - - -- + . - -. + . - -. -- + @@ -20419,564 +20419,565 @@ \n - -- -- - -- - -. +- -. + + +. + + + . . -.\n -.\n +\n +. . -. + - -- + . + -. . - -. + - \n --\n + . . -. + - - - -- -- + + . . -. -. + + . - -. + - - - --\n --\n +\n + - - - -- + . . . . -. -. + + . -. + . - -. + - \n --\n + . - -. + . - -- + - . -. + . - -. + . \n -.\n + . - -. + . -. \n + . - -. + . -. + . . -. -. + + . \n -.\n + . - -. + . - - -- -- + + - -- + . -. + . \n -.\n + - -- + . - -. -- -- +- + + . . -. -. + + . - -. + . \n -.\n + - - - -- -- + + . + -. . -. + . - -. + . \n -.\n + . . -. + . - -. -- + \n + - - -- -- + + . . -. -. + + . - -. + - -- + - . . -. + - - --\n --\n +\n + . . -. -. + + . - -. + - -- + . - -- + . - -. + - - - - --\n --\n +\n +- - -- -- + + - - -- + - -- + . - -. + . - - -- -- + + - -- \n + - - . -. + . - -. + - - -- -. . -. +. + \n + . - -. + - . . -. + - - -- -- + + . - -. + - - --\n --\n +\n + . - -. + . - - - -- -- + + . . -. -. + + . - -. + . . -. \n + . . -. -. -. -- -. -- -- +. +- +- + + + \n + . . -. + - -- + . - -. -- + + . -. + . \n -.\n . -. +. + - . -. + . - -. + - -- + . . -. + - -- + . - -. + - \n --\n + . . -. + . -. + . - -. -- -- +- + + . . -. + - -- \n + . - -. -- + + . -. + . - -. -- + + . . -. -. + + . - -. + - \n --\n + . - - -- -- + + . - -. + - . . . . -. -. + + . - -. + - \n --\n + - -- + . -. + @@ -20984,32 +20985,31 @@ . -\n -.\n + \n + . . -.\n -.\n +\n + . - -. + - \n --\n + . . -.\n -.\n +\n + - \n --\n \n @@ -21019,27 +21019,26 @@ \n \n +- \n --\n \n + . -. + . -. \n + . . -. -. @@ -21047,178 +21046,179 @@ + + - - - -- -- + \n + . -. + . - -. + - - - -- -- + \n + . . -. + - - -- -- + + . - -. + - - - -- -- + \n + . -. + . - -. + - -- + . . -. + + . -. + . -. \n + - + . . -. -. + + . - -. + . -. \n + - . -. + . - -. + . -. \n + - -- + . -. + . - -- + . - -. + - - -- -- + \n + . . -. -. + + . - -. + - - . . -. + . -. + . - -. + . -. \n + . -. + . - -. -- + + . -. @@ -21226,63 +21226,64 @@ + . . -. -. + + - -- + . - -. + - \n --\n + . -. + - -- + . - -. + - \n --\n + - - -- -- + + - -- + . - -. + - \n --\n + - -- + @@ -21291,32 +21292,32 @@ - -- + - \n --\n +. + -. . -. + - - -- -- + + + . \n -.\n +. -. + @@ -21327,24 +21328,24 @@ . - -. + - \n --\n + . . -. + . - - -- -- + \n + - -- + @@ -21352,65 +21353,64 @@ - -- + - - \n --\n +. + -. . -. + - - -- + + -+ + + -+ -\n + \n + - -- + . - -. + - . - -- + . - -. + - \n --\n - + \n + . . -. + . - - -- -- + \n @@ -21418,205 +21418,206 @@ + - -- + - \n --\n +. + -. . -. -+ -+ ++ + + - -- + . - -. + - \n --\n +. - -- + . - -. + - - - -- -- + + . -. \n + . . -. + . - - -- -- + \n + - -- + - -- + . - \n --\n + - -- + . - -. -- + + . - -- + . - -. + - \n --\n + . . -. + . - - -- + - \n --\n + . -. + . \n -.\n + - -- + - \n --\n + + . -. + . - -. + - \n --\n + . . -. + . - - -- + - \n --\n + . - -. -- + + - - -- + - - -- -- + \n + . . -. -. + + - -- \n -. -. +. + + - -- + . - -. + - -- \n + . - -. + - - - -- -- + + @@ -21625,26 +21626,26 @@ . . -. + . - - -- -- + \n + - -- + - - -- + - - -- -- + + @@ -21654,80 +21655,80 @@ - -- \n +- -- + - -- + - -- + - -- + - - -- + + . + -+ + . - -. + - \n --\n + . - -. -- + + - - -- -- + + . -. + . . -. + . - - -- + - \n --\n + - -- + - - -- + - - -- + . - @@ -21736,15 +21737,15 @@ - -- + . - -- + - \n --\n + @@ -21754,103 +21755,103 @@ - -- + - . -. + . . -. + . . -. -\n + \n ++ + -+ . + -+ - + + . . -. -. + + - -- + + -+ + . - -.\n --\n +\n + - - -- -- + + . . -. + . - - -- -- + \n + - . - -. -- + + - -- + . - - -- + - - \n --\n \n + . . -. + . - + -+ + @@ -21859,136 +21860,136 @@ . . - -. -- + + - \n --\n + + . -. + . - -. + - + . -. + . . - -. -- + \n +- + -- . . -. + - - - -- -- + + - \n --\n - + + . - -. + - -- + . . - -. -- + \n - -- -- +- + + . . -. + . -. + - - . - -. -- + + - \n --\n + . . . . . -. -. + + . - -. + - -- \n + . . - -. + . - -. -- + \n + + @@ -21998,83 +21999,83 @@ . . . -. -. + + . - -. + - -- \n + . . - -. + . -. + . -. + . . -. + - - - -- -- + + - \n --\n + - -- + . . -. -. + + - - -- -- + + - - \n --\n + - -- + . . -. + - - \n --\n - + + . -. + @@ -22082,11 +22083,11 @@ . -. - + \n + - - @@ -22095,7 +22096,7 @@ . -. + @@ -22104,39 +22105,39 @@ - \n --\n - + + . -. + . -. + . - -- + - -- + - - \n --\n ++ - - -- -- + + @@ -22145,136 +22146,136 @@ - \n --\n + . . . -. -. + + . . -. + - - \n --\n + . . -. + . . -. + - - -- -- + + - - \n --\n . -. -. +. + + . - -. + - . -. + - - - --\n --\n - +\n -- -- +- + + \n +. + -. . . -. \n +- + -- . -. + + -+ \n ++ + -+ . -. \n - -- -- - -- + +- + + . -. \n - - -- - -- +- + + - -- \n + - - -- -- + + @@ -22282,31 +22283,31 @@ - -- \n ++ + -+ - -- + - -- + - \n --\n +- + -- . -. + @@ -22314,81 +22315,81 @@ - \n --\n + . - -. -- + + . . -. -. + + - -- \n + - - - -- + . - -. -- + + . . -. -. + + - -- + . - -. + - - --\n --\n +\n . . . -. -. +. + + . -. + . - -. + - \n --\n + - - -- -- + + . -. + @@ -22397,47 +22398,47 @@ . \n -.\n +- + -- - -- + - - -- + - \n --\n + . . . -. -. + + . -. + . \n -.\n +- + -- . - -. -- + \n +. -. + - @@ -22447,155 +22448,154 @@ - - - --\n --\n +\n +. . -. -. + + . . -. -. + + - \n --\n + . -. + - \n --\n + . . -. + . - -. -- + \n + . - -. + - \n --\n + . - -. + - \n --\n + . - -. + - \n --\n + . -. + . - -. + - - --\n --\n +\n + . - -. + - \n --\n + . - -. + - - --\n --\n +\n + . - -. -- + \n \n + . - -. -- + + . . . -. -. + + . . -. \n + - -- + - -- \n + . -. + . -. \n +. -. + . . -. -. + \n - - -- -- +- + + - -- \n @@ -22603,32 +22603,32 @@ . . . -. -. +. + \n + . . -. -. -\n +\n + \n - -- -- +- + \n . . . -. -. +. + \n \n @@ -22644,29 +22644,29 @@ \n \n \n + - -- \n - -- -- +- + \n + - - -- -- + \n + - - -- + - -- \n @@ -22674,36 +22674,36 @@ \n +- -- \n + - -- \n + . . -. -. + + - -- \n + . . -. -. + + - -- \n - + \n @@ -22712,31 +22712,31 @@ \n \n + - \n --\n + - \n --\n + - \n --\n + - \n --\n + - \n --\n \n + - \n --\n + - \n --\n \n @@ -22749,18 +22749,18 @@ \n \n + - \n --\n + - \n --\n + - \n --\n + - \n --\n \n @@ -22768,20 +22768,20 @@ \n + - -- \n + . -. \n + - -- \n @@ -22800,9 +22800,9 @@ \n + - -- \n @@ -22810,114 +22810,115 @@ \n - + \n - -- -- - -- + +- + \n - -- -- +- + \n + . . . -. -. + + . - -. -- + \n + . . -. -. + + - -- \n + - -- + - - -- + - -- + . -. \n +- - - -- + - - -- -- + + - - -- \n + - -- + - - - -- + - - -- -- + + - -- \n + - - -- -- + + . -. + @@ -22929,74 +22930,74 @@ - -- \n + - - - - -- + - - -- -- + -- -- - -- + +- + \n + . - -- + - - \n --\n + . - -- + - -- \n + - - -- -- + + - -- + - - - -- + - - @@ -23007,57 +23008,57 @@ - - -- + - \n --\n +- - - -- + - - - -- -- + + - - - -- + - - -- + . - - -- + +- - +\n - --\n --\n . . -. + +- - + - -- - +\n - --\n --\n - - - -- + - -- + - @@ -23066,56 +23067,56 @@ - - -- -- + + . - -.\n --\n +\n +- - - -- + - - - -- + - - -- + - - -- + - - \n --\n +- + -- - - - -- + - - -- + - -- + - - -- -- + + - \n --\n - - -- +- + - - @@ -23124,17 +23125,16 @@ - - --\n --\n +\n +. -. \n +- - -- \n @@ -23142,45 +23142,46 @@ \n +- - -- + . . -. + - - -- + - - -- \n +- - -- + - - -- + - - -- -- + \n - -- -- +- + + . - @@ -23189,292 +23190,291 @@ . - -. -- + \n + - - - - -- -- + + . . . -. + - - - -- -- + \n . -. -. +. + + - - -- -- - + + + . - - -- + - \n --\n +- - - -- -- + + . -. + . - - - -- + - \n --\n +- - - - -- + - - -- + - - -- + . \n -.\n . -. +. + - - -- -- + + . -. + . \n -.\n +. - -. + - - -- + - - -- -- + + - \n --\n +- . . -. -. + + - - -- + . - -- + - - -- + - -- + - \n --\n +- -- + . . -. + - -- + . - \n --\n - - + + + . . -. + - - - --\n --\n +\n + . -. + . -. + - -- + - - -- -- + \n +. - - - -- -- + + - -- + . . -. + - - --\n --\n +\n +. - - - - -- + - - - -- + - - -- -- + \n + - -- + . -. - + + . \n -.\n . -. +. + - - -- + - -- + . . - -. + . . -. + - - -- -- + \n +- - - - -- -- + + - - -- -- + + . - -- \n - -- - -- - -- + +- + + . . -. + - -- \n @@ -23484,10 +23484,10 @@ \n - --\n --\n +- +\n +- -- \n @@ -23497,40 +23497,40 @@ \n +- + -- - -- \n - -- - -- +- + \n +- - - -- -- + \n - - -- -- - +- + + + . -. \n - -- -- +- + \n @@ -23548,8 +23548,8 @@ \n - -- -- +- + \n @@ -23574,634 +23574,635 @@ \n + - - -- -- + \n - -- +- + . . . -. -. + \n + - -- + - - -- \n + - . -. + - - - -- -- + \n + - - - -- -- + + - - - -- -- + + - -- + - - -- -- + \n + - -- + - - -- + - - -- + - - - -- -- + + - - - - -- -- + \n + - - -- + - -- + - - - -- -- + + - - - -- + . \n -.\n - -- +- + . . . -. -. + \n + - - - -- \n + - - - -- + - -- \n +- - - -- -- + \n +- -- + - - -- -- + \n - -- -- +- + \n - -- -- +- + + . . -. -. + + +- - - + - -- - +\n - --\n --\n - - - -- -- + + - -- \n + - -- + - \n --\n + - -- \n +- -- + - - -- \n +- -- + - - - -- + - - - - -- + - \n --\n - -- +- + - - -- + . - - -- + +- - - +\n + - --\n --\n - - + - -- - + - -- - +\n - --\n --\n - -- + - - -- + - - - -- + - - -- -- + + - - - -- + +- - +\n - --\n --\n - - -- -- + + +- - - + - -- - + - -- - + + - -- -- - - +\n - --\n --\n - - -- -- + + - - - -- + - - - -- -- -\n + + \n +- - - -- + - - -- -- + + - - - -- -- + + - - - -- -- -\n + + \n - - - - -- -- - -- + +- + + - - -- + - - - --\n --\n +\n + - - - -- + - - - -- + - - -- -- + + +- - - + - -- - - + - -- - - +\n - --\n --\n - -- + . . . -. + . . -. -. + \n +- . -. + - -- + - -- + - - \n --\n + - - -- -- + + - - - --\n --\n - +\n + + . . . -. -. + + - - -- + . . -. + - \n --\n - -- -- +- + + - . . -.\n -.\n +\n +- . - - -- + - -- + . - - -- -- + \n +- - - -- + - -- + - - -- -- + + - - -- -- + + - \n --\n - - - -- +- + - . -. + . -. + - - -- -- + \n + - - -- -- + + - - --\n --\n +\n +- -- + - -- + - - - --\n --\n +\n + - . - -. + . - -. + - - -- + . \n -.\n - -- +- + . . . -. + . . -. -. + \n + - . - -. + - - -- -- + + . . -. -. + + . - -. -- + \n +. -. + . - . -- -. -. -. +. + + + - - -- + . - - - -- + +- - - +\n - --\n --\n - - -- + . - - -- + - - - - --\n --\n +\n + . - -. + - - - -- + - - - - -- -- + + +- - - +\n - --\n --\n -- + - -- + - @@ -24209,56 +24210,55 @@ - - -- + - \n --\n - - - -- -- - -- + +- + + - - - - --\n --\n +\n + - - - -- + - - . - -.\n --\n +\n +- - - -- + - - - - -- + - . - -. + - \n --\n @@ -24266,107 +24266,107 @@ \n + . -. + - - -- + - - -- -- + \n + . -. + . -. \n +- - - -- + - -- + - -- \n + - - -- + - . - -. + - - -- -- + \n + - - -- + - - -- + . -. \n + - -- \n + . -. \n + . -. \n + . - -. -- + \n +. -. \n 24392 @@ -24376,21 +24376,22 @@ \n + . + -. - + . -. + - . - -- \n +. . @@ -24406,38 +24407,38 @@ - -- \n + . . . . -. -. + + . -. + . -. \n + - . - -. + - - -- -- + + @@ -24446,18 +24447,17 @@ . . -. -. + \n + - - -- + - -- @@ -24465,26 +24465,26 @@ \n + - - - - - -- + - -- \n + - - - -- @@ -24493,81 +24493,82 @@ \n + - - - -- \n + . - -- + . . -. -. + \n + - - -- -- + \n + - . - -. + - -- \n + . . - - -- -. -. +. + \n +. -. + . . . -. -. + + . -. \n +- - -- + . @@ -24577,18 +24578,18 @@ . - -. + - - -- -- + \n + - - -- -- + + - - @@ -24597,13 +24598,13 @@ - -- \n +- - @@ -24611,20 +24612,20 @@ - - -- -- + + - -- + - -- \n + - - @@ -24633,47 +24634,47 @@ - -- + . . -. \n +. - -. + - -- + - . . -. \n + - -- + - - -- + - -- \n + - - -- + . -. + . @@ -24682,181 +24683,180 @@ . -. \n - -- +- + - - -- + - - -- + - - - - -- + . . -. -. + \n + - -- + . . . . -. -. + + . -. + . . -. -. + \n + - -- - + + . -. - + + . -. \n + - + . -. + - -- + - -- \n - -- -- +- + + . -. + - -- + - -- \n + - + . -. + - -- \n + - - -- + . - -. -- + + . -. \n + . . -. + - - -- + - -- + . - -. -- + + - -- \n +- + -- - -- + . - -. -- + + . . -. + - -- \n + - + . -. \n + - -- \n + . -. \n - + \n @@ -24877,12 +24877,12 @@ \n . -. -. -\n +. +\n + \n @@ -24893,33 +24893,33 @@ \n - - -- - -- +- + \n . -. +. + - - - -- + - - - -- -- + \n . -. -. +. + + . -. \n @@ -24932,146 +24932,147 @@ \n + - - -- + . . . -. + - - -- -- + \n + - - - -- -- + + - -- + . -. + - \n --\n - -- +- + - - -- -- + + - - -- + - - -- -- + \n - -- - -- +- + + . . -. -. + + - -- \n + . . -. -. + + . . -. + . -. + . -. \n + . -. + . . -. -. + + - -- + - -- \n + + - - - -- + - -- + - - -- -- + + - -- + - - -- + - \n --\n - -- -- +- + + . . -. + . . -. + - - - --\n --\n +\n + @@ -25079,104 +25080,104 @@ - - -- + - - -- + - -- - + + - - -- -- + \n + - - -- -- + + . -. - + + . . -. + . -. \n + . -. - + + - - - -- -- + + . -. + - - -- + - \n --\n + . -. \n + . - -- + - - -- -- + + . -. + . . \n -.\n + . . . . -. -. + + - . @@ -25187,95 +25188,95 @@ . \n -.\n + . . -. -. + + - -- + . . -. + - - -- + - - -- -- + \n + . -. \n +. - - - -- -- + \n + . . -. + . -. \n +. -. + . . -. -. + \n +- . -. + . . -. \n + - - -- -- + + - - -- -- + + . . -. + . + \n -.\n -\n + . @@ -25283,74 +25284,74 @@ . . . -. -. + + - - -- -- + + . -. + . -. + . - -. -- + \n + - - -- + . - -. + - - -- + . . -. + . . -. + . . -. -. -\n + + \n +. . -. + - - -- + . -. + . -. + - - -- -- + + . \n -.\n - -- -- +- + + @@ -25359,162 +25360,162 @@ . -. + . - - -- -- + + . . - -. + - \n --\n +- . - -. + - . . -. -. + + - -- + - -- + . -. + - \n --\n + . . . -. + - - --\n --\n +\n + - -- \n + - - \n --\n + - - --\n --\n +\n \n + - - - -- + - \n --\n + . - -. + . - -. -- + \n + - - - -- -- + + - - --\n --\n +\n -\n + \n + - \n --\n + . - -. -- + \n + - -- + - - - - -- -- + + - \n --\n + . -. + - - -- + - - -- -- + \n + - - - -- -- + + @@ -25527,169 +25528,169 @@ - - - -- -- + \n +. . -. + . -. + - . - \n --\n + - - - -- + - - -- + . -. + . . -. -. -\n + + \n + . -. + . . . -. -. + + - -- + . - -.\n --\n +\n +. . -. + . -. + - -- + . . -. + . -. + - -- + - -- + - -- \n + . . -. -. + + . -. + . . -. + . -. + - - - - --\n --\n +\n + . . -. + . -. + . . -. -. + + . -. + - - - - --\n --\n +\n + - - -- + - - - - -- + - - -- + - - -- -- + + - - - --\n --\n +\n + . - - -- -- + + - - @@ -25697,181 +25698,181 @@ . . . -. + - -- + - -- + . \n -.\n + - . -. + - -- + - - -- -- + + - -- + . -. -\n + \n - - -- +- + . -. + - -- + - - -- -- + + - - --\n --\n +\n +. -. + . - - -- + - - - - --\n --\n +\n + . -. + . - - -- + - - - - --\n --\n +\n + . - -. + - - - - -- + - - -- + - - -- + - - - --\n --\n +\n + - - - - -- + - - -- + - - - --\n --\n +\n + - - - -- + . -. + . . -. + - . - - -- + - \n --\n . -. -. +. + + - - -- + . . . -.\n -.\n +\n + - - -- + - - -- -- + + - - - -- -- + + - - - --\n --\n +\n + - - @@ -25884,121 +25885,121 @@ - -- \n . -. -. +. + + . - - -- + - -- + - - --\n --\n +\n +- -- + - - -- \n + - - -- + - - -- + - - \n --\n - - -- -- - -- + +- + + - - \n --\n + - - -- -- + \n + . . -. -. + \n + . -. + . . -. -- -- +- + + . -. \n + . . . -. -. -- + + - -- - -- - + -- +- + \n +. + -. - - -- + . @@ -26006,233 +26007,232 @@ . -. \n - -- +- + - - -- -- + + . . -. + - - -- + - \n --\n + . . -. -. -. -. + . + + . -. -. . + . . + . -. . -. +. + + \n -\n + . . -. + - -- + - \n --\n + . - - -- -- + + . . -. -. + + . -. + . . -.\n -.\n +\n +- -- + . -. + . -. + - -- + . -. + . -. \n + . . -. -. + + - - -- + - - --\n --\n +\n + . -. + . -. - + + . . -. -. + + - -- + . . -.\n -.\n +\n +- + -- . -. + - - -- -- + + . . -. + . -. + - - -- -- + \n + . . -. + - -- + - -- + - . -. + . -. + . . -.\n -.\n +\n +- - + -- . -. + . -. + . -. + . \n -.\n . -. +. + - + -- - - -- -- + \n + . -. + . . -. -. + \n +. + -. . . . -. -. + \n - -- -- +- + \n + . -. \n @@ -26240,94 +26240,95 @@ \n +- - -- \n + - -- \n +. + -. - -- + - -- + - - -- -- + \n +. + -. . -. + - -- + . -. + - - -- -- + \n + - - -- + - -- + . -. + - - -- + - \n --\n + . - - -- + . - -- + - - -- + - \n --\n + - - -- + - - @@ -26335,159 +26336,158 @@ - - - -- -- + + . - -.\n --\n +\n +- + -- - - . . -. + - - -- -- + + . \n -.\n + . - - - -- + - - -- + - \n --\n + . - -. + - - -- -- + + . - -. + - - -- -- + + . -. + - - -- + - - -- -- + \n + . . -. + - -- + - - -- + - - -- + - - -- + - - - --\n --\n +\n . -. -. +. + + - - -- + - -- + . . - - -- + - \n --\n + . -. + . . -. -. + + - . - -. + - - -- -- + \n + - - -- + - - --\n --\n +\n + - -- \n \n @@ -26495,83 +26495,84 @@ \n \n + - - -- -- + + - - -- + - - - -- -- + + - -- + - - -- -- + \n - -- - -- +- + + - -- + . - - \n --\n + - - - -- -- + + - -- + . -. + . - -. -- + + - - -- -- + + - \n --\n + . -. + - @@ -26581,49 +26582,49 @@ . - - -- + - - -- -- + \n + - - - -- + - - --\n --\n +\n + . - -. -- + + - - - -- -- + + . . -. + - . -- + . . -. + . -. \n + . + -. - @@ -26631,177 +26632,177 @@ . . . -. -. + + - - -- -- + + . -. + . - -. -- + \n +. - - -- -- + + . - -. + - . . . -. -. + + . -. \n + . -. + . . . -. + . -. + - -- \n + . -. + . -. + . - -. -- + + . + -. . -. + . - -. -- + \n + . - -. -- + + . . . -. -. + + . -. + . . -. -. + + - - - -- + . -. + . - - -- -- + + . - -. -- + \n + . - -. -- + \n + . - -. + - - --\n --\n +\n + . . -. -. + + - - --\n --\n +\n + - - -- -- + \n + - - -- + - - - --\n --\n +\n + . -. + - - - - --\n --\n +\n + @@ -26809,61 +26810,61 @@ - \n --\n + . - - -- -- + + . - -. + - \n --\n + . - -. -- + + . . -. -. + + . -. + . . -. \n +. -. + - -- + . -. + - \n --\n + . - -. -- + + - @@ -26875,140 +26876,140 @@ - \n --\n + - -- + . -. \n + . - -. + - -- + - . . + -. - + - - -- -- + + . \n -.\n + . -. + . . -. + . . -. + - - -- + - - - -- -- + + . \n -.\n + - - -- + . - -. -- + \n + . + -. . -. + . . -. -. + + . - -. -- + + - - -- + - . . -.\n -.\n +\n + - - -- -- + + +- +- + - - -- +\n - - --\n --\n + - -- - - + - -- - + - -- - - +\n - --\n --\n - - -- -- + + - - - -- -- + + . @@ -27019,112 +27020,112 @@ - - -- + . \n -.\n . -. +. + . - -. -- + + . \n -.\n . -. -. +. + + . . -. + - -- + . -. + - -- + - -- + . - -. + - \n --\n + - - -- -- + + - - - -- -- + + - -- + . . . -. + . . . . -. + . . \n -.\n . -. -. +. + + . - -. -- + + . \n -.\n . -. -. +. + + - -- + . -. + . - -. -- + \n + - - - -- + - - @@ -27137,64 +27138,64 @@ - - - --\n --\n +\n +- - - -- + - - -- + - - - -- + - - -- + - - -- + - - \n --\n +- - - -- + - - -- + - - -- + - - - - -- + - -- + - -- + . - - --\n --\n +\n +- - - -- + - - - -- + - - @@ -27203,43 +27204,43 @@ - - -- + . . . . -.\n -.\n +\n +. . -. -. + + . - -. -- + + . \n -.\n . -. -. +. + + . -. + . -. + . - -- + @@ -27247,211 +27248,211 @@ . - -. -- + \n + . - -. + - -- + . . -. -. + + - - - - -- -- + + . - -. + - \n --\n + . - -. + - - -- + - - -- -- + + - - -- + - - - --\n --\n +\n + . . -. + . - -- + - -- + . . . -. -. + + - - - -- + - \n --\n . . . -. . -. +. + + - - -- + . - - -- -- + + - - -- -- + + - - - -- -- + \n - -- +- + - - - - -- -- + + - - - -- -- + + - - - -- + - \n --\n + . -. + . - - -- -- + + . - -. -- + + . - -- + . - -. + - \n --\n +. - -. + - - . - -. + - - -- + . . -. + - - -- + . \n -.\n + . -. + - - -- -- + + . - -. -- + \n + . -. + @@ -27459,18 +27460,18 @@ . - -. -- + \n + - - -- + . -. + @@ -27478,38 +27479,38 @@ . - -. -- + \n + - -- + - - -- + - -- + - - \n --\n + - -- + - -- + - @@ -27517,185 +27518,185 @@ - - -- + . - - --\n --\n +\n + - - - -- + . -. + - . -. + - - --\n --\n +\n + . -. + - - - -- + - - - -- + - - -- + . . -. + - - \n --\n + - - - -- + - - - -- + - - -- + - - - -- + - - -- -- + + . - -.\n --\n +\n +- - - -- -- + + - - -- -- + + - - -- -- + + - - - -- -- + + - -- + - - --\n --\n +\n + - -- + - -- + - - - -- + - - . - -. -- + + . \n -.\n . -. -. +. + + +. . . +\n . -.\n -.\n . -. + - - -- -- + + . -. + . -. + - -- + - -- + - . - -. + - \n --\n + - -- + - - -- + @@ -27704,15 +27705,15 @@ - \n --\n + - -- + - -- + - @@ -27721,21 +27722,21 @@ - - - -- + . - - -- + . -. + - \n --\n +- + -- @@ -27744,25 +27745,25 @@ - - -- -- + + - \n --\n +- - - -- + - - - -- -- + + - - - -- + - - @@ -27771,30 +27772,30 @@ - - -- -- + + . -. + - -- + - \n --\n - -- +- + - - - -- -- + + . - - -- -- + + . - @@ -27803,25 +27804,25 @@ - - - -- + . . . -. + - - -- + - \n --\n + - - -- -- + + - - -- + - - @@ -27829,134 +27830,134 @@ - - - -- -- + + - - - --\n --\n +\n +- - - - -- + - - - - -- -- + + - - - -- -- + + . - -.\n --\n +\n + - - - -- -- + + - - -- -- + + - -- + - \n --\n + - - - -- + - . - -. + . - -. + - . \n -.\n . -. -. +. + + +. . . +\n . -.\n -.\n . -. + - - -- -- + + . -. + . -. + - -- + - -- + - - -- \n + - -- + - - -- + - -- + - - \n --\n +- - @@ -27972,96 +27973,96 @@ - - -- + . - - --\n --\n +\n +. - -- + - - - - - - -- + - - - -- + - - - --\n --\n +\n +- - -- + - - - - -- + - - -- -- + + - - -- + - - - -- -- + + \n -\n + - - -- + - - - -- -- + + - - -- + . - -. + - - - -- + - - --\n --\n +\n + - - - - -- -- + + - - - -- + - - - - - -- + . . @@ -28070,18 +28071,18 @@ . -. \n . -. -. . + + +. +. +\n . -.\n -.\n . -. -. + + @@ -28089,22 +28090,22 @@ - - - -- + . -. + . -. + - -- + - \n --\n + @@ -28112,7 +28113,7 @@ - -- + @@ -28125,53 +28126,53 @@ - \n --\n + - -- + - - -- + - -- + - - \n --\n - - - -- +- + . -. + - -- + - - - -- + - - -- + - \n --\n + - - - -- + - - @@ -28179,182 +28180,182 @@ - - - -- + - - - -- + - . -. + - -- + - \n --\n - -- +- + - - - -- -- + + . - - -- -- + + . . -. + - \n --\n - - - - - -- +- + - - - -- + . - - --\n --\n +\n +. - - -- -- + + - - - -- + . \n -.\n . -. -. . + + . . -. -. +. + + . . -. + . . . -.\n -.\n +\n + - -- + - - -- + - -- + - - \n --\n - -- +- + - - - -- + - - -- -- + + - - - -- + - - - --\n --\n +\n +- - - -- + - - -- + - . - - - -- + - - -- + - \n --\n - -- +- + +- - - - + - -- - + + - -- -- - - +\n - --\n --\n - -- -- + + - - - -- + - - -- + - -- + +- - - - +\n - --\n --\n - @@ -28364,63 +28365,63 @@ - - -- + - - - -- + . . \n -.\n . -. -. +. + + . . . -. -. + + . . -. + . . . -.\n -.\n +\n + - -- \n \n . -. -. +. + + - - - - -- + . \n -.\n + . - -. + - \n --\n + @@ -28429,72 +28430,72 @@ . \n -.\n . -. -. +. + + . - -. -- + \n + - - - - -- + - - - - -- + - \n --\n . -. -. +. + + . - -. -- + \n . -. -. +. + + . . -. + . . -. + . . . -.\n -.\n +\n + - - -- + - - --\n --\n +\n + . - - - - -- -- + + - - @@ -28502,32 +28503,32 @@ - - - --\n --\n +\n - -- - + - -- -- - -- + +- + + - - - -- + - - . \n -.\n . -. -. +. + + @@ -28535,28 +28536,28 @@ . -. + . -. \n +- + -- - -- + . . - -. + - - \n --\n + - - @@ -28573,41 +28574,41 @@ - -- + - - - -- -- + + - - -- + - \n --\n . -. -. +. + + . . . -. -. + + . . -. + . . . -.\n -.\n +\n + - -- + - -- + - - @@ -28615,7 +28616,7 @@ - - - -- + - - @@ -28624,22 +28625,22 @@ - \n --\n . -. -. +. + + . . . -. + . . -. + . . . -.\n -.\n +\n + - - @@ -28648,63 +28649,63 @@ - -- + . - - -- + . - - - --\n --\n +\n - -- - + - - - -- -- - -- + +- + + - - -- + - - -- -- + + - - - --\n --\n +\n + . -. + . . - - -- + - - -- -- + + . @@ -28712,257 +28713,257 @@ - - - -- + . \n -.\n . -. -. . + + . . -. . + . -. . + . . . -.\n -.\n +. +\n + - -- + - -- + - - - - --\n --\n +\n + - - -- + - - -- + - - - -- -- + + - -- + +- - + - -- - +\n - --\n --\n - - -- -- + + - -- + - - - - -- -- + + - - - - --\n --\n +\n + - - - - --\n --\n +\n + - - - - -- + - - -- + - - --\n --\n +\n +- - - - -- + - - - - --\n --\n +\n + +- - + - -- - + - -- - + + - -- -- - + - -- - +\n - --\n --\n - - -- + - - - - -- -- + + - - --\n --\n +\n + - -- + - - - -- + - - -- + +- - +\n - --\n --\n - - - -- -- + + - -- + - - - --\n --\n +\n + - - -- + - - - -- -- + + - - --\n --\n +\n + - -- + - - --\n --\n +\n +- +- + - -- - + - -- - +\n - --\n --\n - - - - --\n --\n +\n +- - - -- + - - --\n --\n +\n + - - - - --\n --\n +\n +- - - -- + - - --\n --\n +\n + - - -- -- + + - - -- -- + + - - - --\n --\n +\n + - @@ -28973,13 +28974,13 @@ - - -- -- + + - - - --\n --\n +\n + - @@ -28987,76 +28988,75 @@ - - -- + - - - --\n --\n +\n - -- -- - + - + - -- - + - -- -- +- + + - - -- + - - --\n --\n +\n . -. -. +. + + . . . -.\n -.\n +\n + - - - -- + - - - -- + - - - - -- + - - -- + - - - - --\n --\n +\n +. - + -- . . . -. + . -. @@ -29064,59 +29064,60 @@ \n . . -. -. +. + + . -. + - - -- -- + \n +- . - -. -- + + + -+ + . - -. + - -- \n . -. +. + . - -. + . . -. + - -- \n + - - -- -- + + . @@ -29124,38 +29125,38 @@ - -- + - - - -- + - \n --\n + - -- + - - - -- -- + + . - - - -- + - - -- -- + + . @@ -29163,52 +29164,52 @@ - - -- -- + \n + - - -- -- + + . -. + - - - -- + . - - -- -- + + . - \n --\n + - - - -- + - -- + - . . . -. -. + + . @@ -29216,42 +29217,42 @@ - - -- + . - -. -- + \n + - - -- + - -- + - - -- + . -. + . -. + . -. + - - -- -- + + - \n --\n + - -- + - @@ -29263,28 +29264,28 @@ - - -- -- + + . . -. -. + + - - -- -- + + - -- \n + . -. + . - -- + . @@ -29292,216 +29293,215 @@ - \n --\n +- - -- + - - -- + - \n --\n + - - -- + - - -- -- + + . -. \n + - - - -- -- + + - - -- -- + \n + . -. + - - -- -- + \n + . -. + - - -- + - \n --\n + . -. + . - -- + - \n --\n + - - -- -- + + - - - -- -- + \n +. - -. + - -- + . . -. + - - -- -- + \n + . -. + . - - - -- + - - -- + - \n --\n + - - -- + - - -- -- + + . - -. + - - -- -- + + + -+ + - - -- + - - -- -- + \n + . . -. + - -- + - - -- + - - -- + - - -- + - - - --\n --\n +\n +. . -. -. + + - - -- + - -- + . . - - -- + - \n --\n + . -. + . . -. -. + + - . - -. + - - -- -- + \n @@ -29516,222 +29516,222 @@ + - - -- + - - --\n --\n +\n + - -- + - . \n -.\n + - - -- -- -. + . -. +. + + \n -\n +- + -- - - -- -- + + . . -. + . . - - -- + - - -- -- + \n + - - -- -- + + - - -- -- + + - + -- . -. \n + - - -- -- - + + + - - -- -- + + - - -- -- + + - -- \n + - - -- -- + + - -- + - - -- -- + \n - -- - -- +- + + . - - \n --\n + - - - -- -- + + - \n --\n + . -. \n + - - -- -- + + - - - -- -- + \n -- -- +- + \n +- - - -- -- + + - - -- -- + \n + . -. + . . . -. + . -. \n + - -- + . -. + - - -- -- + \n + - - -- -- + \n + . -. + - - - -- -- + \n @@ -29739,64 +29739,65 @@ + - - - -- -- + \n + +- - + - -- - + +\n + + - -- -- + + \n - +- + -- -\n - - -- -- - - -- +\n - - --\n --\n + - -- - - + - -- - + - -- - - +\n - --\n --\n - - -- -- + + - -- + . @@ -29807,102 +29808,102 @@ - - -- + . \n -.\n . -. +. + - - -- -- + + - \n --\n . -. -. +. + + . -. + - -- + - -- + . - -. -- + \n + - - -- -- + + - - - -- -- + + - -- + . . . -. + . . . . -. + . . \n -.\n . -. -. +. + + - - -- -- + + - \n --\n . -. -. +. + + - -- + . -. + - - -- -- + \n + - - - -- + - - @@ -29915,110 +29916,110 @@ - - - --\n --\n +\n +- - - -- + - - -- + - - - -- + - - -- + - - -- + - - \n --\n +- - - -- + - - -- + - - -- + - - - - -- + - -- + - -- + . - - --\n --\n +\n - - -- - + - - -- - - + - -- +- + - - - -- + . . . . -.\n -.\n +\n . -. -. +. + + - - -- -- + + - \n --\n . -. -. +. + + - -- + . -. + . - -- + @@ -30026,211 +30027,211 @@ - - -- -- + \n + - - -- + - -- + - . -- -. + + - - - - -- -- + + - - -- + - \n --\n + - - -- + - - -- + - - -- -- + + - - -- + - - - --\n --\n +\n + . . -. + . - -- + - -- + . . . -. -. + + - - - -- + - \n --\n . . . -. +. + - -- + - - -- + . - - -- -- + + - - -- -- + + - - - -- -- + \n - -- +- + - - - - -- -- + + - - - -- -- + + - - - -- + - \n --\n + . -. + . - - -- -- + + - - -- -- + + . - -- + - - -- + - \n --\n - -- +- + - - - - -- + - - -- + . . -. + - - -- + - \n --\n + - -- + - - -- -- + + - - -- -- + \n + - -- + @@ -30238,18 +30239,18 @@ - - -- -- + \n + - - -- + - -- + @@ -30257,38 +30258,38 @@ - - -- -- + \n + - -- + - - -- + - -- + - - \n --\n + - -- + - -- + - @@ -30296,258 +30297,258 @@ - - -- + - - - --\n --\n +\n + - - - -- + - -- + - . -. + - - --\n --\n +\n + . -. + - - - -- + - - - -- + - - -- + . . -. + - - \n --\n + - - - -- + - - - -- + - - -- + - - - -- + - - -- -- + + . - -.\n --\n +\n +- - - -- -- + + - - -- -- + + - - -- -- + + - - - -- -- + + - -- + - - --\n --\n +\n + - -- + - -- + - - -- + - . - -. + . - -. -- + + . \n -.\n . -. -. +. + + +. . . +\n . -.\n -.\n . -. + - - -- -- + + . -. + . -. + - -- + - -- + - . - -. + - \n --\n + - -- + - -- \n + - - - -- + - - - -- + - -- + - \n --\n +- + -- - - - -- -- + + - \n --\n +- - - -- + - - - -- -- + + - - - -- + - - \n --\n +- - - -- -- + + . -. + - -- + - \n --\n - - -- +- + - - - -- -- + + . - - -- -- + + . - @@ -30556,160 +30557,160 @@ - - - -- + . . . -.\n -.\n +\n +- - -- + - - -- -- + + - - -- -- + + - - - - -- -- + + - - - --\n --\n +\n +- - - - -- + - - - - -- -- + + - - - -- -- + + - - --\n --\n +\n + - - - -- -- + + - - -- -- + + - -- + - \n --\n + - - - -- + - . - -. + . - -. + - . \n -.\n . -. -. . + + . . -.\n -.\n . -. +\n +. +. + - - -- -- + + . -. + . -. + - -- + - -- + - - -- \n + - - -- + - -- + - - \n --\n + - -- + - @@ -30718,97 +30719,97 @@ - - -- + - - - --\n --\n +\n +- - -- + - - - - - - -- + - - - -- + - - - --\n --\n +\n +- - -- + - - - - -- + - - -- -- + + - - -- + - - - -- -- + + \n -\n + - - -- + - - - -- -- + + - - -- + . - -. + - - - - -- + - - --\n --\n +\n + - - - - -- -- + + - - - -- + - - - - - -- + . . @@ -30817,40 +30818,40 @@ . -. \n . -. -. . + + . -.\n -.\n . -. -. +\n +. +. + + - - - -- + . -. + . -. + - -- + - \n --\n + @@ -30858,7 +30859,7 @@ - -- + @@ -30871,50 +30872,50 @@ - \n --\n + - -- + - - -- + - -- + - -- \n - - - -- +- + . -. + - -- + - - - -- + - - -- + - \n --\n + - - - -- + - - @@ -30922,219 +30923,219 @@ - - - -- + - - - -- + - . -. + - -- + - \n --\n - - -- +- + - - - -- -- + + . - - -- -- + + . . -. + - \n --\n - - - - - -- +- + - - - -- + - - - -- + - - - -- -- + + - - - -- + . \n -.\n . -. -. +. + + +. . . +\n . -.\n -.\n . -. + . . . -.\n -.\n +\n + - -- + - - -- + - -- + - - \n --\n - -- - - + - -- +- + - - -- -- + + - - - -- + - - - --\n --\n +\n - - -- - + - -- +- + - . - - - -- + - - -- + - \n --\n - -- - + - - - -- - + - -- -- - + + - - --\n --\n - -- -- +\n +- +- + + - - - -- + - - -- + - -- + - - - - --\n --\n +\n . -. -. . + + . -. . + . -. +. + . . . -.\n -.\n +\n + - - -- -- + + - - -- + - - --\n --\n +\n + . - - - - -- -- + + - - @@ -31142,39 +31143,39 @@ - - - --\n --\n +\n - -- - + - -- -- - -- + +- + + - - - -- + - - . \n -.\n . -. -. . + + +. +. +\n . -.\n -.\n . -. -. + + @@ -31182,28 +31183,28 @@ . -. + . -. + - -- + - -- + . - - -- + - - \n --\n + - - @@ -31220,98 +31221,98 @@ - \n --\n +- - - -- -- + + - - -- + - \n --\n . -. -. +. + + . . . -. -. + + . . -. + . . . -.\n -.\n +\n + - -- + - - -- + . - - -- + . - - - --\n --\n +\n +- - -- + - - - - -- -- + + - -- + - - -- + - - -- -- + + - - - --\n --\n +\n + . -. + . . - - -- + - - -- -- + + . @@ -31319,261 +31320,261 @@ - - - -- + . \n -.\n . -. -. +. + + . . . -. + . . -. + . . . -.\n -.\n +\n + - -- + - -- + - - - - --\n --\n +\n + - - -- + - - -- + - - - -- -- + + - -- + - - -- + +- - +\n - --\n --\n - - -- -- + + - -- + - - - - --\n --\n +\n +- - - - --\n --\n +\n + - - - - -- -- - + + + - - - - -- + +- - + - -- - +\n - --\n --\n - - - -- -- - + + + - - -- + - - -- + +- - +\n - --\n --\n - - - -- -- + + +- - + - -- - +\n - --\n --\n - - -- + - - - - -- -- + + - - --\n --\n +\n + - -- + - - - -- + - - -- + +- - +\n - --\n --\n - - - -- -- + + - -- + - - - -- -- - + + + - - -- + - - - -- -- + + - - --\n --\n +\n + - -- + - - -- -- + + - - -- + - - -- + +- - +\n - --\n --\n - - - - -- -- + + - - - -- + - - --\n --\n +\n + - - - - -- -- + + - - - -- + - - --\n --\n +\n + - - -- -- + + - - -- -- + + - - - --\n --\n +\n + - @@ -31584,13 +31585,13 @@ - - -- -- + + - - - --\n --\n +\n + - @@ -31598,113 +31599,113 @@ - - -- + - - - --\n --\n +\n - -- -- - + - + - -- - + - -- -- - + + - -- +- + - - --\n --\n +\n . -. -. . + + . . -.\n -.\n +. +\n + - - - -- + - - - -- + - - - - -- + - - -- + +- - - - +\n - --\n --\n - - - -- -- + + - - -- -- + + - \n --\n - -- +- + - - -- + - - -- + - - -- + - - -- + - - -- -- + + - - -- + . \n -.\n . -. -. . + + . . -.\n -.\n . -. -. +\n +. +. + + @@ -31712,67 +31713,67 @@ - - - -- + . -. + - - -- + - - \n --\n + - -- + - -- + - - \n --\n + - - -- + - - -- -- + + - - -- -- + + - - - -- -- + \n - -- +- + - . - - -- + - . @@ -31781,135 +31782,135 @@ . -. + . \n -.\n . -. -. +. + + - - -- + . \n -.\n . -. +. + - -- + - -- + . -. + - - - - -- -- + \n + . -. + - -- + - -- + . - -. + - - \n --\n + - - -- -- + + - - - -- -- + + - - - -- + - - -- + - - - -- + - \n --\n - - - -- +- + - - - -- + - - - -- -- + + . - - --\n --\n +\n + - - - - -- + - - - -- + - - -- + - - -- + - - - -- -- + \n - - - -- -- +- + + - - @@ -31919,215 +31920,215 @@ - - - -- + - - - --\n --\n +\n + - -- + - - -- -- + + . -. + - - - -- -- + \n + - -- + . - -. + - - -- + - - . \n -.\n . -. +. + - - -- + - - -- -- + + - -- + - - - --\n --\n +\n + - - -- + - - - -- + - - -- + - -- + - \n --\n - -- +- + - - -- + . - - -- + +- +- +\n - - --\n --\n + - -- - + - -- - + - -- - + - -- - + - -- - - + - -- - +\n - --\n --\n - -- -- + + - - -- -- + + - - -- -- + + - - - -- -- + + - - - --\n --\n +\n + - - -- -- -- +- + + - - - - -- + - - -- + - - -- -- + + - - --\n --\n +\n +. . -. + - - -- -- + + - - - --\n --\n +\n + - - -- + - - -- -- + + - - -- -- + + . . -. -. + + - - \n --\n + @@ -32139,7 +32140,7 @@ - \n --\n + @@ -32154,8 +32155,7 @@ . . -.\n -.\n +\n @@ -32171,7 +32171,7 @@ -\n + \n @@ -32190,14 +32190,14 @@ + . . -. -. + + - - --\n --\n +\n @@ -32217,13 +32217,13 @@ -. -. +. + + - \n --\n @@ -32231,281 +32231,281 @@ + . . -. -. + + . -. + . . -. + . \n -.\n + - -- + - - - -- + . - - --\n --\n +\n + - - -- + - - -- + - - -- + - - \n --\n + - - -- + . . . -. + . - -. -- + + . -. + . -. -\n + \n + . -. + . -. - + + . -. - + + - \n --\n + . -. - - + + + . -. + . . -.\n -.\n +\n + . -. + . -. + - - -- -- + + - - -- -- + + - - --\n --\n +\n + . . -. + - - -- -- -. + . + . -. -. . -. +. + + \n +. - -- + - -- + - -- + . \n -.\n + . -. - + + - - -- -- + + - -- + - - -- -- + + . \n -.\n - + + . . . -. -. + + . -. + \n -\n + . . -. + - - -- + - -- + . . -. + - \n --\n + . . . -. + - - -- -- + + . - -. + - \n --\n + - - -- -- + + . - - -- -- + + . -. + . . -.\n -.\n +\n + . -. + . -. + . -. + . . . -. -. + + - - - - --\n --\n - +\n + + . -. - + @@ -32516,108 +32516,108 @@ \n + - - -- -- + + . . -. -. + + . . . . -.\n -.\n +\n + . . . . -. -. - - + + + + . . -. + . \n -.\n + . -. + . -. + . . -. -. + + - - - -- -- + + - - --\n --\n +\n + . . -. + . . - - -- + - - \n --\n + . . -. + - - -- + . - -- + . - -. + - \n --\n + . -. + . -. @@ -32627,50 +32627,51 @@ + - + . -. + . . -.\n -.\n +\n + . . -. + - - -- -- + + . . -. + . - - -- + - \n --\n - + + . -. + . . -. + . + \n -.\n -\n +. + -. . -. + . . @@ -32680,12 +32681,11 @@ . - - -- -- -\n +\n + @@ -32726,14 +32726,15 @@ + . . -. + . . . -.\n -.\n +\n + @@ -32748,11 +32749,11 @@ . -. + . \n -.\n + @@ -32762,11 +32763,10 @@ . -. + - -- \n @@ -32775,136 +32775,137 @@ + - - -- + - - - --\n --\n +\n + - - -- + +- - + - -- - - - - - +\n - --\n --\n - - - - - -- -- + + - - - - --\n --\n +\n + - -- + - -- + - - -- -- + + - - --\n --\n +\n - - - - - -- -- - +- + + + - - -- + - - \n --\n . -. +. + +. . . . +\n . -.\n -.\n . -. -. + + . . -. -. + + . -. + - . -. \n + . . -. + - - -- -. -. . + -. +. + + . -. \n + . @@ -32914,122 +32915,122 @@ . . . -. + . . -. + - - -- + - -- \n + - -- + - - -- + - -- + . - -. + - \n --\n +- . . -. + - -- + - -- + . -. \n . . . -. -. +. + + - . . -. + . -. + . \n -.\n + . -. + . - - -- + - -- + . -. + . . \n -.\n + - -- + - - - -- -- + + - - -- -- + + - - - -- -- + + . \n -.\n - -. +. + + - - -- + . @@ -33037,28 +33038,28 @@ . - - -- + . - -- + - - -- + - \n --\n + - - - - -- + - - @@ -33067,66 +33068,66 @@ - - - -- + - \n --\n +- + -- - -- + - - -- -- + + - - -- -- + + - - . \n -.\n . -. -. +. + + . -. + - - - -- + - \n --\n +- + -- - -- + - - -- -- + + @@ -33136,94 +33137,94 @@ - -- + . - -. -- + \n + - - - -- -- + + - - - -- -- + + - - - --\n --\n +\n +- - -- + - - - -- + - - -- -- + + +- - +\n - --\n --\n - - -- -- + + - - - -- + . . . -.\n -.\n +\n +. . -. -. + + . . -. + . -. + . -. + - -- \n + . - -- + - - -- + . - -. -- + \n + . . @@ -33232,49 +33233,49 @@ . . -. + . -. \n + . . -. -. + + . . . -. -. + + . . . -. + . \n -.\n - + + . -. + - - - -- + - \n --\n + @@ -33284,13 +33285,12 @@ - -- + . - -. + - -- \n @@ -33299,21 +33299,21 @@ + . . . -. + . . -. -. + \n . . -. -. +. + @@ -33369,9 +33369,9 @@ \n 33394 + . -. @@ -33386,8 +33386,8 @@ \n - -- -- +- + @@ -33406,13 +33406,13 @@ \n +- - - - - -- -- + @@ -33426,11 +33426,11 @@ \n . -. -. +. + + - -- @@ -33448,10 +33448,10 @@ \n + . -. @@ -33470,24 +33470,24 @@ \n + - - - -- -- + \n + - - - -- -- + @@ -33497,19 +33497,19 @@ \n + - - -- -- + + - - -- + - - -- -- + @@ -33521,10 +33521,9 @@ \n . -. -. - +. + @@ -33532,10 +33531,12 @@ + \n + @@ -33544,61 +33545,61 @@ . - -. + - \n --\n + - - -- + - - - - -- + - - -- + - - - - --\n --\n +\n +- - - - -- + - - - -- + - - - -- + - - - - - - -- + - - - -- -- + \n . -. -. +. + + - -- + . @@ -33606,22 +33607,22 @@ . -. \n +. + -. - . -. + - \n --\n +. + -. @@ -33630,162 +33631,162 @@ . \n -.\n + . -. + . . -. + - -- + . - -. + - \n --\n + - - -- -- + + - - - -- -- + + - - \n --\n +- -- + - - - -- -- + + - -- + - \n --\n + - - - -- + - - - -- + - -- + - - -- + - -- \n + - - -- -- + - -- - + - - -- - - - + +- -- - + \n + - - -- + - -- + - - -- + - \n --\n + - -- + - -- + - - -- + - - -- + - \n --\n + - - -- + - -- + - - -- + - - . \n -.\n . -. +. + +. . . . +\n . -.\n -.\n . -. -. + + @@ -33793,290 +33794,290 @@ . -. + . -. + . . -. -. + \n + . -. + - -- + - -- + . - - -- + - - -- + . \n -.\n + +- - - + - -- - - + - -- - - + - -- - - - +\n - --\n --\n - - -- + - - - - -- + - - - -- + - - - --\n --\n +\n +- - - -- + - - - -- + - - - - -- + . \n -.\n + - - - -- -- + + - - - -- -- + + - -- + - -- \n +- - - - - -- -- + + - -- + - - . \n -.\n + . . -. + . . . . -. -. + + - - -- -- + + . . -. + - \n --\n + - - - - -- + - - -- + - -- + - \n --\n + - - -- -- + + - -- + - - . \n -.\n . -. +. + . . . . -.\n -.\n +\n + - - -- -- + + - - -- -- + + . . - -. + - - - --\n --\n +\n +. - - -- -- + + - - -- + . - - -- + . - -. + - \n --\n + . . -. + . . . . -.\n -.\n +\n + - -- + - -- + - - -- + - - -- \n + - - -- + - - -- + - - -- + - . \n -.\n . -. +. + +. . . . +\n . -.\n -.\n . -. -. + + @@ -34086,23 +34087,22 @@ . -. \n +. + -. - -- + - -- + . - -. -- + \n @@ -34115,17 +34115,18 @@ + - - - -- + - - - --\n --\n +\n + @@ -34135,15 +34136,14 @@ . \n -.\n . -. +. + . . . . -.\n -.\n +\n 34171 @@ -34151,81 +34151,82 @@ + . . . -. + - \n --\n + . - -- + . -. + \n -\n + - -- + . -. + - -- + - - --\n --\n +\n + - - -- -- + + . - - -- + . -. + . -. + +. . . +\n . -.\n -.\n - -. -- + + - - -- + . -. + . - -. + - \n --\n + . . @@ -34234,36 +34235,36 @@ - \n --\n + - - -- + - -- + - -- + . -. - + + . -. + \n -\n + . . -. + . -. + - @@ -34272,132 +34273,132 @@ - - -- + - - - --\n --\n +\n + . -. + - -- + . - -. -- + + - -- + - \n --\n + - - -- + - -- + - -- + . -. + \n -\n +. . + -. - - - - -- -- + + - - -- -- + \n + . + -. - -- \n + . - -. + - - - -- -- + + - - -- -- + \n + - - -- + . -. + . - -- + - \n --\n . . -. -. +. + + - -- + - - - --\n --\n +\n + @@ -34405,232 +34406,231 @@ - \n --\n + - - -- + . -. + \n -\n + - - -- + - -- \n + - - - -- + . - -- + - \n --\n + - - -- + - \n --\n - - -- +- + - - - -- + - - -- + - - -- -- + + - - --\n --\n +\n + - - -- + - - - -- -- + + - . . -.\n -.\n +\n + - -- + . . - + . - - -- -- + + - - --\n --\n + \n - +. + . - - - -- -- + + - -- + +- - + - -- - + - -- - +\n - --\n --\n - -- -- + + - - -- -- + + - - -- + . -. + . \n -.\n + . - -. + - - - -- -- + + . -. \n + . . -. -. + + - -- + - \n --\n +. -. + . - - -- -- -. -. +. + + + - - -- + - - - - -- + +- - - +\n - --\n --\n - - -- + - - - -- + - - - - --\n --\n +\n + . - -- + . -. @@ -34640,14 +34640,14 @@ \n - -- -- - -- + +- + + - -- @@ -34661,16 +34661,16 @@ + . -. + - - -- -- + + . -. @@ -34679,14 +34679,14 @@ \n +- + -- - - -- @@ -34700,13 +34700,13 @@ + - - -- -- + + . -. @@ -34714,17 +34714,17 @@ \n + - - -- + - - -- + - -- @@ -34738,15 +34738,15 @@ \n + - - - -- + . - -. -- + @@ -34760,10 +34760,10 @@ \n + - - -- -- + @@ -34793,8 +34793,8 @@ \n +- -- @@ -34849,32 +34849,33 @@ \n 34876 + - - -- + - - - -- + - - - - -- -- + + - - - --\n --\n +\n +- + -- - -- + - @@ -34882,58 +34883,57 @@ - - -- + - \n --\n - - - -- -- - -- + +- + + - - - - --\n --\n +\n + - - - -- + - - . - -.\n --\n +\n +- - - -- + - - - -- + - . - -. + - \n --\n + . -. @@ -34965,14 +34965,13 @@ \n + . -. + - - -- -- @@ -34981,8 +34980,9 @@ -\n +\n + @@ -35000,17 +35000,17 @@ \n + . -. + . - + . - -- @@ -35018,43 +35018,44 @@ \n + - - -- + - - -- + . - -. -- + \n + . -. + . - + . -. + - - -- -- + \n +- + -- @@ -35062,14 +35063,14 @@ . - -. -- + \n + @@ -35078,15 +35079,14 @@ - - - -- + - -- + . . -. @@ -35096,90 +35096,90 @@ \n + - - -- -- + + . -. + - - - -- -- + \n + . . . -. + . . . . -. -. + + . -. \n +- + -- - -- + - . - -. -- + \n + . - - -- -- + + - - - -- -- + + . - - -- -- + \n + . -. + . . -. -. + + - -- @@ -35189,27 +35189,28 @@ \n + - . + -. . . -. + . + -. - -- \n + . . -. -. + + @@ -35218,17 +35219,17 @@ - \n --\n - -- -- +- + + . \n -.\n + @@ -35237,57 +35238,57 @@ . -. + . . - -. -- + \n + . . -. -. + + . . -. -. + + - -- \n + . . -. -. + + . -. + . . -. -. + + - -- \n +. + -. . @@ -35295,17 +35296,17 @@ - - -- -- + \n + - - -- -- + + - @@ -35313,50 +35314,50 @@ . -. + . . . -.\n -.\n +\n + . . -. + - -- + . - -. + - -- \n +. + -. . - -- + - - - -- + - \n --\n +. + -. @@ -35364,135 +35365,135 @@ . - -. + - -- + - \n --\n +. + -. . - -- + - - -- + - \n --\n + . - -. + - - -- -- + + - \n --\n +. + -. . - -- + - - -- + . \n -.\n - + + . . -. + - -- + . - -. + - -- + - \n --\n +. + -. . - -- + . . -. -. -. + . -. . -. +. + + \n + . . -. + - - -- -- + + . -. + . -. + . - -. -- + + - \n --\n +. + -. . @@ -35500,19 +35501,19 @@ - - -- -- + + . -. + . . -.\n -.\n +\n + - -- + . @@ -35520,131 +35521,130 @@ . -. + . - -. + - - -- -- + + - \n --\n +. + -. . - -- + . . . -. -. + \n + - -- + . - -. + - -- + - \n --\n + . -. + - - -- -- + + . . -. + . -. \n + . - - -- + - -- + . . -. + - -- + - . - -. -- + \n + . -. + - - -- -- + + - . -. \n + - - -- -- + + . . -. + - - \n --\n @@ -35659,7 +35659,7 @@ -\n + \n @@ -35669,9 +35669,9 @@ + - -- \n @@ -35692,11 +35692,11 @@ + - - --\n --\n +\n @@ -35728,14 +35728,15 @@ + - . . -.\n -.\n +\n + @@ -35762,7 +35763,6 @@ - \n --\n @@ -35788,9 +35788,9 @@ + - -- \n @@ -35816,10 +35816,10 @@ + . . -. -. + \n 35850 @@ -35846,10 +35846,10 @@ \n + . . -. -. + @@ -35874,9 +35874,9 @@ \n + . -. @@ -35896,9 +35896,9 @@ \n + . -. @@ -35922,11 +35922,11 @@ \n + . - -- @@ -35942,10 +35942,10 @@ \n + . . -. -. + @@ -35962,15 +35962,15 @@ \n + . - - -- + - - - -- -- + @@ -35989,12 +35989,12 @@ \n . . -. +. + - - - -- -- + @@ -36009,37 +36009,37 @@ \n + . - -- \n + . -. \n + . - -- \n + . -. \n + . - -- @@ -36058,10 +36058,10 @@ \n + . -. @@ -36084,9 +36084,9 @@ \n + . -. @@ -36102,9 +36102,9 @@ \n + . -. @@ -36123,8 +36123,8 @@ \n - -- -- +- + @@ -36147,8 +36147,8 @@ \n +- -- \n @@ -36159,65 +36159,65 @@ \n +. -. \n + . - - -- -- -\n +\n + + . -. -\n + \n + - - - -- -- + + . -. + . . -. -. + + - -- \n + . -. + . . -. -. + \n + - -- \n - + @@ -36226,62 +36226,62 @@ + . - -. -- + \n + - - -- + - - - -- -- + \n + - -- - + \n + . -. \n + - -- + - - -- -- + \n + . - -. + - - -- -- + \n +- -- \n + - -- + - -- @@ -36294,11 +36294,11 @@ \n + . -. @@ -36310,161 +36310,161 @@ \n . -. . + . . -. +. + . - -. -- + \n - -- - -- +- + + . . - -. -- + \n + . . . - -. + . - -. + . - -. + . . -. -. + + - -- \n + - - - -- + . . -. -. + \n + . . . - -. -- + + . . -. -. + + . . . . -. + - -- \n + . . . - -. -- + + - . - -. + . - - -- -- + \n + . . . - -. + - -- + . -. + - - - -- -- + \n + . . . - -. + - -- \n + . - -. + - - - -- -- + @@ -36472,8 +36472,8 @@ \n - -- -- +- + @@ -36488,55 +36488,56 @@ \n +- . . . -. + . . -. -. + + - - - - -- -- + \n + . -. + - -- + - \n --\n +. -. + . - - -- -- -. -. +. + + + - - -- + - - @@ -36544,264 +36545,264 @@ - - - --\n --\n +\n - - -- - - + - -- - - + - - --\n --\n +- +\n + - - -- + - - - -- + - - - - -- -- + + - - - --\n --\n +\n +- + -- - - -- + - - - - -- + - \n --\n - - - -- -- - -- + +- + + - - - - --\n --\n +\n + - - - -- + - - . - -.\n --\n +\n +- - - -- + - - - -- + - . - -. + - \n --\n + - - -- + - - -- -- + + - - - -- -- + + - - -- -- + \n + . - -. + + . -. + - - - -- -- + + - \n --\n + . . -. -. - - + + + + . -. - + + - - -- -- + + . \n -.\n - + + - - -- -- - - + + + + . -. + . . . -. -. + + - - - --\n --\n + \n + - - -- -- + + . -. - - - + + + + . -. + - - -- + . \n -.\n + . . -. -. + + @@ -36809,44 +36810,44 @@ . . -. -. + \n + . . -. + - - -- + - - -- -- + + . . -. + - - - - -- -- + + - -- \n + - - @@ -36858,23 +36859,23 @@ . . . -. -. + + - - - --\n --\n +\n +- . . . -. -. + + - -- + - - @@ -36882,93 +36883,93 @@ . . . -. -. + + . - \n --\n +. - -. + - . . . -. -. + + - - - - -- -- + \n + . . . -. + - - -- -- + + . . -. + . - \n --\n + - - -- + - - - - -- -- + \n +- - -- + - -- - + + - -- + . - - - --\n --\n +\n + @@ -36976,89 +36977,89 @@ - -- \n . -. +. + . . . -. -. + + - - -- -- + \n +. + -. - - - - --\n --\n +\n + + - - -- - + + - -- \n + - - -- -- + + . - -- + - -- + - -- + - -- + - - - --\n --\n +\n + . . . -. -. + + @@ -37066,8 +37067,7 @@ - - -- -- + @@ -37079,18 +37079,18 @@ \n + - - - - -- -- + @@ -37098,6 +37098,7 @@ \n + @@ -37107,8 +37108,7 @@ . . -. -. + @@ -37116,27 +37116,27 @@ \n + - -- + - - -- -- -\n +\n + @@ -37152,6 +37152,7 @@ \n + @@ -37160,10 +37161,9 @@ - + . -. @@ -37173,9 +37173,10 @@ \n + - -- + @@ -37185,8 +37186,7 @@ - - -- -- + @@ -37195,64 +37195,65 @@ \n + - - -- + - - -- + - - - - -- -- + + - - - -- + - - - -- + - \n --\n - -- +- + - - - -- + - - -- + . - -. + - - -- + - - -- + . - - -- -- + + - - --\n --\n +\n + @@ -37260,31 +37261,31 @@ - -- + - - -- -- + + - - -- + - - - -- + - - -- + - - - - --\n --\n +\n +- - -- + - - @@ -37293,83 +37294,83 @@ - -- + . -. + - - -- -- + + - -- + . \n -.\n - + + . -. + . . -. -. + + - - -- + - . -. + . -. + - - \n --\n +. - -. -- + + +- + - - - + - -- -- -- . . -. + - - - - -- -- + \n + . -. + - - - - -- -- + + @@ -37377,37 +37378,37 @@ - -- \n + . -. + - - - -- -- + + . -. + - - . \n -.\n + . -. + - - -- -- + + . @@ -37416,14 +37417,14 @@ . \n -.\n + . -. + . -. + @@ -37435,16 +37436,16 @@ . \n -.\n + . -. + - -- + - -- + @@ -37455,7 +37456,7 @@ . \n -.\n + @@ -37464,15 +37465,15 @@ - - -- -- + + - - -- + - - -- -- + + @@ -37480,49 +37481,49 @@ - -- + . -. \n + . -. + - -- + - - -- -- + + . . -. + - - -- -- + + . . -. -. + \n + - - - -- + - -- + - @@ -37530,18 +37531,18 @@ - -- + . . . -. + - - -- + - - --\n --\n +\n + - - @@ -37550,24 +37551,24 @@ - - - -- + - - - -- -- + + - - -- + - -- + . - \n --\n + @@ -37581,17 +37582,16 @@ - - -- -- + + . -. + . \n -.\n @@ -37599,22 +37599,23 @@ + . - -- + - - -- + - - - --\n --\n +\n + @@ -37622,57 +37623,57 @@ - -- + - - -- + - - - -- -- + + - - \n --\n + . -. + . . -. + . . -. + - -- \n + - - -- + . - -. -- + + - - @@ -37680,103 +37681,103 @@ - - - -- + - - - -- + +- - + - -- - + - -- - +\n - --\n --\n - - -- + - -- + - - -- + - - - - -- + - - -- + - - - - -- -- + + - -- + - \n --\n - + + . -. - + + . -. + - - -- -- + + - -- + - -- + - - \n --\n + . . -. -. + + . . -. -. + + - - . -. + . . @@ -37787,33 +37788,33 @@ . -. + - -- \n + - -- + - - - -- + - - - -- + - - -- + - - -- + @@ -37821,43 +37822,43 @@ - \n --\n + . -. - + + . -. - -. -. +. + + + - \n --\n - + + . -. + . . -. -. + + - -- + - @@ -37865,64 +37866,64 @@ - -- \n - -- -- -. - - -- + . -. +- + +. + + + . -. -\n + \n + . . -. -. + + . . -. -. + + - - -- + - - -- -- + + - -- \n + . -. + . . -. -. + + . -. + . @@ -37930,49 +37931,49 @@ - . -\n -.\n + \n + . . -. -. - + + + . - - -- -- + + . . -. -. + \n -. -. +. + + - -- + @@ -37980,25 +37981,25 @@ - -- \n + . -. + . -. + - -- \n -. -. +. + + @@ -38010,80 +38011,80 @@ - -- \n + - - -- -- + + . -. + - - - -- -- + + . -. + . . -.\n -.\n +\n + . - - -- -- + + . . -. + - - -- -- + + - -- \n -. -. +. + + . . -. + . . -.\n -.\n +\n + - -- + - -- + - - -- \n + @@ -38091,130 +38092,130 @@ . -. + . . -. -. + + - -- \n + . -. + . -. + - -- + - -- + - \n --\n + . -. + - - -- -- + + - -- + . -. + . . -. -. + + - -- + - -- \n + - - - -- -- + + . . -. -. + + . . -. + . -. + - - --\n --\n +\n + . -. + + + + +- +- - -- -- -- -- -- - \n --\n + - -- + - . - -. -- + + @@ -38222,42 +38223,42 @@ - - -- + - - \n --\n + - - -- -- + + - - - - -- + - -- + - - -- -- + + . -. + . -. -\n + \n -38289 +38289 + @@ -38268,317 +38269,317 @@ - - -- + . -. \n + - - -- -- + + - - - - -- -- + + - - -- -- -\n + + \n + - - - -- -- -- + + - -- - -- +- + \n -. - -. +. + + + - -- + . . -. -. + \n + . -. - + + . - - -- -- + \n + . -. + - - -- -- + \n + - - - -- -- + + - -- -\n + \n + - -- + - -- - + + . -. + \n -\n + - - -- + - - -- -- + + - - -- -- + + \n -\n + . -. + . . -. -. + + - -- \n + - -- + . -. + - - - - - -- -- + \n + - -- + . -. \n + - - -- + - - -- -- + + - - -- + - -- + . -. \n + - - -- + - -- + . -. + . -. + . -. + . -. \n + . -. + . . -. -- -- +- + + . -. \n + . -. -. + . -. -. . -. +. + + + . -. + - . -- -. + \n + - -- + . -. + . -. + . -. + . -. + - - -- -- + \n + . . . -. -. + + - - -- + - - -- -- + + - - -- -- + + - -- + . -. + - - --\n --\n +\n + . - -- + @@ -38587,91 +38588,91 @@ - - - -- -- + + - -- + - - \n --\n + - -- + - - - - - -- -- + + - -- + - - -- -- + + - - -- -- + + +- - +\n - --\n --\n - -- -- + + - -- + . -. + . -. + - -- + . -. + - - --\n --\n +\n + - -- + - -- + - -- + - - - -- + - - @@ -38679,8 +38680,7 @@ - - - -- -- + \n @@ -38692,60 +38692,60 @@ \n + - -- + - -- - + \n +- - - -- + - -- \n + - - - - - -- -- + \n + - -- \n . -. -. +. + \n + - - - -- -- + \n \n @@ -38753,77 +38753,78 @@ \n + - - - - - -- -- + \n +- - - -- -- + \n - -- -- - -- + +- + \n + - - -- -- + \n + - - -- + . - - -- -- + \n - -- +- + - - - -- -- + \n +- - - - -- + - - - - -- -- + + - - - -- + - - - --\n --\n +\n + - - @@ -38833,55 +38834,55 @@ - - - --\n --\n +\n +- -- + - - - - -- + +- - +\n - --\n --\n - - - -- -- + + - - -- -- + \n - -- +- + - - -- + - - - -- + +- - + - -- - - +\n - --\n --\n - - -- + - - @@ -38889,169 +38890,169 @@ - - - -- + +- - - +\n - --\n --\n - - - - - - -- + - - - -- + - -- \n + - - -- + - - - -- + - - - - --\n --\n +\n + - -- + - - - -- + - - -- + - - -- + - - - - --\n --\n +\n +- - -- -- + + - - -- + +- - + + - -- -- - + - -- - + + - -- -- - - + - -- - +\n - --\n --\n - -- + - -- + . -. + - -- + - - -- -- + + - - -- + - \n --\n + - - -- -- + + - -- + - - -- -- + + - -- + - -- \n . -. -. +. + + - - -- + . . -. -. + + - - -- + - - \n --\n + @@ -39061,7 +39062,6 @@ - \n --\n @@ -39069,25 +39069,26 @@ \n + - -- + - -- \n . -. -. +. + + - - -- + - \n --\n + @@ -39099,161 +39100,161 @@ - \n --\n . -. . + +. +. +\n . -.\n -.\n . . -. -. + + . -. + - \n --\n + . . . -. -. + + . -. + - \n --\n + - - -- -- + + . -. + - \n --\n + - -- + . -. + - \n --\n + - - -- + - -- + - \n --\n . . -. -. +. + + - - -- -- + + - \n --\n . . -. -. +. + + . . -. -. + + . - \n --\n - + + - - - - -- -- + + - \n --\n . . -. -. . -. + +. + + - \n --\n . . -. -. +. + + - - - - -- -- + + - \n --\n + - -- + @@ -39262,39 +39263,39 @@ - - -- -- - + + + . - -- + - - - --\n --\n +\n + . - . . -. + . - - - -- -- - + + + . -. + @@ -39303,42 +39304,42 @@ - - --\n --\n +\n + - - - - - -- -- + + - - - -- -- - + + + - -- + - - - --\n --\n +\n + . -. + @@ -39349,12 +39350,12 @@ - - -- -- - + + + . -. + @@ -39363,34 +39364,34 @@ - - --\n --\n -39398 . +\n +39398 +. + -. . -. + - - - -- -- - + + + . -. + . -. + - -- + - @@ -39398,19 +39399,19 @@ - - --\n --\n -. +\n -. . -. + +. + + . -. + @@ -39420,158 +39421,157 @@ - - --\n --\n +\n + . -. + . . -. -. + + - - - -- -- + + - - - --\n --\n +\n + . . -. + - - -- + - - -- + - -- + - - -- + - - - - --\n --\n +\n +- - -- + - - -- -- + + - - -- -- + + . . -. -. + + - - - -- + . \n -.\n + . . -. + - . - -. + - - -- + - - -- + - - - - -- + - . \n -.\n + - -- + - - -- -- + + - -- + - - - - -- + . \n -.\n - + + . -. - + \n + . -. + . -. @@ -39580,43 +39580,44 @@ + - - -- + - -- \n + - - -- -- + + - -- + - - -- -- + \n + - - -- -- + + @@ -39624,49 +39625,49 @@ . . . -. -. + + . -. -- -- +- + \n + . -. - + + - - -- -- + \n + . . -. + @@ -39675,43 +39676,42 @@ - -- + . -. + - - -- -- + \n + - -- + . -. + - -- \n + - -- @@ -39719,28 +39719,29 @@ + - -- + . -. \n + . -. + . . -. -. + + - @@ -39748,88 +39749,87 @@ - - - -- + - - - -- + - - \n --\n + - - - -- -- + + - - - -- -- + + - - -- + - - - --\n --\n +\n + . . -. -. + + - - - -- -- + + - \n --\n + - -- + - - - -- -- + + - \n --\n - -- -- - -- -- + + - - + - -- - - -- + - - -- + - - --\n --\n +- +- +\n + @@ -39837,34 +39837,34 @@ + . -. + - - -- -- + \n + . -. + . . -. -. + @@ -39878,24 +39878,24 @@ \n + . -. + . . . -. -. + \n + . - -- @@ -39903,59 +39903,59 @@ + . . -. -. + \n + . . -. -. + + - -- \n + - -- + - - - -- -- + \n + . . -. -. + + . -. \n +- -- \n + . . -. -. + \n - -- -- +- + \n @@ -39965,23 +39965,23 @@ \n + . -. \n - -- +- + . . -. \n . . -. -. +. + \n @@ -39991,16 +39991,17 @@ + . . -. - + + @@ -40010,16 +40011,17 @@ - -- \n + . . . -. -. + + + @@ -40027,33 +40029,31 @@ - . . -. + . - -- \n + - -- + . -. @@ -40061,97 +40061,98 @@ - + + . . -. \n + - + . . . . -. -. - + + + . . -. + - - \n --\n + - - -- + . . -. -. + + . . -. -. + + . -. + - - -- + - \n --\n + - - -- + . . -. + - - -- + - - -- -- + + . . . -. + - - - - --\n --\n +\n + @@ -40159,45 +40160,45 @@ - - -- -- + + . . . -. -. + + . - - -- + - \n --\n + - - -- + . . -. + - -- + . - - -- + - \n --\n + @@ -40210,48 +40211,47 @@ - \n --\n + - - -- -- + + - \n --\n + - - -- -- + + - \n --\n + - - -- + . . -. -. + + . -. + - - - -- -- + \n @@ -40262,82 +40262,83 @@ + . + -. . -. + - - -- -- -\n -. -. +\n +. + + + . - - -- -- + + - - \n --\n -. -. +. + + . -. + - - -- + - - - - -- + - - -- + - \n --\n + - -- + . -. + @@ -40347,22 +40348,22 @@ - - - -- + . \n -.\n + - - -- + - - - - -- -- + + @@ -40370,31 +40371,31 @@ - \n --\n + - - - -- + - - -- -- + + - - \n --\n + . @@ -40402,34 +40403,34 @@ - -- + - - -- + - - \n --\n + - - - -- -- + + - - -- - + + . + -. @@ -40437,168 +40438,168 @@ - \n --\n + . . -. -. + + - -- + . . . -. + - \n --\n + . . . -. -. + + - -- + . . . -. + - \n --\n + . -. + - -- - + + . . -. -. + + - \n --\n + . -. + - -- - + + - - - -- + - -- + - \n --\n + . . . -. -. + + - -- + - \n --\n + - -- + - -- + - -- + - - -- + . \n -.\n . . -. +. + - -- + - -- + - - -- -- + + - . - -.\n --\n +\n + - - -- -- + + . -. + . . . . -. -. + + @@ -40607,18 +40608,18 @@ - \n --\n + . -. + - - -- -- + + @@ -40626,88 +40627,88 @@ . . . -. -. + \n + - - -- -- + + - - -- + - -- + - -- \n + - - -- -- + + - - - -- -- + + - - - -- -- + + - - -- + - - - --\n --\n +\n + . . . -. + - - -- + - \n --\n - -- -- - + + - -- -- +- + + - - - -- + - -- + . - @@ -40717,87 +40718,86 @@ - - - --\n --\n +\n +- - -- -- + + - - - -- + - - - - -- + - - -- + - - - -- -- + \n + - - -- + - -- + . -. + . - -- + . -. \n + . . . -. -. + + . -. + - -- + . -. - + @@ -40805,12 +40805,13 @@ \n + . . -. -. + + @@ -40818,30 +40819,29 @@ - -- \n + . . . . -. + . . . . -. + - -- + - - - -- -- + @@ -40849,36 +40849,36 @@ + - . -. + - - - -- -- + + - -- + - -- + - -- \n + . -. @@ -40886,24 +40886,24 @@ + - -- + - -- \n + - -- @@ -40911,33 +40911,34 @@ + - -- + . -. + . \n -.\n + - -- + . . -. -. + + @@ -40948,197 +40949,197 @@ - - -- -- + + - - \n --\n + - - -- -- + + - - -- + - - -- + - - -- + - - - - --\n --\n +\n +- - -- + - - -- -- + + - - -- -- + + - - - -- -- + \n + - - -- -- + + . - -. + - - -- + - - - -- -- + + - -- \n + - - -- -- + + . - -- + - -- \n + . - -- + . -. + - -- + . - - -- -- + + - -- \n +. -. + . - - -- -- -. -. +. + + + - - -- + - - - - -- + +- - - +\n - --\n --\n - - -- + - - - -- + - - - - --\n --\n +\n + - - -- + - - - -- + - - - - -- -- + + +- - - +\n - --\n --\n -- + - -- + - @@ -41146,72 +41147,72 @@ - - -- + - \n --\n - - - -- -- - -- + +- + + - - - - --\n --\n +\n + - - - -- + - - . - -.\n --\n +\n +- - - -- + - - - - -- + - . - -. + - \n --\n -41232 . +41232 +. - -. + - -- \n + - - -- -- + + - - - --\n --\n +\n + @@ -41233,12 +41234,12 @@ - - -- -- + + - \n --\n + @@ -41251,32 +41252,32 @@ - - -- + . - \n --\n + . - -. + - - -- + - - - -- + - -- + - - -- + . \n -.\n + @@ -41287,163 +41288,163 @@ - - - -- + - - - - -- + . \n -.\n + - - -- -- + + . -. + - - -- -- + + - - - --\n --\n +\n + . - -. + - - -- -- + + - - -- -- + + . + -. . - - -- + . - - --\n --\n +\n + . + -. - - -- -- + + . . - -. + - - -- + - -- + - - -- -- + + . - -. + - - --\n --\n +\n + . - -. + - - -- + - - - - - -- + - - -- + - - -- + - - -- + . \n -.\n + . . -. -. + + - -- + . . -. -. + + - -- + . . -. + . - -.\n --\n - +\n + + - @@ -41451,124 +41452,124 @@ . - -. + - - - -- -- + \n + - -- + . - -. + - - -- + - -- + - -- \n + . - -. + - -- + - - -- + - -- + . -. + . . -. -. + + - - --\n --\n +\n + . . . -. + . -. + - - -- -- + + . . -. -. + + - -- \n +. - -. -- + + . -. + - . . -. + - - -- -- + + - - -- -- + \n + . - -. -- + + - @@ -41576,23 +41577,22 @@ - - - -- -- + + - -- + - - - -- -- + + . -. \n @@ -41600,13 +41600,14 @@ + . -. + . -. + @@ -41614,14 +41615,13 @@ - - - -- + - - - -- + - -- \n @@ -41631,37 +41631,38 @@ + - -- + - -- + . -. + . -. + . -. + . . -. + . - - -- -- + \n + . - -. -- + + - @@ -41669,12 +41670,11 @@ - - - -- -- + + - -- \n @@ -41686,107 +41686,107 @@ 41722 + . -. - + + . -. \n + . . -. + - - -- + - -- \n + - - -- -- + + - - -- -- + \n + . - -. + - - -- + - -- \n + . -. \n + . -. \n + . - -. + - - -- + - -- \n + . -. \n + - -- + - - - -- -- + \n + . - -. + - - -- + - -- \n @@ -41795,58 +41795,58 @@ + - -- + . - -- \n + . - -. + - -- \n + - - - - -- -- + \n + - - -- -- + + - - -- + - - -- + - - -- -- + @@ -41863,24 +41863,24 @@ \n - -- +- + - - -- + - - -- + - - -- -- + + - - - - -- -- + @@ -41896,32 +41896,32 @@ \n + - - -- -- + + - - -- + . -. - + + - - - -- -- + @@ -41930,53 +41930,54 @@ \n + . . -. + . . -. + - -- + - - -- -- + + . - - - - -- -- + + - -- + . - - --\n --\n +\n + . - -- + - - -- + @@ -41984,23 +41985,23 @@ . -. + . . -. + - - \n --\n + - - -- + - -- + @@ -42008,40 +42009,40 @@ - - -- + - \n --\n + - - -- + - - -- + - - -- + - - -- + - - - -- -- + + . - \n --\n + @@ -42055,52 +42056,52 @@ - - - -- -- + + - - - -- + - - -- + - \n --\n + - -- + . -. + . - - \n --\n + . - -. -- + - -- - + - -- - -- +- + + @@ -42113,7 +42114,7 @@ - \n --\n + @@ -42122,10 +42123,10 @@ - - -- + - -- + @@ -42133,17 +42134,17 @@ - - -- + - \n --\n + - -- + - @@ -42153,7 +42154,7 @@ - -- + @@ -42161,12 +42162,12 @@ - - -- -- + + - \n --\n + @@ -42174,18 +42175,17 @@ - -- + - - - -- + . . -. + - -- \n @@ -42193,81 +42193,82 @@ + - . - -. -- + + . -. + . - - - -- -- + \n + - - -- -- -- +- + + - -- + - - - -- + - - -- -- -\n - +\n + + + . . . -. -. + + - - - -- + - - -- + . -. + @@ -42275,277 +42276,277 @@ - -- \n + - - -- + - -- + - -- + . -. - + + . -. + . . -. -. + + - -- + - \n --\n + - - - -- + - - - -- + . - - - -- -- + + - - -- + - - - - --\n --\n +\n +. . -. + . . -. + . . . -. + . . . -. + - - - -- + - - - -- -- + + . \n -.\n . -. +. + . . -. + - - - -- + - -- + - - - -- + - - - -- -- + \n + - - -- -- + + - - - -- + . \n -.\n . -. +. + +. . . +\n . -.\n -.\n . -. -. + + . -. + - - -- -- + + - -- + - - -- + - - - -- -- + \n + - -- + - -- + - -- + - \n --\n +- - - - -- + - -- + - - -- -- + \n . -. . + . . -.\n -.\n . -. -. +\n +. +. + + . - - -- -- + + . . -. + - - . - -. -- + \n + - - -- + - -- + - - -- -- + + . -. \n + - - -- -- + + . -. + . -. \n + - - -- -- + + - - -- -- + + - - -- -- + + \n -\n + @@ -42553,39 +42554,38 @@ - -- + . -. + . - - -- -- + \n + - - -- + - -- + - -- + - - -- -- + + . -. \n @@ -42594,23 +42594,23 @@ + . - -. + - - - - -- -- + + . - -. -- + @@ -42620,19 +42620,19 @@ + . . . -. -. + + . . . -. -. + @@ -42657,15 +42657,15 @@ + - - -- -- + + . . - -. -- + \n @@ -42687,14 +42687,14 @@ + - -- + - - - -- -- + \n @@ -42707,16 +42707,16 @@ + - - -- -- + + - - -- + - -- \n @@ -42733,87 +42733,86 @@ + . -. + . . -. -. + + . -. \n + - - - -- -- + \n + - - -- -- + \n + - -- + - - -- + . . -. -. + \n + . . -. + . . -. + . . -. + . \n -.\n + . . -. -. + + . . -. -. + \n + - - - - -- + - \n --\n - @@ -42824,16 +42823,17 @@ + + - -- + - -- + . -. \n @@ -42845,22 +42845,23 @@ + - -- + - . - -. + - - - -- + - \n --\n + @@ -42872,125 +42873,125 @@ . -. + - -- + . - - -- + . . \n -.\n + - -- + . - -. -- + \n + . - - -- -- + + . - - -- -- - + + + . . . \n -.\n + . - -. + - -- + . -. + . - - -- + . \n -.\n + - -- + - - -- + . - -. + . - - -- + . \n -.\n + . . . -. -. + + . . . - -. -- + + - \n --\n + . . -. + . . . - -. + - - - -- + . \n -.\n + @@ -43001,24 +43002,24 @@ - - -- -- + + - -- + - . - -. + - \n --\n +. - - -- + . . @@ -43027,7 +43028,7 @@ - -- + @@ -43038,25 +43039,22 @@ . - -. -- + \n + . - - -- + - -- + . - -. -- - @@ -43066,23 +43064,26 @@ + + + . -. + . - - -- + . \n -.\n + . + -. - @@ -43090,12 +43091,12 @@ . -. - + + . + -. - @@ -43104,24 +43105,24 @@ . \n -.\n + . -. + . -. - + + - -- + . @@ -43129,71 +43130,70 @@ . -. - + + . -. + . \n -.\n + + - - . - -. -- + + . - -- + . - -. + - -- + . - -.\n --\n +\n + . . -. + . - -- + . - -. + - -- + . -. \n @@ -43204,20 +43204,21 @@ + . - - -- + . . - -. -- + + - \n --\n + @@ -43226,32 +43227,32 @@ . - -. + . -. + . -. + . -. + . -. + - -- + - . \n -.\n + @@ -43260,86 +43261,86 @@ . - -. + - \n --\n 43305 + - - -- -- + + - -- + . . - -. -- + + - \n --\n + - -- + . -. + . - -. + - -- + - - -- + - -- \n + . -. \n + - - -- -- + + . - - -- -- + + @@ -43347,80 +43348,80 @@ - -- + - - \n --\n - + + - -- + - - -- -- + + . - -. -- + + . -. + - -- -\n + \n + . -. + - . -. + . - -. -- + + . \n -.\n + . - -. -- + + - - -- -- + + . \n -.\n + @@ -43428,11 +43429,10 @@ . \n -.\n + - - --\n --\n +\n @@ -43440,6 +43440,7 @@ 43480 + @@ -43448,32 +43449,32 @@ . . . -. -. + \n + - - -- + - - - -- -- + + - - -- -- + \n + . -. + - @@ -43481,42 +43482,41 @@ . . . -. -. + \n + . -. + - -- + - - -- + - -- \n + . - -. + - - -- + - -- + - -- @@ -43530,17 +43530,18 @@ \n - - -- +- + - - -- -- + + - . -. + @@ -43548,8 +43549,7 @@ . - -. -- + @@ -43560,25 +43560,25 @@ \n +. -. + . -. + - - - -- + . -. + - - -- -- + @@ -43587,128 +43587,128 @@ \n + - -- + - -- + . -. + - -- \n + - . -. + . -. + - - - -- + . -. + - - -- -- + \n + . - -. + - - -- + . -. + . - -. -- + \n + - - -- + . . . -. -. + + - -- + - - -- -- + \n +- + -- . . - -. + - -- -- -- +- + \n + . . -. -. + + . -. + . -. + . -. - + @@ -43720,26 +43720,26 @@ \n + . . . -. -. + + - - - -- -- + + . . . - -. -- + + . -. @@ -43747,12 +43747,13 @@ \n +. -. + - @@ -43760,12 +43761,11 @@ . -. + . -. @@ -43777,24 +43777,24 @@ \n + - -- + - -- + - -- + - - -- \n @@ -43806,63 +43806,63 @@ + . -. \n -. -. +. + + . -. \n - + \n + . - -. + - - -- -- + \n + . - - -- -- + + - - -- -- + \n +. - - -- + . -. \n + - - -- -- + @@ -43877,90 +43877,91 @@ \n + . . -. + . -. \n + - - -- + . . . -. -. + \n + - - -- + - -- + . . -. \n + . . -. + . -. + . - -. + \n + . - -. -- + + . -. + . . - - -- + . -. \n . . -. -. +. + + - @@ -43971,13 +43972,12 @@ . -. + . -. \n @@ -43992,57 +43992,58 @@ + . . -. + . . - -. + - - -- + . . -. -. + \n + . - -. + - . . -. + - - -- + - - -- -- + \n + . -. + - - -- -- + + @@ -44050,19 +44051,18 @@ - - -- -- + \n + - -- + . -. \n @@ -44075,34 +44075,35 @@ \n \n . -. -. +. + \n +. - - -- + . -. + \n -\n + - - -- -- + + . . -. -. + \n + . . @@ -44111,172 +44112,171 @@ . -. \n +. . . . -. + . . -. \n . -. -. +. + + - -- + - - -- -- + \n - -- -- +- + + . - -- \n + . -. + . -. \n + . . -. + . . -. -. + \n . -. -. +. + + - - - -- + . -. + - -- \n -. -. +. + + - - -- -- + + . -. \n + - -- + - - -- -- + + - -- \n + - - - - -- -- + + - - -- \n + . . -. + . . -. + . . . -. + . . -. -. + \n . -. +. + - - -- -- + + . . -. + - - -- \n + . . -. + . - \n --\n + . . -. + . . . -. + . . . -. -. + \n @@ -44284,19 +44284,19 @@ + . . . -. -. + + . . . -. + . . -. -. + \n @@ -44323,11 +44323,12 @@ + - \n --\n + @@ -44338,8 +44339,8 @@ - - -- -- + + @@ -44347,13 +44348,12 @@ - -- + - - - -- -- + \n @@ -44364,25 +44364,25 @@ + - -- + - - -- -- + + . -. + . -. + . -. \n @@ -44391,20 +44391,21 @@ + - -- + - -- + . \n -.\n + @@ -44412,18 +44413,18 @@ - -- + - - - -- + . -. + - \n --\n + @@ -44432,8 +44433,8 @@ . . -.\n -.\n +\n + @@ -44446,11 +44447,11 @@ - - -- + . - -. -- + + @@ -44460,16 +44461,15 @@ . . -. + . - -.\n --\n +\n 44513 \n + - \n --\n \n @@ -44477,11 +44477,12 @@ \n 44525 + - -- + . @@ -44489,304 +44490,304 @@ . . -. -. + \n + - -- + . -. + . -. \n + - - -- -- + + - - -- -- + + . \n -.\n + . . . -. -. + + . -. + . -. - - - + + + + . \n -.\n + . -. + . -. - - - - - + + + + + + - - --\n --\n +\n + . -. + . - -- + - - -- -- + + . - \n --\n + - - -- -- - + + + . . -. -. - - + + + + . \n -.\n +. - - - - -- + - - -- -- + + . - - \n --\n + . -. + . -. + - - - -- + - \n --\n + . . -. -. + + . . -. -. + + - -- + . -. + - - -- -- + + . -. \n + - + . . . -. -. - + + + . -. - + + . -. + - - -- + - \n --\n + - -- + - - -- + . -. + . -. + - \n --\n +- - @@ -44794,223 +44795,223 @@ - -- + - . - -. -- + \n + - -- + - - -- + - - -- -- + + - - -- -- + + - -- \n + - - -- + . . . . -. -. + + . -. + - - -- -- + + . \n -.\n - + + . -. + . - -- + . -. \n + - -- + - -- + . - -- + - -- + - -- \n + . -. + . . -. + - -- + . . -. -. + + . -. \n + . + -. - - -- -- + + - -- \n + . . -. -. + + . . -. -. + + - -- \n + - - -- + . . - -. -- + + - - -- + . . \n -.\n +. . -. + . . -. + . -. + - - - -- -- + + - - --\n --\n +\n + . . -. -. + + - -- + @@ -45018,34 +45019,34 @@ - \n --\n + . . -. + - - -- -- + + - -- \n + - - - - -- + - -- + @@ -45057,17 +45058,17 @@ - - - -- -- + + . -. \n + . . -. -. + + @@ -45078,28 +45079,27 @@ - -- + - - \n --\n + . -. + . - -- @@ -45109,13 +45109,12 @@ + . -. + - - -- -- @@ -45123,22 +45122,23 @@ + + . -. + . \n -.\n + . - - -- -- + @@ -45148,21 +45148,22 @@ + - \n --\n + . -. + . -. - + + . -. + @@ -45171,16 +45172,15 @@ - - -- -- + \n + . -. @@ -45198,31 +45198,31 @@ \n + . -. + - - -- + \n -\n - + + . -. @@ -45234,14 +45234,15 @@ + . . -. -. + + - - -- -- + + @@ -45252,20 +45253,20 @@ - -- + - - \n --\n + . -. - + + @@ -45273,46 +45274,45 @@ - - -- -- + + . -. + \n -\n -- - -- +- + + . -. + . - -- + - - -- -- + \n + - - -- \n @@ -45330,6 +45330,7 @@ \n + @@ -45343,27 +45344,26 @@ - \n --\n - + + . -. + . -. + . . -. -. + + . . -. @@ -45371,77 +45371,78 @@ + . -. + - - - -- -- + + . -. + - - - -- -- + + . . \n -.\n + . - - -- + . . -. + . - -- + - - -- + - -- + . . . . -.\n -.\n - +\n + + . -. + . . -. -. + + . @@ -45450,7 +45451,6 @@ . -. @@ -45464,16 +45464,17 @@ + . -. + - - - -- -- + + . @@ -45482,18 +45483,18 @@ - - -- -- + + . . -. -. + \n + . -. - + + @@ -45501,52 +45502,52 @@ - - -- -- + + . - -- \n +- . -. + - - -- -- -- + - -- +- + + . -. + . -. + . \n -.\n - + + . -. + . @@ -45555,71 +45556,71 @@ . -. + . . -. + - - -- -- + \n + - - - -- + . -. + . -. + . -. + . \n -.\n + - - -- -- + + - -- + - -- + - - -- -- + + - - -- -- -\n -\n + +\n + + . -. + @@ -45628,15 +45629,15 @@ . -. + . \n -.\n + @@ -45646,29 +45647,29 @@ - -- \n + . -. + - - - \n --\n + - - --\n --\n +\n + @@ -45679,46 +45680,45 @@ - - - -- + . . -. -. + \n + - - -- + . . -. + - \n --\n + . -. \n + . . -.\n -.\n +\n + . -. \n + . -. + . -. \n @@ -45727,108 +45727,109 @@ \n \n + - \n --\n + - - - -- -- + \n + - -- \n + - \n --\n \n 45797 \n \n \n + . . -. -. + \n +- + -- - -- \n + . -. \n + . . - -. -- + + . -. \n + - - - -- + - - -- + - - -- -- + \n + - - - - -- -- + \n + . . -. -. - + + + . . -. \n +. + -. @@ -45836,95 +45837,95 @@ - -- + - -- - + \n +. -. + . -. + . . -. + . -. + - -- \n + . -. \n +- -- -. -. +. + + . . -. -. + + - - - -- -- + \n - -- -- +- + + . . -. + . . -. -. + + - . -. + - \n --\n - -- +- + . . -. + @@ -45934,86 +45935,86 @@ . \n -.\n + - - -- + . - - - - -- + - -- + - - -- + - - - - -- -- + + - \n --\n - + + . . -. + . -. + - - -- \n + - -- + . . -. + - - - -- -- + + . -. \n + - - -- + . - - - - -- -- + + - @@ -46021,62 +46022,62 @@ - - -- + . -. + . -. + - - \n --\n - - + + + - - -- -- + + - -- + - -- + . . -. + . -. + - - -- \n + - - -- + . - -. + - - - - -- -- + + - -- + - @@ -46084,19 +46085,19 @@ - - -- + . . -.\n -.\n +\n +- -- + . -. + . -. + @@ -46105,108 +46106,108 @@ - -- + - - -- \n + - - -- + - - - - -- -- + + - -- + . . -. -. + + . . -. + . -. + . -. + - - --\n --\n +\n + . -. + - - -- -- + + - - - -- + - . -. + . - - - -- + - \n --\n + - - -- + - - - - -- + . . -. + - - -- + - - --\n --\n - +\n + + . -. + @@ -46215,67 +46216,67 @@ . -. + - -- + - - - - - -- -- + \n +- + -- . - . -. + . . -. -. + \n + . - - -- - + \n + . - -. + + . + -. @@ -46284,54 +46285,53 @@ - - --\n --\n +\n + - -- + - - -- + . - -. -- + + - - -- -- + + - - --\n --\n +\n + - -- + - - - -- -- + + . - - -- -- + + . -. \n @@ -46347,14 +46347,14 @@ + - + . -. + . -. \n @@ -46366,24 +46366,25 @@ + - - -- + - - - - -- -- + \n + - - -- + - - @@ -46392,101 +46393,101 @@ - -- + - . - -. + . - -. + - - \n --\n - -- +- + . - -- + - . -. + . . -. + - -- + . + \n -.\n -\n +. + -. - - -- -- + + - - -- -- + + - -- + - -- \n + - - -- + - -- + - - -- -- + + . - -. -- + + - -- + - \n --\n + . -. + . - - - -- -- + + - @@ -46494,242 +46495,242 @@ - - - -- -- + + - - --\n --\n +\n + - -- + - -- + . . -. + - -- + - - - -- -- + + . -. -\n + \n + . -. + . -. + . -. + . . -. -. + + - - -- -- + + - - -- -- + \n +. + -. . . -. + - - -- -- + + . -. + - - -- -- + \n + - - -- + - - -- + - - -- -- + + - -- + . - - -- + - -- \n + - -- + - - -- -- + + - - - -- -- + + - -- + - -- \n + - - -- -- -- - + - + - - -- - + - -- -- - -- +- + + + - . . -.\n -.\n +\n + - -- + - - -- -- + + - . -. + . \n -.\n + - -- + - -- + - - - -- -- + + - - -- \n + - - -- + - -- + . . -. -. + + . + -. - - -- -- + + . \n -.\n +. + -. - @@ -46737,32 +46738,31 @@ - -- + - -- + - - - - -- -- + \n + - - - -- -- + + . -. @@ -46775,107 +46775,108 @@ + . . -. -. + + . . -. -. + \n + + - . -. + . -. + - - \n --\n + . . -. -. + + . . . . -. -. + \n + - -- + - . . -. -. + + - - -- -- + \n + . . . -. + - - - - -- + - - - - -- -- + \n + - - -- + - -- + - -- + @@ -46886,41 +46887,41 @@ - -- + - -- + - - - -- -- + \n + - - . - -. + - - - - -- -- + + . -. + - @@ -46928,146 +46929,146 @@ - - - --\n --\n +\n + - -- + . . -. + - - -- + . -. - + + . \n -.\n + - - - -- -- + + . -. + . . -. + . - - - --\n --\n +\n + - -- + . - -. -- + + . -. + . -. + . -. \n + . -. + - - -- + - -- + . -. + . . -. -- -- - -- -\n +- +\n + + + . -. + . -. + . . -. \n + - -- + @@ -47079,17 +47080,16 @@ . - -. + . - - -- + - - - - -- -- + @@ -47100,15 +47100,15 @@ + . - -- + . - -. + @@ -47120,6 +47120,7 @@ \n 47173 + - - @@ -47128,63 +47129,62 @@ - -- \n +- + -- - - - -- + - -- + - - - -- -- + \n . -. -. +. + + - . . -. -. + + - -- + - -- \n + - -- + - - -- -- + + . . -. -. - + + @@ -47192,42 +47192,43 @@ \n +- . . -. + . . -. + - -- + - - - -- -- + + - - -- -- + \n + - -- + - - -- -- + + @@ -47242,92 +47243,92 @@ - - -- -- + \n + - -- + . -. + . . -. -. + + - - -- -- + + - - -- -- -. -. + +. + \n + . -. + . -. + . -. - + + . -. + . . -. -. + + . \n -.\n . -. . -. +. + + - -- + - -- + - -- + . - -- + - -- + @@ -47335,7 +47336,7 @@ - \n --\n + - @@ -47343,87 +47344,87 @@ . . . -. -. + + - . . . -. -. + + - . . . -. -. + + - - - - -- -- + + - - - - --\n --\n +\n + - - -- -- + + - - -- -- + + . -. + - - -- + - . - -. -- + \n + - - -- + - - -- + - - -- -- + + - -- + - - -- -- + + . -. + . @@ -47431,93 +47432,93 @@ - - --\n --\n +\n + . - - -- -- + + - - -- -- + + - - - -- -- + + - - \n --\n + . -. + . - -. + + - -- - + + . -. + . -. - - + + \n + . . -. + - - . -. + . . -. + . - - - - -- -- + \n + - - @@ -47525,102 +47526,102 @@ - - - -- -- + + . -. + - - -- + . - - -- + - - -- + . - -. + - - -- -- + \n . -. -. - . -. + + . + -. +. + + . - -- + . -. + . -. + - -- \n + - - - -- -- -- -- +- + + + . -. + . -. \n + . -. + - - - -- -- + + - -- + @@ -47634,23 +47635,23 @@ - - - --\n --\n +\n + . . . -. -. + + - -- + . . -. + - - @@ -47659,201 +47660,201 @@ - -- \n -- - -- +- + + . -. + . -. - - + + + . -. + - -- + . -. \n + - -- + . . -. -. + + - - -- + - -- + - -- \n + . -. + - -- \n + . -. + - -- \n + - - -- + - -- + . -. + - -- + . \n -.\n +. + -. . -. + - -- \n + - - - - -- -- + + . -. + . - -- + - -- \n + - - -- -- + + - . - -. -- - - + + + + . -. - - + + + . \n -.\n + - - -- -- + + @@ -47869,7 +47870,7 @@ . -. + @@ -47877,7 +47878,7 @@ - \n --\n + @@ -47886,68 +47887,66 @@ - - - -- + - - - -- + - - - -- + - - -- + - -- + . - - --\n --\n +\n +- - -- + - - -- + - - - - -- -- + + . - -. + +- - + - -- - + - -- - + + - -- -- - + - -- - - - +\n - --\n --\n -- + - - - -- -- @@ -47955,163 +47954,165 @@ + + . -. + . - - -- -- -\n + + \n + - - -- -- + + - - -- -- + + - -- + . . -. -. + + . -. + . -. + . - - - --\n --\n +\n + - -- + . . . -. + - - - -- -- + + - -- + . \n -.\n + - -- + . . -. + - -- + - - -- + - \n --\n + - - - -- + - . -. + - -- + - - -- \n + - -- + - - - -- + - - -- + . - -. + - -- + - -- + - - -- + - - -- -- + \n + - - - -- -- + + . . -. + . + -. . -. + @@ -48122,32 +48123,31 @@ . . -. -. + + - - --\n --\n +\n + - - -- + - -- + . -. + - -- + - -- @@ -48158,19 +48158,19 @@ \n + - - - -- + - - - -- -- + + - - -- -- + @@ -48179,17 +48179,17 @@ \n + - - - -- -- + + . . . -. -. + @@ -48197,84 +48197,84 @@ \n + - -- + - - -- + - - -- + - - -- -- + \n + . - -- + - - -- + - - -- -- + \n + - -- + - -- + - - -- -- + + - - - -- -- + + - -- + - -- + - - --\n --\n +\n + - - - -- -- -. -. + +. + + . -. - + + . -. @@ -48282,83 +48282,84 @@ \n +- + -- - - -- + . - - -- + - - -- + . - -. -- + \n + - - -- + - - - -- -- + + - - -- + . -. + . - -- + - -- \n +. - -. -- + + - - -- + - - -- + . -. + . -. + - -- + - \n --\n + . @@ -48366,163 +48367,163 @@ - - -- -- + - -- - + - -- - + - -- -- - -- +- + + + - \n --\n + - - -- -- + + . -. + . . -. -. + + - -- + - -- + - - - \n --\n + - . - -. + . - -. + - - -- + - - - - -- -- + + . - -. + +- - - +\n - --\n --\n - -- -- + + - -- + - - -- + - -- + - -- + - -- + . -. + - -- + . \n -.\n - + + . . -. -. + + . . -. -. + + . . -. -. + + - - -- -- + + - - -- -- + + . . -. -. + \n +- + -- . -. + - - -- + - - -- + - @@ -48530,164 +48531,164 @@ - - -- + - - - -- + - - \n --\n + - - -- + - - - -- -- + + . - -. -- + + - - - -- + - - -- + - - - --\n --\n +\n + - - - -- -- + + - -- + - -- + . -. + - - \n --\n + - -- + . -. + - -- + . -. + - - -- -- + + . -. + - - \n --\n + . . -. - + + . - . -. \n -. -. +. + + - - -- -- + + . -. - + + . -. \n + . -. + . -. + . -. + - -- + - . @@ -48695,55 +48696,55 @@ . . . -.\n -.\n +\n + . - -- + - - -- -- + + . . -. -. + + - - - -- + . -. + . \n -.\n - -- -- - - +- + + + + - -- + - -- + . @@ -48755,99 +48756,98 @@ - \n --\n + . -. - - - + + + + . -. + . \n -.\n . -. +. + . . -. -. + + . -. + - -- \n + - - -- -- + + - . - - -- -- + + - - - -- -- + + - - - - - -- -- + + - - --\n --\n +\n + - - -- -- + + - - - -- + - - -- + - - - -- -- -- + - -- +- + @@ -48855,131 +48855,131 @@ \n + . -. + - - - -- + - - -- -- + + . . -. -. + + . -. - - - + + + \n + + + - - - + . -. - + + - - -- -- - - + + + + . -. + . . . -.\n -.\n +\n + . . . -. -. - + + + - - -- -- + \n + . . -. -. + \n + . . -. -. + \n +- -- \n \n -49019 . +49019 +. . -. \n + - -- + . - -- \n @@ -48987,77 +48987,77 @@ + - - -- \n + . . -. + . - -- + - - \n --\n + - -- \n + - -- + - - -- \n + . . -. + . - -- + - - -- \n + . -. + - -- \n @@ -49068,18 +49068,19 @@ + . -. + . -. + . -. + - \n --\n + @@ -49087,20 +49088,19 @@ - -- + - -- + - - - - -- -- + \n @@ -49108,16 +49108,17 @@ + - -- + . - -. + - - -- -- + + . @@ -49127,78 +49128,78 @@ - - -- -- + \n + - - -- + . . -. + . -. + . - -. + + . -. + . -. + . . -. -. + + - \n --\n +- . -. + . . -. -. + + - -- + - -- + - - -- + - - - --\n --\n +\n + - - -- -- + + @@ -49209,46 +49210,45 @@ - -- + - - -- + - . - -. + - - \n --\n - + + - -- - + + . -. - - + + + . . -. -. + @@ -49256,32 +49256,32 @@ + - \n --\n +- . -. + . -. + - -- + . . -. + - - -- \n @@ -49289,158 +49289,159 @@ + . . -. -. + + . -. + . -. + . . -. -. - + + \n + . . -. -. + + - - . -. + . -. + - -- \n +- + -- - . -. + - - -- -- -- -- + +- + + - \n --\n - + + . -. - + + . - - -- -- + + - - . -. \n + . . -. -. -- - -- + - -- -- - -\n --\n - - +- +- +\n + + + + + + + . . -.\n -.\n +\n + @@ -49450,75 +49451,75 @@ . -. + . . -. -. + + - -- + - \n --\n +- + -- - -- + . -. + - -- + - - - --\n --\n +\n + . . -. -. -. + +. + - -- + . -. - + + . -. \n + - @@ -49526,59 +49527,59 @@ . -. + . . -. -. + + - -- + . . -. + - - -- \n + - + . -. - + + . -. + - - - -- -- - + + + . \n -.\n - + + - @@ -49586,29 +49587,29 @@ . -. + . . -. -. + + - \n --\n + . . -. + - - -- + - -- + - @@ -49616,59 +49617,59 @@ . . . -. -. + \n + . . . . -. -. + + . -. -. -. +. + + . . -. -. + + . . -.\n -.\n - - +\n + + + - -- + - -- + @@ -49677,185 +49678,185 @@ - - -- -- + \n + - -- + - - - - - -- + . -. + . -. + - -- + . \n -.\n + - -- + - -- + - - . -. + . . -. + . - -.\n --\n +\n + - -- + - - -- -- + + - - - -- -- + + - -- + . -. + . . -. -. + + \n -\n - + + . -. - - - - + + + + + . . . -. -. + + - -- + . . -. -. + + - -- \n + . - - -- -- + + . -. + . - -. -- + + . - - -- + - -- + - - - - - -- + - \n --\n + - -- + - -- + - -- + - . @@ -49865,147 +49866,147 @@ - - - -- -- + + - -- + - - --\n --\n - +\n + + . -. - - - + + + + . + -. - + - - -- -- + + - - - -- -- - + + + . \n -.\n - + + . -. + . . -. -. - + + + . -. + . \n -.\n - - - - + + + + + - -- + . . -.\n -.\n +\n + . . -. -. + + - -- + . -. + - - -- + - \n --\n + . -. + - -- + - -- + @@ -50013,25 +50014,25 @@ - - -- + - \n --\n + - - -- + - -- + - -- + - . @@ -50039,29 +50040,29 @@ - - - -- -- + + - -- + . . -.\n -.\n - - +\n + + + . -. + @@ -50073,38 +50074,38 @@ - -- + . . -. -. + + - - -- + - -- \n + - -- + - - -- + - -- + @@ -50114,33 +50115,33 @@ - \n --\n + . . -. -. + + - . . -. -. + + - \n --\n +- - - -- + @@ -50150,64 +50151,64 @@ - - - -- + - \n --\n + - -- + - - - -- + - - - -- -- + + - - -- + - -- + . . -. -. + + \n -\n + . . -. -. + + . -. + - -- + - @@ -50216,235 +50217,235 @@ - - -- -- + + - \n --\n + - - - - -- -- + + - - - -- + - -- + - -- + - - --\n --\n +\n + . -. - - + + + . . -. -. + + - - - -- + - - -- + - - - - --\n --\n +\n + - -- + - - -- + . -. + . -. + - \n --\n + . -. + - . - -- + . . -. + . -. + - - -- + - \n --\n + - - -- + - - -- -- + + - - - -- -- + + - - -- -- + \n + . -. + - - -- -- + + - -- \n +. -. + . - . -- -. -. -. +. + + + - - -- + - - - - -- + +- - - +\n - --\n --\n - - -- + - - - -- + - - - - --\n --\n +\n + - - -- + - - - -- + - - - - -- -- + + +- - - +\n - --\n --\n -- + - -- + - @@ -50452,60 +50453,59 @@ - - -- + - \n --\n - - - -- -- - -- + +- + + - - - - --\n --\n +\n + - - - -- + - - . - -.\n --\n +\n +- - - -- + - - - -- + - . - -. + - \n --\n + . -. @@ -50518,24 +50518,24 @@ \n + - - - -- -- + \n + - - - -- -- + @@ -50544,18 +50544,18 @@ \n - -- -- +- + \n +- - - -- -- + @@ -50565,12 +50565,12 @@ \n . -. -. +. + + . . -. -. + @@ -50582,9 +50582,9 @@ \n + . -. @@ -50597,13 +50597,13 @@ \n + . . . -. @@ -50611,43 +50611,44 @@ \n + . . -. -. + + . . . -. -. + + . . . -. + . \n -.\n . -. -. +. + + . -. + - - - -- + - \n --\n + @@ -50657,32 +50658,32 @@ - -- + . - -. + - - -- + - \n --\n + . . -. + . . -. + . . -. + . . -. + . . -.\n -.\n +\n + @@ -50690,57 +50691,57 @@ . . . -. + . . -. -. + + . . -. + . . . -.\n -.\n +\n + . . -. + . . -. -. + + . . . -. + . \n -.\n + . . . -. + . -. \n . -. +. + . . \n -.\n + @@ -50750,8 +50751,7 @@ . . -. -. + \n @@ -50765,10 +50765,10 @@ + - - -- -- + @@ -50779,21 +50779,21 @@ \n . -. -. - +. + + \n + - - + @@ -50805,21 +50805,21 @@ \n + - - -- + - -- \n - -- - -- +- + @@ -50827,12 +50827,12 @@ - - - -- +- + - - - -- -- + @@ -50842,178 +50842,179 @@ - - - -- +- + - - - - - - -- -- + \n \n + - - -- -- + + . - -. -- + \n + . - -. -- + + - -- + . - -. -- + \n + - - -- + - - -- -- + \n + . -. + . - -- + . . - -- + - - -- -- + \n + - - -- + - - -- + . . -. -. + + . - -- \n + - -- + . . -. + . . -. + . . -. + . . -. + . . . . -. + . . -. -. + \n + - - -- + . - -- + . -. + - -- + . - -. -- + \n + - - -- + - -- + - -- + . - -- + - -- + - -- \n + - -- + . - -- + @@ -51021,148 +51022,147 @@ - - -- -- + \n + - - -- + - - -- + - - -- -- + + . - -. + . - -. -- + \n + . - -. -- + + - - -- -- + + - - -- + . . -. -. + \n + - -- + . - -. -- + + - - -- -- + \n + . -. + . - - -- -- + + . -. + - -- \n + . - -. -- + + - - - -- -- + \n + - - -- + - . - -. -- + + - . - -. + . - -. -- + \n + - \n --\n + - \n --\n + - \n --\n \n @@ -51174,10 +51174,10 @@ \n + . - -. -- + \n @@ -51187,69 +51187,70 @@ \n + . . -. -. -- - -- + +- + + \n + . -. + . -. + - -- + . \n -.\n + . -. + - -- + - - -- -- + + . -. \n + . - -. + - - - - - -- + - - \n --\n + - - -- + - - @@ -51258,37 +51259,37 @@ - - -- + - -- + + - -+ -- + + - \n --\n +- -- + - -- + - - -- + - - - - -- + - \n --\n + @@ -51296,124 +51297,123 @@ - -- + - - - --\n --\n +\n + . -. + . - -. + - - - -- + - \n --\n + - - -- + - . . -. -- -- - -- +- + + + . \n -.\n - - + + + . -. + . -. - - + + + . . -. -. - + + \n + - -- + . . . -. -. + -- - -- +- + + . . . . -.\n -.\n +\n + . - - -- + . . - - -- -- + + - -- @@ -51422,62 +51422,62 @@ + - + . -. - - - + + + + . -. + - - --\n --\n +\n + - -- + . . . -. -. + + . . . . -. -. + + \n -\n +. - - -- -- + + - -- @@ -51486,160 +51486,161 @@ \n + - -- + - - -- \n + - - - -- -- + \n - - -- -- +- + + - - -- -- + \n + - . . . -. + . - -. -- + \n + - - - -- -- + \n + - - - -- -- + + - - -- -- + \n + - -- + - - - - -- + - - - -- -- + \n + - - - - -- -- + + - - - - -- -- + \n + . -. + - - - -- -- - + + \n + - - - - - -- -- + \n + - -- + - - -- + - - -- \n +- -- + - - - -- \n +- - @@ -51647,60 +51648,60 @@ - -- \n +- -- + - - - -- \n - -- - -- - + + - - -- -- +- + \n +- - -- + - - -- -- + \n + - - -- + - - -- + - \n --\n - -- +- + - - - - --\n --\n +\n +. . -. -. + + @@ -51709,36 +51710,35 @@ - -- \n + - -- + - - -- -- + \n + - - -- -- + + . - -. + - -- \n @@ -51747,93 +51747,93 @@ \n - + \n - -- -- +- + \n - -- +- + . - - -- -- + \n +. - - -- -- + \n + - - -- -- + + - - -- -- + \n + - - -- + - - - -- -- + \n - -- +- + - - - -- -- + \n + - - -- -- + \n \n 51875 + . - -. + - - - -- -- + + . -. + . -. @@ -51845,36 +51845,36 @@ + . . - -. -- + \n + - -- + . -. + - - -- + - . -. + - -- @@ -51884,173 +51884,173 @@ + - -- + - - - -- -- + \n + - . . -. + . -. \n + - -- + - - - -- + - -- + - -- + . -. \n + . - -. + - - - -- -- + + - -- + . . . -. -. + + . - . - -.\n --\n +\n +- + -- . -. + - - -- + . . -. + . \n -.\n . -. +. + . - - -- + - -- + - - - -- -- + + - - -- + - -- + . -. \n + . . -. -. + + . -. + . . . -. -. + + . . -. -. + + . - . -. \n @@ -52058,226 +52058,226 @@ + - - - -- -- + + . . . -. -. + + - -- + - -- \n + . - -. -- + + . -. + . - -. + - - - -- -- + + \n -\n + . -. + . -. + - - -- + . . -. + . -. + - -- \n + - - -- + - - -- + . -. + - - -- + - - - -- -- + + . . -. + . - - -- + . . -. -. + \n + - -- + - - -- + - - -- -- + + . . -. + . . -. + - -- + - - -- -- + \n + - - - - -- -- + + . . -. -. + + . . -. -. + + . - - -- + - -- + . \n -.\n + . . -. -. + + - - -- -- + + - -- + - - -- + . . . -. -. + + - - -- -- + \n + - -- + . . -. + . - . . -. + - -- @@ -52287,17 +52287,17 @@ \n + - -- + . . -. + - -- @@ -52308,18 +52308,19 @@ \n + . . -. + - - - -- -- + + - - -- -- + + @@ -52330,34 +52331,33 @@ - - - --\n --\n +\n + . - -. + - - -- + - -- \n + . - -. + . . -. @@ -52375,16 +52375,16 @@ 52432 \n +. - -. -- + \n + . -. @@ -52393,25 +52393,25 @@ + - . - -. -- + \n + . - -. + . - -. + - -- @@ -52419,37 +52419,38 @@ \n + . -. + - -- + - \n --\n +. -. + - - - -- -- -- -- +- + + + - - -- + - - @@ -52457,50 +52458,50 @@ - - - --\n --\n +\n +- - - -- + - - - -- + - - - - --\n --\n +\n + - - -- + - - - -- + - - - - -- -- + + +- - - +\n - --\n --\n -- + - -- + - @@ -52508,61 +52509,60 @@ - - -- + - \n --\n - - - -- -- - -- + +- + + - - -- + - - -- -- + + . - -. + - - . - -.\n --\n +\n +- - - -- + - - - - -- + - . - -. + - \n --\n -52620 - +52620 +- - -- -- + @@ -52581,12 +52581,12 @@ - - - -- +- + - - - -- -- + @@ -52605,11 +52605,11 @@ \n . -. -. +. + + - -- @@ -52624,13 +52624,13 @@ \n +- . -. + - -- @@ -52642,46 +52642,46 @@ \n + . -. + . . -. + - -- \n + - - -- -- + + - - - -- -- + \n +- -- + - - - -- -- + @@ -52689,13 +52689,13 @@ \n + - - - -- + - -- @@ -52725,8 +52725,9 @@ + \n -\n + @@ -52749,7 +52750,6 @@ - -- \n diff --git a/tf/0.3/atf.tf b/tf/0.3/atf.tf index df99da1..cf8f0c9 100644 --- a/tf/0.3/atf.tf +++ b/tf/0.3/atf.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z DU₃ DU₃ diff --git a/tf/0.3/atfpost.tf b/tf/0.3/atfpost.tf index 4f2b649..4381dac 100644 --- a/tf/0.3/atfpost.tf +++ b/tf/0.3/atfpost.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 4 ] 12 ] @@ -16,22 +16,25 @@ 57 > 77 ] 107 ] +111 } 132 ] 153 ] +155 } 172 ] 182 ] 214 ] 247 ] 250 ] 257 ] -] -262 ] +}] +262 }] 266 ] 281 ] 286 ] 293 ] 298 ] -306 ] +305 } +] 322 ] 338 ] 343 ] @@ -52,24 +55,29 @@ 575 ] 606 ] 632 ] +634 } 646 ] 667 ] 673 ] 680 ] 689 ] 705 ] -712 ] +707 } +712 ]} 724 ] 740 ] 750 ] +755 } 766 ] 771 ] +} 781 ] 785 ] 801 ] 805 ] +807 / 822 ] -826 ] +826 ]} 835 ] 837 ] 853 ] @@ -80,6 +88,8 @@ 898 ] 907 ] 913 ] +917 / +920 } 923 ] 934 ] 940 ] @@ -96,17 +106,24 @@ 1022 ] 1039 ] 1055 ] +1061 } 1073 ] 1093 ] +1096 } 1112 ] 1133 ] -1153 ] +1139 } +1153 ]} 1159 ] 1171 ] +1175 } +1180 } 1183 ] 1192 ] 1200 ] 1211 ] +} +1216 } 1223 ] 1230 ] 1234 ] @@ -116,7 +133,7 @@ 1276 ] 1281 ] 1293 ] -1295 ] +1295 }] 1307 ] 1309 ] 1316 ] @@ -125,6 +142,7 @@ 1342 ] 1362 ] 1364 ] +} 1369 ] ] 1372 ) @@ -134,17 +152,21 @@ 1388 ] 1398 ] ] +1401 } 1413 ] 1415 ] 1429 ] 1431 ] +1437 } 1441 ] ] 1449 ] ] 1464 ] ] -1474 ] +1467 } +1473 } +] 1476 ] 1485 ] 1487 ] @@ -153,26 +175,35 @@ 1498 ] 1500 ] ] +} 1506 ] +1508 } 1511 ] +1513 } 1517 ] 1524 ] 1528 ] 1535 ] +1537 } 1539 ] 1543 ] 1547 ] ] 1552 ] 1555 ] -1562 ] -1575 ] +1561 } +] +1574 } +] +1577 } 1581 ] +1588 } 1592 ] 1598 ] +1601 } 1605 ] 1612 ] -1615 ] +1615 )] ] 1618 ] 1620 ] @@ -180,13 +211,14 @@ 1632 ] 1643 ] ] +} 1654 ] ] 1662 ] 1664 ] 1671 ] 1674 ] -1678 ] +1678 }] 1683 ] 1686 ] 1690 ] @@ -194,29 +226,45 @@ 1700 ] 1722 ] 1724 ] +1735 } 1753 ] 1757 ] -1784 ] +1784 )] 1788 ] +1800 } 1813 ] -1829 )} -1835 ] +1824 } +1828 } +)} +1831 } +1833 } +1835 ]} 1863 ] 1886 ] +1891 } +} +1902 } 1907 ] +1909 } 1931 ] +1938 } 1949 ] +} +1958 } 1966 ] 1968 ] 1992 ] 1995 ] 2009 ] -2013 ] +2013 )] 2027 ] 2031 ) ] 2045 ] 2050 ] +2055 } +2058 } +2060 } 2066 ] 2070 ] 2090 ] @@ -226,17 +274,24 @@ 2128 ] 2131 ] 2142 ] -2145 ] +2145 ]} 2155 ] 2159 ] 2173 ] -] +]} +2180 } +} 2188 ] -2191 ] +2191 ]} +2197 } 2212 ] 2215 ] -2233 ] +2223 } +2225 } +2232 } +] 2235 ] +} 2249 ] 2253 ] 2268 ] @@ -250,12 +305,16 @@ 2312 ] 2314 ] 2317 ] +2327 } 2332 ] +2336 } 2338 ] 2361 ] 2387 ] 2414 ] 2435 ] +} +2459 } 2462 ] 2483 ] 2485 ] @@ -269,25 +328,35 @@ 2545 ] 2555 ] 2565 ] +2577 } 2580 ] 2588 ] 2597 ] 2620 ] +2623 } +2625 } 2628 ] +2635 } 2643 ] 2645 ] 2651 ] 2660 ] 2662 ] 2668 ] +2671 } +2683 } 2687 ] +2690 } 2692 ] +} 2700 ] 2705 ] 2733 ] -2759 ] +} +2759 )] 2769 )} ] +2776 } 2780 ] 2804 ] 2828 ) @@ -295,7 +364,9 @@ 2849 ] 2868 ) ] +2876 } 2891 ] +2903 } 2908 ) ] 2919 ] @@ -303,75 +374,112 @@ 2940 ] 2949 ] 2953 ] +2962 } 2967 ] 2981 ] +2991 } 2999 ) +} 3002 ] 3013 ] 3019 ] 3033 ] 3045 ] 3058 ] +3063 } 3070 ] -3083 ] +3082 } +] +3089 } 3096 ] +3098 } 3109 ] 3120 ] 3150 ] 3180 ] 3198 ] +} +3203 } +3208 } 3212 ] 3222 )} 3229 ] 3245 ] 3256 ] 3262 ] +3269 } 3274 ] +3279 } 3287 ] 3295 ] 3310 ] +} 3316 ] +3328 } 3334 ] 3349 ] -3374 ) +3374 }) ] +3379 } +3382 } +3387 } +3394 } 3397 ] +} +3403 } 3410 ] +3420 } 3423 ] ] 3432 ] 3443 ] 3445 ] +3454 } 3457 ] +3460 } 3468 ] 3471 ] +3479 } 3482 ] +3488 } 3493 ] 3499 ] 3516 ] 3518 ] +3537 } 3541 ] 3545 ] +3554 } 3566 ] +} 3569 ] 3582 ] +3594 } 3600 ] ] 3611 ] +} +3619 } 3623 ] -3628 ] -3643 ] +3628 }] +3642 } +] +3663 } 3671 ] +3678 } +3684 } 3691 ] +} 3710 ] 3719 ] 3724 ] 3731 ] 3733 ] -3736 ] +3736 ]} 3739 ] ] -3745 ] +3745 )] +3749 } 3753 ] 3760 ] 3764 ] @@ -380,44 +488,61 @@ 3795 ] 3797 ] 3799 ] +3810 } +3812 } 3815 ] 3832 ] +3849 } 3852 ] 3855 ] +3866 } 3879 ] +3881 } 3891 ) ] 3896 ] 3906 ] -3924 ] +3917 } +3924 }] +3928 } 3933 ] 3952 ] 3961 ] +3963 } 3981 ] 3991 ] +3996 } +3999 } 4003 ] 4021 ] 4024 ] 4029 ] 4037 ] -4045 ] +4045 ]} 4055 ] 4072 ] 4088 ] 4096 ] +} 4109 ] +4113 } 4116 ] 4124 ] 4137 ] 4154 ] +4164 } 4173 ] +4175 } +4182 } 4188 ] 4196 ] +4199 } 4209 ] 4216 ] 4218 ] 4225 ] 4228 ] +4232 } 4236 ] ] 4243 ] @@ -445,14 +570,19 @@ 4356 ] 4360 ] 4363 ] +} 4372 ] 4378 ] 4388 ] 4398 ] 4414 ] +4418 } +4423 } +4426 } 4432 ] 4448 ] -4462 ] +4461 } +] 4470 ] 4480 ] 4488 ] @@ -460,8 +590,11 @@ 4504 ] 4509 ] 4520 ] +4524 } +4527 } 4531 ] 4545 ] +4548 } 4556 ] ] 4566 ] @@ -481,48 +614,137 @@ 4627 ] ] 4636 ] +4639 } +4650 } +4652 } +4655 } 4668 ] 4672 ] 4675 ] 4683 ] 4705 ] 4721 ] +4727 } +4731 } 4747 ] 4755 ° 4778 > +4782 } +4788 } +4791 } +4794 } +4797 } +4800 } +4803 } +4844 } +4871 } +4879 } 4902 )} +4924 } +4943 } +5005 } 5080 > +5121 } +5126 } +5129 } +5132 } +5135 } +5138 } +5142 } 5152 ] +5166 } 5169 ] +5173 } 5186 ] 5198 ] 5208 ] +} +5213 } 5225 ] 5236 ] 5260 ] +} +5264 } +5266 } +5270 } +5274 } +5278 } +5289 } 5312 ] 5338 ] +5356 / +5363 / +5368 } +5384 } +5396 } +5412 / +5470 } +5477 } 5505 ] 5529 ] 5532 ] 5552 ] +5556 } 5558 ] -5568 ] +5564 } +5567 } +] +5571 } 5575 ] +} 5578 ] +} 5595 ] +5597 } 5599 ] +5601 / +5607 / +5610 } +5613 / +5616 } +5618 / 5620 ] -5628 ] +} +5624 / +5628 }] +/ 5631 ] +5634 / +5640 / +5646 / +5652 } +5654 / +5657 } +5660 / +5663 } 5665 ] +/ 5668 ] +5671 } +/ +5675 } +5682 } +5690 / +5695 / 5697 ] +5701 / +5707 / 5723 ] +5726 } 5755 ] +5763 } 5784 ] +5786 } +5790 } 5810 ] +5813 } +5817 } +5820 } +5823 } +5873 } +5933 } 5940 ] +5944 } 5960 ] 5971 ] 5986 ] @@ -533,41 +755,119 @@ 6001 ] 6003 ] 6010 ] +6013 } 6021 ] 6027 >> -6169 ] +6039 } +6055 } +6063 } +6068 } +6073 } +6078 } +6082 } +6087 } +6091 } +6108 / +6114 / +6122 / +6156 } +6158 } +6169 ]} +6171 } +6198 } +6209 } +6219 } +6231 } +6234 } 6237 ] 6256 ] +6264 } 6274 ] +6280 } +6283 } +6286 } +6290 } 6297 ] 6320 ] 6341 ] +} +6348 } +6350 } +6409 } +6413 } +6419 } +6421 } +6423 } 6475 ] 6494 ] 6497 ] 6522 ] 6542 ] 6567 ] +} +6584 } +6592 } 6594 ] 6644 ] 6665 ] +6677 } +6680 } +6683 } +6688 } 6690 ] +6695 } +6699 } 6714 ] -6733 )} +6722 } +6727 } +6732 } +)} +6735 } 6742 ] +6754 } +6757 } +6760 } +6764 } 6766 )} +} 6791 ] +} +6803 } +6805 } 6810 ] 6815 )} 6832 ] +6840 } +6844 } +6847 } +6851 } +6855 } +6861 } +6864 } +6867 } +6870 } +6873 } +6877 } +6901 } +6903 } +6920 } +6924 } +6928 } +6931 } +6934 } +6937 } +6941 } 6943 ] 6954 ] +6961 } 6963 ] +} 6969 ] 6977 ] 6984 ] 6999 ] 7003 ] +7007 } 7017 ] 7023 ] 7025 ] @@ -576,32 +876,41 @@ 7057 ] 7079 ] 7101 ] +} 7126 ] 7146 ] 7163 ] +7177 } 7179 ] +7182 } 7184 ] 7194 ] 7203 ] 7212 ] 7216 ] 7220 ] -7225 ] +7225 ]} 7229 ] 7236 ] 7246 ] 7253 ] 7264 ] +7266 } 7284 ] +7288 } +7299 } 7302 ] 7328 ] 7333 >> 7360 ] 7380 ] +7386 } 7388 ] +7392 } 7394 ] 7408 ] 7418 ] +7423 } 7429 ] 7441 ] 7449 ] @@ -609,14 +918,18 @@ 7467 ] 7474 ] 7477 ] +7480 } 7499 ] 7504 ] 7520 ] +7523 } 7525 ] -7534 ] +7533 } +] 7550 ] 7556 ] 7582 ] +7585 } 7587 ] 7604 ] 7608 ] @@ -627,26 +940,45 @@ 7643 ] 7649 ] 7656 ] +7658 } 7662 ] +7665 } 7672 ] 7675 ] 7683 ] 7691 ] 7697 ] 7705 ] +7708 } 7715 ] +7723 } +7727 } 7731 ] +7733 } +7741 } 7752 ] +7777 } 7780 ] +7786 } +7888 } +7892 } +7896 } +7901 } +} 7910 ] 7924 ] 7928 ] -7947 ] +7946 } +] +7955 } 7964 ] 7970 ] 7980 ] +7989 } 7996 ] 8004 ] +} +8014 } 8018 ] 8027 ] 8035 ] @@ -655,25 +987,39 @@ 8069 ] 8073 ] 8079 )} +8083 } +8089 } 8114 ] 8137 ] 8155 ] +8162 } +8167 } 8169 ] 8187 ] 8191 ] 8193 ] 8197 ] ] +8203 } 8213 ] 8227 ] 8242 ] +8246 } +8358 } +8366 } +8424 } +8435 } +8445 } 8505 ] 8525 ] 8528 ] 8552 ] 8563 ] +8570 } 8579 ] +8583 } 8586 ] +} 8594 ] 8606 ] 8614 ] @@ -684,16 +1030,28 @@ 8663 ] 8674 ] 8684 ] +} 8697 ] 8707 ] -8729 ] +8714 } +8729 ]} +8740 } +8752 } +8755 } +8760 } +8770 } 8961 ] 8979 ] 9001 ] 9014 ] 9033 ] 9054 ] +9060 } +9064 } +9069 } +9073 } 9076 ] +} 9085 ] 9093 > 9102 ] @@ -711,23 +1069,42 @@ 9226 ] 9234 ] 9252 ] +9256 } +9259 } +9261 } +9263 } 9267 ] 9277 ] 9290 ] -9304 ] +9300 } +9303 } +] +9306 } 9313 ] 9321 ] -9327 ] +9326 } +] +9330 } 9336 ] 9339 ] +} 9349 ] 9353 ] +9361 } 9372 ] 9414 > -9542 ] +9417 } +9428 } +9430 } +9432 } +9502 } +9506 } +9542 }] 9566 ] 9568 ] 9587 ] +} +9593 } 9607 ] 9609 ] 9633 ] @@ -735,33 +1112,60 @@ 9652 ] 9656 ] 9665 ] -9671 ] -9674 ] +9671 ]} +9673 } +] +9719 / +9729 } +9740 / +9748 } +9760 / +9766 / +9776 } +9793 } +9804 } 9823 ] +/ +9830 / 9846 ] +9850 } 9861 ] 9886 ] 9906 ] 9921 ] 9928 ] +9932 } 9939 ] +/ 9945 ] +9951 } 9954 ] 9962 ] 9969 ] 9978 ] 9985 ] +} +9990 / 9996 ] -10002 ] +10002 }] 10013 ] 10022 ] +10028 } 10032 ] 10044 ] 10046 ] 10056 ] 10073 ] +10078 } +/ 10082 ] -10097 ] +/ +10089 } +/ +10096 } +] +/ +10106 } 10108 ] ] 10113 ] @@ -769,10 +1173,20 @@ 10116 ] 10118 ] 10130 ] +10133 / +10137 } +10141 } 10147 ] +10150 } 10166 ] +10171 / +10174 } +10176 / +10180 } +10182 } 10190 ] 10205 ] +10208 / 10210 ] 10217 ] 10220 ] @@ -784,6 +1198,7 @@ 10234 ] 10240 ] 10242 ] +10249 } 10257 ] 10260 ] 10270 ] @@ -793,66 +1208,134 @@ 10301 ] 10303 ] 10320 ] +10324 } 10341 ] 10363 ] +10377 } 10380 ] +10387 } +10399 } 10401 ] -10422 ] -10435 ] +10408 } +10422 ]} +10428 / +10432 } +10435 ]} +10443 } 10449 ] +10488 } 10505 ] +10514 } +10519 } 10530 ] +10542 } +10544 } +10547 } 10552 ] 10572 ] +10576 / +10582 / 10587 ] +10598 / 10604 ] 10621 ] +10623 / 10635 ] -10643 ] -10665 ] +10643 }] +10665 }] +10677 } 10688 ] +10702 } +10705 } +10707 } +10711 } +10716 } +10719 } +10727 } +10733 } +10736 } 10748 ] 10778 ] +10783 } +10790 } 10805 ] +10807 } +10826 } 10833 ] 10861 ] 10885 ] +10890 } 10900 ] +10916 / 10926 ] +} +10942 / +10948 / +10971 / +10975 } 10984 ] +/ +10988 } +10998 / +11001 } 11005 ] +11014 / +11017 } 11021 ] +11030 } 11036 ] 11044 ] 11051 ] -11058 ] +11053 } +11055 } +11058 ]} 11067 ] 11074 ] 11081 ] 11085 ] 11093 ] +} +11096 } 11101 ] +11106 } 11121 ] +11124 / 11128 ] +11130 / +11134 } +11136 / +11139 } +11141 / 11145 ] +/ +11149 } +11152 / +11155 } 11158 ] 11162 ] 11166 ] 11169 ] 11176 ] +11182 } 11187 ] 11192 ] +11203 } +11206 } 11208 ] 11214 ] +11217 } 11227 ] 11234 ] 11243 ] -11246 ] -11251 ] +11246 }] +11249 } +11251 ]} +11253 } 11266 ] 11275 ] 11288 ] 11297 ] +11299 } 11306 ] 11316 ] 11325 ] @@ -875,173 +1358,335 @@ 11446 ] 11448 ] ] -11452 ] +11452 )] +11454 } 11456 ] 11458 ] 11460 ] 11466 ] 11473 ] +} 11482 ] +11486 } 11488 ] 11499 ] 11508 ] 11522 ] +11526 / 11533 ] 11538 ] +11542 / 11546 ] 11551 ] +11555 / 11559 ] +11564 } 11570 ] -11575 ] +11574 } +] +11579 } 11583 ] 11587 ] 11595 ] 11600 ] +11603 } 11608 ] 11612 ] +11616 } 11622 ] 11626 ] +11630 } 11636 ] 11640 ] 11651 ] 11662 ] +11668 } +11671 / +11674 } 11676 ] +/ 11685 ] +11690 } 11708 ] +11715 } 11726 ] +11731 } +11750 } 11752 ] +11763 } 11775 ] +} +11787 } 11795 ] +11809 } 11818 )} 11824 ] +11834 } 11844 ] 11849 ] 11852 )} +11864 } 11873 ] 11880 ] +11889 } 11900 ] +11912 } +11923 } +11928 } 11936 ] +11945 } 11953 ] -11968 ] +11959 } +11967 } +] +11973 } +11979 } +11986 } 11988 ] +11996 } 12003 ] +} +12012 } 12020 ] +12022 } 12025 ] +12029 } 12037 ] -12053 ] +12045 } +12053 ]} +12059 } 12068 ] +12074 } 12081 ] -12100 ] +12089 } +12100 ]} +12118 } 12127 ] +12133 } 12140 ] +12144 } 12149 ] 12164 ] 12183 ] +12185 } +12191 } +12197 } +12202 } +12209 } 12212 ] +12259 / +12267 } 12277 ] +12284 } 12302 ] -12336 ] +} +12306 } +12309 } +12313 } +12320 } +12336 ]} +12339 } +12342 } 12365 ] +12383 } 12391 ] +12399 } 12421 ] +12426 } +12429 } 12443 ] -12449 ] +12449 ]} +12452 } +12455 } 12466 ] +12470 } 12483 ] 12505 ] +12512 } 12514 ] +} 12544 ] +12552 } +12555 } +12559 } +12563 } 12569 ] +} 12587 ] 12609 ] -12630 ] -12652 ] +12619 } +12623 } +12625 } +12628 } +12630 ]} +12633 } +12636 } +12638 } +12643 } +12648 } +12652 ]} +12655 } +12659 } +12671 } 12681 ] 12704 ] 12721 ] 12726 ] +12739 } 12769 ] 12798 ] 12818 ] 12825 ] 12843 ] 12848 ] +12851 } +12858 } +12862 } 12871 ] 12893 ] 12900 ] 12915 ] +12918 } +12928 } +12932 } 12948 ] 12962 ] 12989 ] 13012 ] -13079 ] +13033 } +13056 } +13070 } +13074 } +13076 } +13079 ]} +13090 } +13093 } +13099 } +} +13103 } 13106 ] 13133 ] +13197 } +13201 } +13205 } +13217 } 13243 ] 13270 ] 13297 ] 13323 ] +13337 } 13348 ] 13371 ] -13398 ] +13374 } +13398 ]} +13409 } 13423 ] +13491 } +13494 } +13497 } +13510 } +13514 } 13518 ] 13555 ] 13575 ] 13600 ] 13619 ] -13642 ] +13641 } +] 13667 ] 13688 ] +13702 } 13704 ] -13724 ] -13744 ] +13719 } +13723 } +] +13726 } +13729 } +13734 } +13737 } +13739 } +13744 ]} +13755 } 13764 ] 13781 ] -13788 ] -13802 ] +13784 } +13787 } +] +} +13794 } +13802 ]} +13805 } +13808 } 13810 ] +13812 } 13823 ] -13839 ] +13838 } +] 13853 ] +13856 } +13858 } 13872 ] +13875 } +13886 } 13894 ] +13899 } 13901 ] 13925 ] 13928 ] 13935 ] 13938 ] +13940 } +13944 } +13946 } 13951 ] 13955 ] 13959 ] +13963 } 13976 ] +13979 } +13984 } +13988 } 13991 >> 13996 ] +14004 } 14023 ] +14025 } +14028 } +14030 } +14033 } 14036 ] +} 14042 ] 14052 ] 14061 ] -14078 ] +14078 ]} 14085 ] 14091 ] -14100 ] +14099 } +] 14107 ] 14117 ] 14125 ] 14134 ] 14148 ] 14161 ] -14168 ] +14168 ]} +14171 } +14173 } 14176 ] -14181 ] +} +14180 } +] 14188 ] -14192 ] +14191 } +] 14199 ] +14208 } 14211 ] 14222 ] 14235 ] 14244 ] +14247 } 14253 ] 14255 ] 14257 ] @@ -1049,67 +1694,114 @@ ] ] 14263 ] +14266 } 14269 ] 14273 ] +14275 } +14278 } 14281 ] 14284 ] 14290 ] 14294 ] +14300 } 14305 ] +14315 } +14326 } +14328 } +14331 } 14370 ] 14394 ] +14403 } +14407 } 14446 ] 14454 ] -14456 ] +} +] +14458 } 14461 ] 14464 ] -14473 ] +} +14468 } +14472 } +] 14476 ] +} 14482 ] 14484 ] 14499 ] 14516 ] 14533 ] +} +14536 } +14540 } +14543 } +14547 } 14550 ] 14571 ] +} +14574 } 14580 ] 14589 > 14596 ] 14615 ] ] +14620 } +14623 } +14626 } 14629 ] 14632 ] 14641 ] 14645 ] 14668 ] 14672 ] -14687 ] +} +14685 } +14687 ]} 14699 ] 14703 ] +14720 } 14728 ] ] 14752 ] 14755 ] +} 14766 ] 14789 ] +14795 } +14798 } +14802 } 14809 ] ] +14833 } 14835 ] -] +}] +14839 } +14842 } +14845 } +14849 } 14858 ] ] -14878 ] +14868 } +14870 } +14877 } +] 14883 ] ] +14886 } 14902 ] 14908 ] -14910 ] +} +] 14928 ] +14932 } 14938 ] -14951 ] +14950 } +] 14958 ] 14976 ] 14993 ] +14997 } +15004 } 15006 ] 15013 ] 15037 ] @@ -1122,10 +1814,12 @@ 15096 ] 15099 ] 15105 ] +} 15113 ] 15120 ] 15131 ] 15140 ] +15144 } 15149 ] 15153 ] 15156 ] @@ -1133,40 +1827,87 @@ 15165 ] ] 15170 ] +15181 } +15185 } 15188 ] +15191 } +15196 } +15202 } 15209 ] 15233 ] +15251 } +} +15255 } +15258 } 15268 ] 15291 ] -15298 ] -15314 ] -15320 ] +15298 }] +15300 } +15303 } +15308 } +15311 } +15313 } +] +15316 } +15320 ]} +15323 } +15325 } +15328 } 15335 ] 15348 ] 15362 ] -15370 ] +15369 } +] +} 15380 ] +15382 } +15384 } +15386 } 15402 ] 15420 ] -15439 ] +15428 } +15431 } +15438 } +] +15450 } 15455 ] +15464 } +15467 } 15472 ] -15481 ] -15491 ] +} +15481 }] +15491 )] 15498 ] +15501 } +15504 } 15509 ] 15517 ] 15526 ] +15536 } +15539 } +15542 } 15544 ] +15546 } +15553 } 15557 ] 15564 ] +15574 } 15579 ] 15592 ] +15596 } +15602 } +15612 } +15648 } +15660 } 15662 ] +15666 } +15669 } 15681 ] 15688 ] 15700 ] -15715 ] +15702 } +15707 } +15715 )] 15727 ] 15735 ] 15746 ] @@ -1175,6 +1916,7 @@ 15784 ] 15800 ] 15818 ] +15820 } 15834 ] 15852 ] 15869 ] @@ -1185,109 +1927,272 @@ 15944 ] 15967 ] 15989 ] +15993 } 16016 ] +16019 } +16023 } 16032 ] +16041 } 16044 ] +16058 } 16065 ] +16069 } +16074 } 16082 ] +16084 } +16089 } +16095 } +16098 } 16102 ] +16118 } +16121 } 16123 ] +16129 } +16145 } +16147 } +16153 } +16161 } +16186 } +16190 } +16194 } +16203 } +16206 } +16228 } +16230 } +16234 } +16237 } 16283 ] -16301 ] +16292 } +16297 } +16301 ]} +16313 } +16318 } +16337 } +16340 } +16342 } +16345 } +16371 } +16374 } +16405 } +16407 } +16428 } +16471 } +16477 } 16534 ] 16544 ] 16548 ] 16558 ] 16574 ] 16589 ] +16593 } +16599 } 16615 ] -16638 ] +16638 ]} +16641 } 16657 ] 16676 ] 16694 ] +16705 } +16733 } +16772 } +16776 } +16788 } +16793 } +16822 } +16827 } 16853 ] -16867 ] -16874 ] +16867 }] +16873 } +] +16877 } 16888 ] 16898 ] 16916 ] 16936 ] +16939 } +16942 } 16947 ] +} +16952 } 16957 ] 16959 ] 16971 ] 16979 ] +16992 } +16995 } 17002 ] +17005 } +17013 } 17025 ] +17030 } +17033 } +17036 } +17039 } +17051 } 17055 ] +17064 } +17102 } +17108 } +17111 } +17115 } +17123 } +17125 } +17167 } +17172 } +17204 } +17210 } +17214 } +17245 } +17251 } +17294 } +17309 } +17313 } 17346 ] +17350 } +17360 } 17372 ] 17378 ] 17380 ] 17382 ] +17384 } 17388 ] 17391 ] 17402 ] 17410 ] +17417 } +17420 } +17423 } 17425 ] +17427 } 17430 ] +17436 } 17442 ] -17448 ] +17447 } +] 17472 ] +17483 } +17487 } +17492 } 17495 ] +} +17501 } +17511 } 17514 ] +} +17520 } +17524 } 17534 ] +} +17538 } 17552 ] 17570 ] 17588 ] 17605 ] 17614 ] +17617 } 17619 ] +} +17623 } 17629 ] 17635 ] 17645 ] -17653 ] -17666 ] +17653 ]} +17666 )] 17674 ] +} +17678 } +17683 } 17686 ] +17688 } +17693 } 17695 ] -17709 ] +17698 } +17702 } +17709 )] +17712 } +17714 } 17716 ] +17719 } +17721 } +17726 } 17731 ] +} 17737 ] -17754 ] -17759 ] +17739 } +17744 } +} +17754 )] +17759 ]} 17782 ] +17818 } 17820 ] +} +17836 } 17850 ] 17874 ] 17898 ] 17916 ] -17934 ] +17925 } +17929 } +17932 } +17934 )] +} +17939 } +17943 } 17951 ] 17953 ] 17972 ] +17974 } +17977 } +17983 } 17988 ] +17999 } +18002 } +18005 } 18007 ] +} +18013 } +18017 } +18031 } 18033 ] +18044 / +18061 } +18064 } +18068 } +18071 } +18115 / 18127 ] -18149 ] +18137 } +18140 } +18149 )] +18161 } +18164 } +18168 } 18176 ] +18187 / 18201 ] +18204 } +18208 } 18212 ] 18219 ] +18222 } 18226 ] 18235 ] +} 18240 ] 18246 ] 18249 ] -18253 ] -18256 ] +18252 } +] +18255 } +] 18263 ] +18267 } 18274 ] 18285 ] 18291 ] 18303 ] +18311 } 18314 ] 18323 ] ] @@ -1297,76 +2202,167 @@ 18338 ] 18347 ] 18363 ] +} 18371 ] 18386 ] 18394 ] 18410 ] 18416 ] +18419 } 18435 ] +18444 } +18447 } +18451 } 18457 ] +18464 } 18476 ] +} 18498 ] +18509 } 18520 ] 18538 ] 18563 ] 18573 ] 18582 ] 18598 ] +18606 } 18616 ] +} +18619 } +18622 } 18643 ] 18662 ] 18676 ] 18685 ] +18694 } +18698 } 18712 ] 18731 ] 18743 ] -18749 ] +} +18748 } +] +} +18753 } 18756 ] 18765 ] 18773 ] +18775 } 18783 ] +18786 } +18788 } 18794 ] 18805 ] +18807 } +18812 } 18814 ] 18824 ] 18840 ] +} +} 18850 ] +18853 } 18858 ] 18871 ] +18878 } 18883 ] 18892 ] +18906 } +18911 } 18913 ] +18915 } 18931 ] 18934 ] 18941 ] -18967 ] +18957 } +18959 } +18963 } +18967 )] +18970 } +18976 } 18986 ] +18992 } 19015 ] +19045 } +19048 } +19051 } +19054 } +19057 } +19060 } +19063 } +19072 } +19077 } +19107 } +19109 } +19113 } +19116 } +19124 } +19159 } +19173 } +19202 } +19208 } +19220 } +19223 } +19225 } +19227 } +19232 } +19235 } +} +19255 } +19277 } +19292 } +19295 } +19304 } +19311 } +19323 } +19327 } 19345 ] -19366 ] +19348 } +19365 } +] +19371 } +19375 } 19387 ] +19407 } +19411 } 19434 ] 19445 ] 19453 ] 19467 ] 19513 ] +19521 } +19523 } +19527 } 19533 ) ] +19536 } +19547 } 19552 ] 19563 ] +} 19579 ] 19586 ] 19596 ] -19605 ] +19599 } +19601 } +19605 ]} 19624 ] +19627 } 19634 ] 19648 ] +} 19658 ] +} +19668 } 19680 ] 19694 ] -19699 ] +} +19699 )] +19701 } +19703 } +19712 } 19719 ] -19724 ] +19724 ]} 19736 ] 19745 ] 19748 ] @@ -1387,6 +2383,8 @@ 19870 ] 19880 ] 19888 ] +} +19893 } 19896 ] 19901 ] 19909 ] @@ -1398,86 +2396,135 @@ 20035 ] 20056 ] 20061 ] +} 20067 ] 20069 ] -20087 ] +20086 } +] +20090 } 20112 ] +20128 } 20133 ] -20136 ] -20139 ° -20141 ] +20135 } +] +20138 } +]° +20141 )] +20144 } 20164 ] 20170 ] 20182 ] 20190 ] 20199 ] +20223 } 20226 ] +20238 } 20253 ] -20300 ] -20316 ] +20300 }] +20315 } +] 20330 ] +20349 } 20355 ] +20358 } +20377 } +20381 } +20403 } +20405 } 20412 ] 20423 ] -20437 ] -20447 ] -20457 ] +20437 )] +20447 ]} +20449 } +20452 } +20454 } +20457 ]} 20460 ] 20467 ] +20471 } 20483 ) 20486 ] 20506 ] +20517 } 20521 ] 20529 ] +20542 } 20556 ] +20564 } 20566 ] 20572 ] -20577 ] -20583 ] +20576 } +] +20582 } +] 20591 ] 20601 ] +20609 } +20613 } 20615 ] +20625 } +20627 } 20640 ] +20649 } 20658 ] 20672 ) ] 20678 ] +20688 } 20702 ] -20710 ] +20710 )] +} 20729 ] 20734 ] 20756 ] +20758 / 20768 ] +20780 } 20785 ] 20791 ] 20806 ] +20816 } 20818 ] 20831 ] -20841 ] +20841 ]} +20844 } 20846 ] +} 20851 ] +20854 } 20862 ] -20867 ] +20867 ]} 20873 ] 20887 ] +20892 } 20894 ] -20905 ] +20904 } +] 20919 ) -20921 ] +} +] +} 20924 ) ] 20933 ] +20938 } +20941 } 20951 ] 20957 ] 20963 ] +20965 } 20980 ] 20987 ] -20994 ] +20993 } +] +20997 } 21003 ] 21006 ] -21010 ] +21009 } +] 21016 ] 21020 ] +21026 } 21028 ] 21030 ] 21033 ] @@ -1488,40 +2535,68 @@ 21045 ] 21050 ] 21052 ] +21054 } 21057 ] +21059 } 21062 ] 21064 ] +21069 } 21075 ] 21080 ] 21089 ] +21093 } 21111 ] +21124 } +21133 } 21137 ] +21139 } +21141 } 21144 ] 21157 ] -21171 ] +21171 )] 21195 ] 21221 ] +21235 } 21242 ] 21245 ] +21249 } +21253 } 21258 ] +21267 } +21271 } 21275 ] +21285 } +21290 } 21294 ] 21313 ] -21330 ] +21315 } +21318 } +21329 } +] +21340 } 21346 ] 21357 ] 21371 ] +21376 } 21387 ] +} +21397 } +21400 } 21412 ] 21419 ] -21422 ] +21422 ]} 21424 ] 21430 ] 21439 ] -21459 ] +21444 } +21458 } +] +21461 } 21484 ] 21494 ] +21506 } 21508 ] +21518 } 21525 ] 21538 ] 21550 ] @@ -1535,56 +2610,94 @@ 21605 ] 21611 ] ] +21616 } +21618 } 21630 ] 21635 ] 21654 ] 21659 ] 21667 ] +21682 } 21684 ] 21711 ] +21723 } 21741 ] +21760 } 21768 ] -21795 ] +21783 } +21789 } +21794 } +] 21799 ] +21803 } +21805 } +21817 } 21822 ] ] 21837 ] 21841 ] -21858 ] +21857 } +] 21862 ] +21864 } 21876 ] 21887 ] +21892 } 21916 ] 21932 ] +21935 } +21938 } +21950 } 21957 ] 21977 ] 21979 ] -21997 ] +21981 } +21997 )] 21999 ] 22008 ] -22012 ] -22031 ] +22012 ]} +22031 )] 22034 ] +22039 } 22055 ] 22058 ] +22065 } 22074 ] -22077 ] +22076 } +] 22091 ] -22093 ] +} +] +} +22099 } +22106 } 22108 ] ] +22119 } 22127 ] +} +22133 } +22137 } +22145 } 22154 ] +22160 } 22168 ] +22170 } +22177 } +22180 } 22190 ] +22192 } 22208 ] 22227 ] -22237 )} +22234 } +22236 } +)} 22239 ] 22247 ] 22257 ] 22263 ] 22266 ] +22270 } 22273 ] 22277 ] 22285 ] @@ -1595,19 +2708,30 @@ 22321 ] 22327 ] 22335 ] -22348 ] +22347 } +] +22354 } +22357 } 22361 ] 22374 ] 22383 ] +22395 } 22400 ] +22405 } +22409 } 22413 ] 22416 ] 22429 ] +22433 } +22442 } 22444 ] 22453 ] +22461 } 22464 ] 22479 ] +22484 } 22488 ] +} 22495 ] 22503 ] 22511 ] @@ -1618,14 +2742,21 @@ 22556 ] 22562 ] 22580 ] +22585 } 22591 ] +22593 } +22598 } 22601 ] +22605 } 22610 ] 22620 ] 22622 ] -22629 ] +22628 } +] 22631 ] +} 22637 ] +22639 } 22642 ] 22646 ] 22652 ] @@ -1643,15 +2774,18 @@ ] 22670 ] ] +22674 } 22676 ] ] 22682 ] +22687 / 22690 ] 22696 ] 22699 ] 22705 ] 22714 ] 22723 ] +22726 } 22728 ] 22732 ] 22734 ] @@ -1686,64 +2820,91 @@ 22822 ] 22827 ] 22830 ] +22833 } 22835 ] 22840 ] 22844 ] 22849 ] +22851 } 22855 ] 22863 ] 22867 ] +} 22873 ] 22877 ] 22885 ] +22891 } 22894 ] 22904 ] 22909 ] 22918 ] 22923 ] +22938 } 22941 ] 22954 ] -22965 ] +22965 ]} 22979 ] +22982 } 22986 ] 22992 ] +22995 } 22999 ] 23004 ] +23006 } +23010 } +23013 } +23020 } 23033 ] 23039 ] 23060 ] 23081 ] +23091 } 23105 ] +23125 } 23130 ] 23147 ] 23153 ] 23158 ] 23161 ] -23164 ] +23163 } +] 23166 ] +23169 } 23184 ] 23200 ] 23214 ] -23239 ] +23222 } +23225 } +23239 )] 23257 ] +23268 } 23276 ] 23291 ] 23318 ] 23343 ] -23360 ] +23347 } +23360 ]} +23362 } +23365 } 23375 ] +23385 } 23390 ] 23393 ] +23402 } 23408 ] 23413 ] 23424 ] 23426 ] -23433 )} +23429 } +23432 } +)} +23435 / 23445 ] 23459 ] 23466 ] 23480 ] 23491 ] +} 23498 ] ] 23503 ] @@ -1755,7 +2916,9 @@ 23525 ] 23531 ] 23537 ] -23545 )} +23544 / +)} +23547 } 23550 ] 23556 ] 23562 ] @@ -1774,6 +2937,7 @@ 23604 ] 23609 ] 23618 ] +23620 } 23631 ] 23649 ] 23654 ] @@ -1782,56 +2946,98 @@ 23690 ] 23698 ] 23706 ] +23709 } 23717 ] 23725 ] +23728 } 23733 ] 23737 ] 23752 ] 23762 ] 23771 ] +23773 } 23777 ] +23780 } 23785 ] +23788 } 23802 ] 23817 ] 23822 ] 23828 ] +23843 } 23846 ] +23850 } 23870 ] +23884 } 23892 ] +23894 } +23904 } 23913 ] +23915 } 23928 ] 23953 ] 23972 ] 23978 ] 23987 ] 23996 ] +24001 } +24004 } 24011 ] 24025 ] 24043 ] +24052 } +24061 } 24063 ] +24076 / 24080 ] +24087 } +24090 } 24093 ] +24096 } +24100 } +24105 } +24153 } +24164 } +24166 } 24168 ] +} +24241 } +24245 } 24276 ] 24285 ] 24288 ] +} +24292 } 24302 ] +24306 } +24313 } 24316 ] 24327 ] 24343 ] +24349 } 24356 ] +24359 } 24364 ] +24367 } 24373 ] +24376 } 24379 ] 24381 ] 24387 ] 24390 ] 24392 ] 24399 ] +} +24403 } +} 24414 ] 24431 ] +24439 } +24445 } 24450 ] -24473 ] +24472 } +] +24475 } 24485 ] 24487 ] 24501 ] @@ -1841,7 +3047,11 @@ 24541 ] 24551 ] 24560 ] -24573 ] +24563 } +24572 } +] +24577 } +24584 } 24587 ] 24607 ] 24627 ] @@ -1851,27 +3061,42 @@ 24690 ] 24707 ] 24725 ] +24729 } +24735 } +24738 } 24742 ] +} +24746 } +24748 } +24751 } +24753 } 24758 ] -24761 ] +24760 } +] +24763 } +24770 } 24773 ] 24775 ] 24791 ] 24793 ] +24795 } +24798 } 24805 ] -24808 ] +24807 } +] 24819 ] 24823 ] 24838 ] -24842 ] +24842 )] 24859 ] -24861 ] +24861 ]} +24863 } 24867 ] ] 24873 ] ] 24878 ] -24880 ] +24880 }] 24882 ] ] 24885 ] @@ -1880,10 +3105,11 @@ 24891 ] 24893 ] ] -24897 ] +24897 )] 24899 ] 24901 ] 24903 ] +24906 } 24908 ] 24914 ] 24921 ] @@ -1891,59 +3117,110 @@ 24944 ] 24953 ] 24955 ] +24961 } 24970 ] 24988 ] +24998 } 25005 ] +25015 } 25019 ] +} +25024 } +25031 } 25036 ] 25054 ] 25076 ] 25092 ] -25114 ] +25113 } +] +25120 } +25132 } 25137 ] -25157 ] +25144 } +25157 }] +25168 } 25175 ] +25177 } +25186 } 25189 ] +} +25195 } +25201 } 25230 ] 25236 ] 25244 ] 25254 ] +25258 } +25262 } 25264 ] 25277 ] 25279 ] +25299 } +/ +25309 } 25320 ] +25339 } 25345 ] -25360 )} +} +25353 } +25359 } +)} 25363 ] +25365 } +25369 } 25373 ] 25389 ] +25391 } 25402 ] 25411 ] -25427 ] +25427 ]} 25439 ] 25443 ] 25448 ] +25451 } 25455 ] 25465 ] 25469 ] 25477 ] +} +25483 } 25487 )} ] +25490 } 25493 ] 25498 ] 25503 ] +25515 } 25520 ] 25539 ] +25583 } +25588 } +25591 } +25631 } +25635 } +25658 } +25679 } +25728 } +25733 } +25739 } +25750 } +25755 } 25779 ] +} +25793 } 25795 ] 25819 ] 25830 ] +} 25845 ] -25868 ] +25868 )] 25881 ] +25884 } +25890 } 25898 ] 25914 ] 25930 ] +} 25939 ] 25956 ] 25960 ] @@ -1953,34 +3230,77 @@ ] 25979 ] 25986 ] +25989 } +25991 } 25995 ] +25997 } 26000 ] +26008 } +26011 } 26014 ] 26031 ] 26047 ] +26049 } +26053 } +26056 } +26060 } +26070 } +26073 } +26084 } +26091 } +} +26096 } +26099 } +26105 } +26108 } +26134 } +26137 } +26141 } +} +26146 } +26149 } +26182 } +26188 } +26191 } +26196 } +26207 } +26218 } +26225 } 26230 ] +} +26235 } 26239 ] 26248 ] 26253 ] +} 26257 ] ] 26262 ) ] 26268 ] +} 26277 ] +26280 } +26284 } +26287 } 26291 ] 26309 ] +26319 } 26327 ] +26336 } 26347 ] 26367 ] 26383 ] 26396 ] 26425 ] +26437 } 26451 ] 26458 ] 26470 ] +26480 } 26482 ] 26488 ] +} 26498 ] 26500 ] 26508 ] @@ -1992,11 +3312,15 @@ ] 26538 ] 26542 ] +26549 } 26553 ] +26557 } 26563 ] +26570 } 26581 ) ] 26591 ] +26593 } 26597 ] 26601 ] 26610 ] @@ -2004,8 +3328,11 @@ 26618 ) ] 26627 ] +26631 } 26643 ] 26647 ] +} +26657 } 26668 ] 26672 ] 26688 ] @@ -2015,53 +3342,81 @@ 26712 ] 26715 ] 26717 ] +26719 } 26727 ] 26735 ] +26745 } +26749 } 26770 ] 26774 ] 26782 ] 26788 ] +} 26794 ] +26803 } 26808 ] 26815 ] 26828 ] 26831 ] 26840 ] +26856 } 26858 ] -26875 ] +26860 } +26874 } +] 26889 ] -26901 ] +26901 ]} 26923 ] +} +} +26929 } +26932 } +26935 } +26940 } 26944 ] 26961 ] +} +26974 } 26979 ] 27003 ] 27017 ] 27034 ] 27052 ] +27060 } +27064 } 27071 ] 27101 ] 27118 ] +27128 } 27134 ] 27155 ] 27175 ] 27199 ] +27203 } 27223 ] 27238 ] 27264 ] 27266 ] +27283 } 27296 ] -27322 ] +27303 } +27321 } +] 27344 ] -27370 ] +27360 } +27369 } +] 27393 ] +27407 } 27416 ] 27437 ] -27456 ] +27452 } +27456 ]} 27465 ] 27468 ] 27476 ] 27485 ] +27489 } 27495 ] 27504 ] 27512 ] @@ -2071,19 +3426,37 @@ 27550 ] 27574 ] 27595 ] +27601 } +27611 } 27624 ] +27636 } +27640 } +27645 } +27649 } 27651 ] +27653 } +27660 } 27673 ] 27683 ] 27713 ] 27733 ] 27760 ] +27771 } 27779 ] +27800 } 27811 ] +27813 } +27819 } 27843 ] 27866 ] 27887 ] +} +27891 } +27896 } +27900 } +27904 } 27910 ] +} 27919 ] ] 27931 ] @@ -2092,6 +3465,7 @@ 28002 ] 28018 ] 28040 ] +28045 } 28061 ] 28068 ] 28083 ] @@ -2103,10 +3477,14 @@ 28149 ] 28162 ] 28170 ] +28178 } 28181 ] 28190 ] 28200 ] -28228 ] +28214 } +28227 } +] +28233 } 28245 ] 28303 ] 28313 ] @@ -2117,6 +3495,7 @@ 28390 ] ] 28394 ] +28396 } 28400 ] 28403 ] 28416 ] @@ -2134,6 +3513,8 @@ 28501 ] 28504 ] 28509 ] +} +28519 } 28523 ] 28527 ] 28544 ] @@ -2154,9 +3535,12 @@ 28651 ] 28663 ] 28665 ] -28674 ] +28673 } +] +28682 } 28689 ] 28691 ] +28701 } 28715 ] 28718 ] 28741 ] @@ -2167,34 +3551,46 @@ 28862 ] ] 28894 ] +28901 } 28908 ] +28918 } +28924 } +28971 } 28984 ] +28987 } 29000 ] 29015 ] 29034 ] 29041 ] 29068 ] 29070 ] +29073 } 29085 ] ] +29092 } 29100 ] 29121 ] 29134 ] +29153 } 29160 ] +} +29164 } 29189 ] 29200 ] 29216 ] 29218 ] -29226 ] +29226 ]} 29245 ] 29257 ] +29277 } 29279 ] 29304 ] 29321 ] 29328 ] +29336 } 29343 ] 29353 ] -29363 ] +29363 ]} 29367 ] 29376 ] 29382 ] @@ -2211,33 +3607,45 @@ 29438 ] 29455 ] 29457 ] +29467 } 29481 ] 29484 ] 29503 ] +29508 } 29514 ] -29531 ] +29517 } +29531 )] 29539 ] 29548 ] 29551 ] -29561 ] +29561 ]} +29565 } +29570 } +29573 } 29580 ] 29606 ] +29611 } 29626 ] 29645 ] -29661 ] +29661 }] 29677 ] 29679 ] +29681 } 29684 ] 29695 ] +29700 } 29702 ] 29713 ] 29725 ] 29738 ] 29746 ] +} +29750 } 29756 ] 29768 ] 29781 ] -29787 ] +29786 } +] 29799 ] 29808 ] 29813 ] @@ -2251,6 +3659,7 @@ 29891 ] 29899 ] 29902 ] +29906 } 29912 ] 29918 ] 29933 ] @@ -2258,6 +3667,7 @@ 29952 ] 29962 ] 29979 ] +29981 } 29989 ] 30003 ] 30012 ] @@ -2265,23 +3675,32 @@ 30023 ] 30035 ] 30052 ] +30062 } 30069 ] 30080 ] +30082 } 30095 ] +30100 } 30106 ] 30121 ] 30131 ] +30139 } 30144 ] +30148 } 30158 ] 30174 ] 30181 ] +30186 } 30195 ] 30207 ] 30228 ] +30231 } +30235 } 30240 ] 30247 ] 30257 ] 30264 ] +30268 } 30283 ] 30304 ] 30306 ] @@ -2292,10 +3711,18 @@ 30350 ] 30366 ] 30377 ] +30380 } +30390 } 30393 ] 30408 ] +30415 } +30419 } 30422 ] +30424 } +30428 } +30432 } 30434 ] +30438 } 30449 ] 30452 ] 30457 ] @@ -2306,15 +3733,26 @@ 30501 ] 30513 ] 30520 ] +30523 } 30540 ] +30552 } 30554 ] 30564 ] +30566 } +30572 } +30639 } +30642 } +30647 } +30651 } +30655 } +30662 } 30691 ] 30717 ] 30734 ] 30758 ] 30781 ] -30792 ] +30791 } +] 30800 ] 30815 ] 30824 ] @@ -2329,10 +3767,14 @@ 30908 ] 30913 ] 30916 ] +30921 } 30933 ] 30947 ] +30957 } 30962 ] +30971 } 30973 ] +30977 } 30982 ] 30997 ] 31010 ] @@ -2349,11 +3791,13 @@ 31096 ] 31102 ] 31114 ] -31121 ] +31121 )] 31135 ] 31138 ] 31149 ] +} 31158 ] +} 31167 ] 31181 ] 31188 ] @@ -2366,15 +3810,24 @@ 31255 ] 31268 ] 31271 ] +31280 } +31289 } +31308 } 31357 ° +31508 } +31526 } +31532 } 31567 ] -31583 ] -31599 ] +31582 } +] +31598 } +] 31616 ] 31629 ] 31648 ] 31657 ] 31681 ] +31691 } 31695 ] 31717 ] 31719 ] @@ -2400,64 +3853,167 @@ 31890 ] 31910 ] 31932 ] +31951 } 31955 ] +31958 } +31962 } +31966 } +31974 } 31979 ] 32025 ] 32061 ] +32065 } +32070 } +32075 } +32082 } +32097 } +32100 } 32138 ] 32146 ] 32148 ] -32156 ] -32161 ] +32156 )] +32161 )] 32177 ] 32194 ] +} 32213 ] +} 32242 ] +} +32245 } 32254 ] +} +32259 } +32264 } 32274 ] 32290 ] 32305 ] -32326 ] +32321 } +32326 ]} +32329 } +32332 } +32334 } +32337 } +32339 } +32342 } 32344 ] +} +32347 } +32350 } +32356 } +32360 } 32362 ] +32366 } +32373 } +32377 } 32384 ] +32390 } +32399 } 32403 ] -32416 ] +32406 } +32409 } +32412 } +32415 } +] +32418 } +32420 } +32424 } +32427 } +32431 } 32435 ] +32438 } +32441 } +32446 } +32450 } 32455 ] +32463 } 32471 ] +32484 } 32486 ] +32494 } +32497 } 32502 ] +32506 } +32509 } +32512 } +32517 } 32522 ] -] +}] +32526 } +32529 } 32539 ] -] +]} +32547 } +32551 } 32556 ] +]} +32564 } +32566 } +32568 } +32570 } +32576 } +32579 } +32629 } +32636 } +32651 } +32654 } +32657 } +32678 } +32680 } +32688 } +32691 } ] -32692 ] 32707 ] +32709 } 32714 ] 32732 ] 32751 ] 32771 ] 32785 ] 32801 ] +32805 } 32816 ] 32831 ] -32844 ] +32843 } +] +32850 } +32856 } +32888 } +32897 } +32909 } +32919 } +32922 } +32925 } +32930 } +32961 } +33004 } +33007 } +33028 } +33033 } +33044 } +33048 } +33050 } +33105 } +33111 } +33125 } +33128 } 33166 ] 33188 ] +33197 } 33216 ] -33219 ] +33219 ]} 33233 ] -] +]} ] 33248 ] ] 33262 ] 33264 ] +33273 } 33279 ] -33285 ] +33284 } +] +33287 } 33299 ] 33305 ] 33318 ] @@ -2471,75 +4027,130 @@ 33431 ] 33450 ] 33472 ] +33474 } 33495 ] 33507 ] 33513 ] 33522 ] +} 33532 ] 33545 ] +33549 } 33553 ] +33557 } 33561 ] +} 33566 ] 33573 ] 33582 ] 33592 ] 33602 ] -33618 ] +33618 )] +33622 } +33661 } 33684 ] 33687 ] +33690 } +33697 } 33703 ] 33714 ] -33723 ] +33723 )] +33738 } +33741 } 33745 ] 33757 ] +33772 } 33774 ] +33777 } +33783 } 33795 ] +33820 } 33924 ] 33943 ] +33959 } 33964 ] 33983 ] +33985 } +33991 } 34040 ] 34050 ] 34054 ] 34063 ] -34072 ] +34072 }] +34078 } 34083 ] +} 34094 ] 34109 ] 34124 ] +34141 } 34143 ] -34159 ] +34159 )] 34165 ] 34168 ] 34177 ] +} 34187 ] 34193 ] 34195 ] -34208 ] +34199 } +34201 } +34204 } +34207 } +] +34210 } +34214 } +34227 } 34237 ] +34244 } +34283 } +34285 } +34314 } 34326 ] +34343 } 34346 ] +34349 } +34365 } +34370 } 34386 ] +34398 } 34409 ] 34424 ] +} 34433 ] +34445 } 34447 ] +} 34460 ] 34474 ] +} 34484 ] +34523 } +34528 } +34534 } +34538 } +34540 } +34548 } 34550 ] 34570 ] +34574 } 34586 ] +34604 } 34611 ] +34615 } +34617 } +34620 } 34644 ] 34665 ] 34682 ] 34690 ] +} 34705 ] 34720 ] 34740 ] 34762 ] 34784 ] +34787 } 34799 ] 34819 ] 34838 ] @@ -2547,25 +4158,49 @@ 34874 ] 34897 ] 34913 ] +34919 } +34923 } 34930 ] 34942 ] 34958 ] +} 34976 ] 34992 ] +} +34996 } 35009 ] +} 35020 ) 35027 ] +} +35031 } +35034 } 35044 ] 35060 ] +} +35064 } +35067 } +35071 } 35080 ] 35096 ] +35098 } 35123 ] +} +35134 } 35142 ] 35159 ] -35175 ] +35175 )] +} +35188 } 35195 ] +35197 } +35204 } 35216 ] +} +35221 } +35228 } 35231 ] +35234 } 35244 ) ] 35248 ] @@ -2575,14 +4210,42 @@ 35257 ] 35261 ] 35276 ] +35278 } +35287 } +35296 } +35310 } +35327 } +35343 } 35349 ] +} 35365 ] +35374 } 35384 ] 35400 ] +35409 } +35436 } +35445 } +35449 } +35473 } +35487 } +35491 } +35498 } +35500 } +35503 } +35506 } +35534 } +35538 } +35549 } +35571 } +35578 } +35604 } +35630 } 35638 ] +35649 } 35657 ] 35664 ] 35684 ] +35687 } 35698 ] 35720 ] 35734 ] @@ -2590,20 +4253,26 @@ 35787 ] 35795 ] 35818 ] +35844 } 35846 ] 35874 ] 35901 ] 35924 ] +} 35949 ] 35970 ] +} 35989 ] 36015 ] -36035 ] +36035 )] 36043 ] +} 36049 ] 36057 ] +} 36061 ] 36086 ] +} 36110 ] 36128 ] 36150 ] @@ -2615,31 +4284,50 @@ 36189 ] 36194 ] 36203 ] -36211 ] +} +36206 } +36210 } +] +36221 } 36224 )} +} 36228 ] +36233 } 36237 ] +36241 } 36245 ] +36248 } 36252 ] 36261 ] 36270 ] -] +]} +36274 } 36276 ] ] -36281 ] +36280 } ] +] +36285 } 36289 ] 36291 ] 36298 ] 36300 ] 36302 ] -36306 ] +36306 )] +} +36310 } 36322 ] +36325 } 36339 ] 36354 ] +36363 } 36370 ] +36387 } 36393 ] +} +36407 } 36411 ] +36420 } 36434 ] 36456 ] 36474 ] @@ -2648,107 +4336,290 @@ 36518 ] 36537 ] 36547 ] +36550 } +36561 } +36563 } +36565 } 36576 ] 36591 ] 36613 ] 36630 ] +36636 } +36640 } 36647 ] 36659 ] 36675 ] +36699 } +36702 } +36708 } +36719 / +36725 / +36728 } +36730 / +36733 } +36736 / +36741 / +36748 / +36751 } +36754 / +36758 } +36762 / +36766 } +/ +36770 } +36773 / +36780 / +36786 } +36788 / +36795 / +36798 } +36801 / +36806 } +/ +36811 } +36814 / +36825 } +36945 } +36961 } +36981 } +36984 } +36986 } +36989 } +37001 } +37018 } +37032 } +37095 } +37122 } +37129 } +37147 } +37156 } +37168 } +37184 } +37192 } +37204 } +37337 } 37339 ] +} +37342 } 37366 ] 37382 ] 37391 ] +37395 } 37411 ] +37415 } 37431 ] +37435 } 37447 ] +37452 } 37466 ] 37486 ] +37512 } 37515 ] +37517 } +37524 } +37529 } 37542 ] +37554 } 37568 ] 37591 ] 37593 ] 37600 ] 37604 ] 37611 ] +37614 } +37616 } +37619 } 37624 ] +37630 } 37635 ] 37648 ] +37656 } 37658 ] 37670 ] +37673 } 37683 ] -37759 ] +37688 } +37759 ]} +37761 } +37764 } +37770 } 37774 ] +37790 } +37794 } +37801 } 37803 ] 37825 ] 37840 ] -37853 ] +37853 }] +37856 } +37858 } 37864 ] -37875 ] +} +37869 } +37871 } +37874 } +] +} +37881 } 37887 ] 37898 ] -37909 ] +37901 } +37909 ]} +37911 } +37913 } +37917 } 37919 ] -37930 ] +} +37925 } +37929 } +] 37943 ] -37952 ] +} +37947 } +37951 } +] +37954 } +37962 } 37965 ] +37970 } +37972 } 37974 ] +} +37982 } 37986 ] 37989 ] 37991 ] -38004 ] +37997 } +} +38004 ]} 38010 ] -38014 ] +38013 } +] 38023 ] 38026 ] +38028 } +38031 } 38037 ] -38044 ] +38043 } +] +38047 } +38050 } 38057 ] +} +38061 } 38067 ] 38079 ] 38087 ] -38091 ] +38089 } +38091 ]} 38102 ] 38114 ] +} 38118 ] 38133 ] +38135 } +38138 } 38141 ] -38164 ] +38144 } +38147 } +38150 } +38153 } +38156 } +38160 } +38163 } +] 38170 ] -38183 ] +38182 } +] 38191 ] +38210 } 38212 ] +38216 } +/ +38221 / 38224 ] +} 38239 ] 38248 ] 38265 ] -38276 ] +38275 } +] 38278 ] +} +38282 } +38286 } +38289 } 38306 ] -38322 ] +} +38311 } +38317 } +38321 } +] +} +38328 } +38334 } 38336 ] -38342 ] +} +38341 } +] )} +} +38346 } +38349 } 38351 ] 38353 ] -38362 )} +38355 } +38361 } +)} ] +} 38370 ] +38372 } +38375 } 38382 ] -38396 ] -38410 ] -38425 ] +38395 } +] +} +38400 } +38403 } +38405 } +38409 } +] +38424 } +] +} 38433 ] 38438 ] +38444 } 38455 ] 38464 ] 38483 ] +38491 } +38494 } +38497 } +38500 } 38503 ] +38508 } +38515 } +38517 } 38523 ] +38525 } +38528 } +38535 } +38537 } 38544 ] +38546 } +38549 } +38554 } +38557 } 38570 ] +38595 } +38600 } +38606 } +38667 } +38670 } +38675 } +38678 } 38722 ] 38733 ] 38744 ] @@ -2765,7 +4636,9 @@ 38786 ] 38793 ] 38799 ] +38803 } 38806 ] +} 38812 ] 38821 ] 38827 ] @@ -2773,14 +4646,23 @@ 38846 ] 38855 ] 38866 ] +38871 } 38880 ] -39048 ] +38955 } +38990 } +39019 } +39043 } +39047 } +] +39052 } +39056 } 39064 ] 39075 ] +} 39086 ] 39088 ] 39096 ] -39101 ] +39101 }] 39106 ] 39112 ] 39121 ] @@ -2788,22 +4670,79 @@ 39132 ] 39140 ] 39152 ] -39168 ] -39183 ] +39167 } +] +39182 } +] +39186 / +39196 } 39199 ] 39211 ] +39237 / +39240 } +39256 } +39269 } 39280 ] +39287 } 39307 ] +39327 } +39339 } +39357 } +39388 } +39436 } +39439 } +39441 } +39458 } +39463 } +39577 } +39583 } +39590 } +39597 } +39602 } +39613 } +39623 } +39631 } +39638 } +39646 } +39667 } +39673 } +39680 } +39686 } +39710 } +39723 } +39726 } +39734 } +39742 } +39752 } +39758 } +39766 } +39770 } 39772 ] +39792 } +39797 } +39811 } +39817 } +39862 } +39870 } +39878 } 39885 ] +} +39894 } 39909 ] +39911 } 39923 ] +} +39936 } 39940 ] +39948 } 39954 ] 39964 ] -39972 ] +39966 } +39971 } +] 39974 ] 39979 ] +39981 } 39985 ] 39989 ] 39995 ] @@ -2814,11 +4753,19 @@ 40023 ] 40032 ] 40049 ] +40054 } +40074 } 40081 ] +} 40106 ] +} +40110 } 40137 ] +40145 } +40151 } 40165 ] 40190 ] +40196 } 40211 ] 40232 ] 40245 ] @@ -2826,32 +4773,83 @@ 40256 ] 40262 ] 40272 ] +40274 } 40286 ] 40292 ] -40317 ] +40299 } +40316 } +] +} +40322 } 40339 ] +} +40343 } +40396 } +40408 } +40421 } +40429 } +40447 } +40464 } +40474 } +40513 } +40524 } +40535 } +40557 } 40566 ] 40587 ] +40618 } +40624 } +40642 } +40649 } +40666 } +40679 } +40699 } +40704 } 40727 ] 40752 ] 40776 ] +40785 } +40791 } +40799 } 40805 ] +} +40814 } +40822 } +40825 } +40831 } 40836 ] +40843 } +40845 } 40847 ] 40853 ] 40879 ] 40906 ] +40910 } +40920 } +40927 } 40933 ] +40935 } +40945 } +40953 } 40959 ] +40964 } +40968 } 40987 ] 41031 ] 41054 ] +41060 } 41072 ] 41098 ] +41101 } +41112 } +41114 } +41117 } 41130 ] 41145 ] 41167 ] 41183 ] +41189 } +41193 } 41200 ] 41212 ] 41234 ] @@ -2864,31 +4862,54 @@ 41282 ] 41292 ] 41299 ] +41307 } 41312 ] 41320 ] 41331 ] 41335 ] +41340 } 41360 ] +41370 } +41388 } 41421 ] +41443 } 41451 ] +41454 } +41464 } +41467 } +41475 } 41477 ] +41481 } 41498 ] +41513 } 41518 ] 41522 ] +41528 } +41535 } +41559 } +41563 } +41566 } 41581 ] +41583 } 41601 ] 41607 ] 41630 ] 41632 ] 41638 ] +} +41643 } 41660 ] -41667 ] +41667 ]} +41671 } +41675 } 41692 ] 41700 ] 41711 ] ] 41718 ] -41725 ] +41725 ]} +41728 } +41730 } 41733 ] 41737 ] 41745 ] @@ -2897,19 +4918,23 @@ 41760 ] 41768 ] 41770 ] -41776 ] +41772 } +41775 } +] 41779 ] 41784 ] 41786 ] 41795 ] 41798 ] +} 41803 ] 41805 ] 41811 ] 41815 ] 41818 ] 41822 ] -41827 ] +41826 } +] 41830 ] 41835 ] 41842 ] @@ -2923,13 +4948,20 @@ 41905 ] 41933 ] 41941 ] -41955 ] +41946 } +41952 } +41955 ]} 41967 ] +41969 } 41974 ] +41984 } 41989 ] +41995 } 42005 ] +} 42020 ] 42037 ] +42040 } 42047 ] 42055 ] 42069 ] @@ -2941,6 +4973,8 @@ 42123 ] 42127 ] 42131 > +42138 } +42140 } 42145 ] 42152 ] 42156 ] @@ -2952,14 +4986,23 @@ 42209 ] 42222 ] 42230 ] -42248 ] +42240 } +42248 ]} 42253 ] 42261 ] +42265 } +42267 } 42278 ] 42280 ] -42285 ] +42285 }] +42288 } +42290 } 42312 ] 42320 ] +42323 } +42326 } +42331 } +42333 } 42345 ] 42349 ] 42372 ] @@ -2972,6 +5015,8 @@ ] 42444 ] 42446 ] +42449 } +} 42470 ] 42472 ] 42489 ] @@ -2980,20 +5025,30 @@ ] 42511 ] ] +42515 } 42523 ] 42534 ] +42542 } 42544 ] 42550 ] +} 42555 ] 42566 ] -42568 ] -42572 ] -42584 ] +} +] +42571 } +] +42576 } +42583 } +] 42588 ] 42602 ] 42608 ] +42617 } +42622 } 42627 ] 42632 ] +42649 } 42654 ] 42661 ] 42667 ] @@ -3007,25 +5062,32 @@ 42748 ] 42756 ] 42771 ] +} 42783 ] 42785 ] 42791 ] ] 42800 ] -42802 ] -42814 ] +42802 }] +42814 )] 42819 ] 42827 ] ] +42833 } 42840 ] ] 42849 ] 42851 ] 42859 ] +42862 } +42864 } +42867 } +42870 } 42874 ] 42885 ] 42899 ] 42909 ] +42913 } 42925 ] ] 42936 ] @@ -3051,30 +5113,54 @@ 43079 ] 43084 ] 43103 ] +} 43116 ] 43120 ] +} 43124 ] +43134 } 43143 ] 43146 ] +} +43158 } +43172 } 43179 ] 43182 ] +} 43190 )} +43197 } 43211 ] 43217 ] 43242 ] 43263 ] +43275 } +43282 } +43286 } 43293 ] +43311 } +43313 } 43317 ] 43325 ] 43328 ] +43332 } +43335 } 43343 ] -43349 ] +43347 } +43349 )] 43365 ] 43368 ] 43382 ] +43398 } +43400 } 43411 ] +43416 } +43419 } +43422 } +43426 } 43432 ] 43449 ] +43451 } +43453 } 43461 ] ] 43469 ] @@ -3083,21 +5169,51 @@ ] 43477 ] 43482 ] +} 43494 ] ] 43509 ] +43513 } 43526 ] +43533 } +43536 } 43543 ] +43555 } 43570 ] +43584 } 43602 ] +43605 } +43609 } +43616 } +43621 } 43629 ] +43636 } +43639 } 43645 ] +43649 } +43654 } +43658 } +43665 } 43669 ] 43689 ] +43691 } +43700 } +43704 } 43709 ] +43729 } 43731 ] +43733 } +43738 } +43744 } +43748 } +43751 } 43762 ] +} +43768 } +43774 } +43780 } 43789 ] +43797 } 43819 ] 43838 ] ] @@ -3105,10 +5221,15 @@ 43849 ] 43856 ] 43860 ] +} +43863 } 43866 ] 43868 ] +43870 } 43873 ] 43883 ] +} +43890 } 43894 ] 43896 ] 43902 ] @@ -3117,18 +5238,22 @@ 43928 ] 43931 ] 43942 ] +43945 } 43949 ] 43959 ] 43965 ] 43975 ] -43981 ] +43977 } +43980 } +] 43987 ] 44001 ] 44007 ] +44019 } 44024 ] 44028 ] 44030 ] -44037 ] +44037 }] 44056 ] 44059 ] 44077 ] @@ -3141,10 +5266,13 @@ ] ] 44122 ] -44133 ] +44132 } +] +} 44147 ] 44160 ] 44172 ] +44176 } 44183 ] 44192 ] 44200 ] @@ -3153,10 +5281,14 @@ 44212 ] 44225 ] 44228 ] +44230 } +} +44235 } 44238 ] 44240 ] 44251 ] 44253 ] +44259 } 44265 ] ] 44280 ] @@ -3174,6 +5306,7 @@ 44385 ] 44411 ] 44433 ] +44443 } 44457 ] 44477 ] 44492 ] @@ -3183,47 +5316,133 @@ 44519 ] 44521 ] 44523 ] +44531 } 44541 ] +44547 } +44555 } 44561 ] +} +44570 / +44576 / 44579 ] -44592 ] -44607 ] +44581 / +44588 / +44591 } +] +44594 / +44599 / +44602 } +44604 / +44607 }] +44610 / +44616 / 44621 ] +/ +44625 } +44627 / +44630 } +44633 / +44636 } +44645 } 44647 ] +44664 / +44670 / +44675 } +/ +44682 / +44685 } +44687 / +44690 } +44718 } +44725 } 44734 ] +44736 / +44742 / +44752 } +44755 } +44758 } 44771 ] +44773 / +44778 / +44786 / +44791 / +44794 } +44797 / +44800 } +44808 } 44815 ] +44820 } 44837 ] +44856 } +44891 / +44897 / +44902 / +44907 / 44916 ] +44931 } +44949 } +44961 } +44979 } +44989 / +44995 / 45023 ] 45032 ] 45046 ] +45051 / 45054 ] +45057 } 45063 ] +45068 / 45070 ] 45080 ] 45086 ] 45102 ] -45113 ] +45113 }] 45128 ] -45145 ] +45136 } +45144 } +] 45156 ] -45173 ] +45172 } +] +45175 } 45181 ] +45188 } 45195 ] +45197 } +45200 } 45202 ] +45204 } +45207 } +45209 } 45218 ] 45225 ] +} 45243 ] -45248 ] +45247 } +] +45252 } 45262 ] +} 45265 ] +} +45269 } 45278 ] 45280 ] +45283 } +45287 } 45305 ] 45307 ] +} +45312 } +45315 } +45325 } 45329 ] +} 45332 ] +45336 } +45338 } +45345 } 45355 ] 45357 ] 45363 ] @@ -3231,24 +5450,61 @@ 45368 ] 45370 ] 45379 ] +45381 } 45385 ] 45393 ] +45395 } +45397 } +45400 } +45404 } 45417 ] +45422 } +45434 } 45448 ] +45452 } +45471 } 45478 ] +45481 } +45484 } +45488 } 45502 > 45509 ] 45513 ] +45515 } +45535 } 45539 ] -45541 ] +} +] +45543 } +45546 } +45554 } 45560 ] 45562 ] +45577 } +45580 } +45584 } +45588 } 45590 ] +45593 } +45595 } 45620 ] +45628 } +45631 } +45634 } +45637 } 45639 ] -] -45662 ] -] +}] +45644 } +45647 } +45650 } +45654 } +45656 } +45661 } +] +] +} +45668 } +45685 } 45687 ] ] 45691 ] @@ -3261,6 +5517,7 @@ 45736 ] 45745 ] 45750 ] +45753 } 45757 ] 45762 ] 45771 ] @@ -3277,76 +5534,166 @@ 45804 ] 45807 ] 45814 ] +} 45821 ] +45823 } +45829 } 45833 ] +45835 } 45848 ] +45850 } 45857 ] +/ +45864 / +45868 } +45872 / 45879 ] 45896 ] +45899 } 45914 ] +} 45921 ] +45927 } +45933 } 45940 ] 45944 ] +45949 } 45967 ] -45969 ] +} +] +45978 } 45986 ] +46015 } +} +46034 } 46054 ] +46078 } 46085 ] +} +46088 } +} +46101 / 46113 ] 46141 ] +46144 } 46165 ] +46181 } +46191 } 46197 ] 46223 > 46227 ] 46231 > +46248 } 46254 ] +46256 } +} 46265 ] +46274 } 46282 ] +46294 } 46299 ] +46312 } 46317 ] +} +46321 } 46323 ] +46326 } +46329 } 46338 ] 46346 > 46348 ] +46351 / +46354 } 46363 ] 46371 ] +46375 } 46385 ] 46387 ] 46391 ] 46395 ] -46400 ] +46400 ]} +46402 } +46405 } 46413 ] +46478 } +46481 } +46484 } +46488 } 46490 ] 46511 ] +46526 } +46529 } +46533 } 46535 ] -46562 ] +46562 ]} +46575 } +46578 } +46580 } +46584 } +46588 } +46592 } +46597 } +46616 } +46650 } +46663 } +46670 } +46707 } +} +46715 } 46719 ] +46724 } 46741 ] 46762 ] +46771 } +46773 } 46786 ] 46803 ] 46808 ] +46813 } 46824 ] 46826 ] +46828 } 46830 ] +46834 } 46838 ] 46841 ] -46843 ] +} +] +46855 } 46863 ] +46867 } 46869 ] +46872 } 46881 ] 46886 ] 46903 ] 46919 > 46921 ] +46926 } 46956 ] +46970 } +46974 } 46989 ] -47017 ] +} +47003 } +47006 } +47008 } +47016 } +] +47031 } 47046 ] +47056 } +47060 } 47070 ] -47096 ] +47081 } +47091 } +47096 ]} +47099 } +47103 } 47125 ] 47150 ] +47159 } +47162 } 47166 ] ] 47169 ] @@ -3355,121 +5702,426 @@ 47198 ] 47207 ] 47215 ] +47227 / +47234 / 47237 ] +47239 } 47245 ] +47263 } 47270 ] +47281 } 47298 ] +47306 } +47309 } +47313 } +47318 } +} +47323 } +47326 } 47329 ] +} +47333 } +47336 } +47339 } +47341 } +47344 } +47352 } 47354 ] +47372 } 47389 ] +47414 } +47421 } 47426 )} +47428 } +47439 } 47457 > +47475 } 47486 ] +} +47497 } 47512 ] +47514 } +47518 } +47520 } +47523 } +47526 } +47528 } +47531 } +47534 } +47536 } 47538 ] 47541 ] +47562 } 47570 ] 47573 ] 47605 ] 47608 ] +47610 } +47613 } +47616 } +47621 } +47627 } +47631 } 47638 ] +47652 } +47654 } +47656 } +47659 } 47662 ] 47664 ] 47689 ] ] 47714 ] +47722 } +47725 } +47729 } +47732 } +47734 } +} 47744 ] +47748 } 47771 ] -47777 ] +47776 } +] 47787 ] -47792 ] +47791 } +] 47802 ] 47810 ] +47815 } +47823 } 47827 ] 47833 ] 47838 ] +47849 } 47851 ] -47885 ] +47854 } +47881 / +47884 } +] +/ +47889 } +47892 / +47895 } +47899 } +47908 } 47916 ] 47947 ] 47973 ] -48008 ] +48008 ]} +48010 } +48013 } +48020 } +48025 } +48030 } 48035 ] 48066 ] +48074 } +48080 } 48088 ] +48091 } 48108 ] 48130 > 48137 ] +48157 } +48163 } 48167 ] 48183 ] 48205 ] 48210 ] 48226 ] 48230 ] +48234 } 48244 ] 48248 ] 48265 ] 48281 ] +48304 } +48307 } 48310 ] +} +48316 } +48319 } +48321 } +48324 } +48326 } 48335 ] +48345 } 48357 ] 48385 ] +48389 } +48403 } 48412 ] +48435 } +48438 } +48441 } 48443 ] +48445 } +48450 } +48515 } +48518 } +48521 } +48524 } +48527 } +48529 } +48535 } +48540 } +48544 } +48548 } +48567 } +48577 } +48636 } +48650 } +48654 } +48664 } +48669 } +48677 } +48683 } +48685 } +48704 } +48708 } +48714 } +} +48720 } +48722 } +48727 } +48731 } +48735 } +48761 } +48766 } +48778 } +48784 } +48786 } +48789 } +48791 } +48794 } +48810 } +48820 } +48824 } +} +48827 } +48830 } +48840 } +48844 } 48848 ] 48876 ] 48891 ] 48895 > +48902 } 48906 ] +48909 } +48920 / 48923 ] +48926 / +48929 } +48932 / +48935 } +48937 / 48941 ] +/ +48945 } +48947 / +48950 } +48953 / +48957 } 48960 ] +/ +48965 } +/ +48970 } +48973 / 48979 ] +/ +48986 } +48988 / +48992 } 48996 ] +49000 } 49008 ] 49013 ] 49016 ] ] 49020 ] -49027 ] +49027 ]} +49030 } 49041 ] -49053 ] +49052 } +] 49071 ] 49077 ] 49085 ] 49101 ] +49103 } 49122 ] +} +49126 } +49129 } +49132 } 49139 ] 49163 ] -49186 ] +49185 } +] +49195 } +49197 } +49200 } +49203 } 49219 ] -49279 ] +49229 } +49278 / +] +49282 } +49285 / +49288 } +49292 / +49295 } +49297 / +49303 / +49312 } 49317 ] +49325 } 49342 ] +49344 } +49349 } +49353 } +49361 } +49363 } 49368 ] +49372 } +49387 } +49402 } +49412 / +49417 } +49419 / +49423 } +49426 / +49430 } +49439 } +49453 } +49470 / +49474 } +49476 / +49479 } +49483 / +49488 } +/ +49514 } +49529 } +49556 } +49558 } +49562 } +49566 } +49568 } +49575 } +49589 } 49603 ] +49607 } +49609 } +49612 } +49614 } +49617 } +49622 } +49624 } +49626 } 49628 ] +} +49635 } +49651 } +49686 } +49689 } +49695 } +49697 } +49702 } +49707 } +49713 } +49715 } 49740 ] 49748 ] 49763 ] +49766 } 49771 ] 49788 ] +49808 / +49813 / +49819 / +49822 } +49824 / +49827 } +49830 / +49833 } +49835 / +49838 } +49840 / +49847 / +49851 } 49857 ] 49889 ] 49924 ] +/ +49931 / 49933 ] -49962 ] -49973 ] +} +49937 / +49940 } +49942 / +49945 } +49947 } +49949 / +49955 / +49961 } +] +/ +49966 } +49969 / +49972 } +] +49975 / +49981 / +49986 / +49991 / 49996 ] +/ +50002 / +50007 / +50012 } +/ +50016 } +50022 } 50030 ] +50042 } 50073 ] +50099 / +50106 / 50108 ] +50111 } +50114 } +50129 / 50151 ] 50172 ] 50190 ] 50211 ] +50235 / +50242 / +50247 } 50252 ] +50255 } +50278 } 50284 ] +50304 } +50307 } +50311 } +50315 } +50318 } +50320 } +50349 } +50353 } +50363 } +50367 } +50428 } +50439 } +50441 } +50444 } +50516 } +50520 } 50550 ] 50558 ] 50572 ] @@ -3479,14 +6131,18 @@ 50605 ] 50618 ] ] +50622 } 50636 ] -] +]} 50651 ] ] 50665 ] 50674 ] +50676 } 50682 ] ] +50686 } +50690 } 50702 ] 50706 ] 50721 ] @@ -3507,7 +6163,11 @@ 50821 ] 50833 ] ] +50837 } +50840 } 50846 ] +} +50849 } 50860 ] ] 50870 ] @@ -3523,27 +6183,40 @@ 50935 ] 50937 ] 50947 ] -50949 ] +50949 ]} +50952 } 50968 ] ] 50987 ] ] 51012 ] 51015 ] +51021 } +51025 } 51036 ] 51039 ] +51044 } 51060 ] ] +51065 } +51079 } 51081 ] 51084 ] +51093 } +51096 } 51107 ] ] +51120 } 51131 ] 51133 ] +51144 / +51151 / 51155 ] 51157 ] +51170 } 51173 ] ] +} 51189 ] 51191 ] 51208 ] @@ -3557,59 +6230,109 @@ 51235 ] 51239 ] ] +51243 } 51245 ] -51256 ] -51259 ] +51247 } +51250 } +51252 } +51254 } +51256 )] +51258 } +] +51261 } +51265 } +51269 } 51274 ] 51289 ] 51308 ] +51319 } +51323 } +51329 } +51333 } 51336 ] 51348 ] 51361 ] 51377 ] +51392 } +51394 } 51397 ) -51402 ] +} +51400 } +51402 ]} +51405 } +51408 } +51410 } +51412 } +51416 } +} 51422 ) 51429 ] +51433 } +51441 } +51443 } 51450 ) +51453 } 51458 ] 51475 ] -51484 ] +51478 } +51480 } +51483 } +] +} +51487 } +51489 } 51499 ) 51504 ] -51511 ] +51510 } +] +} +51521 } 51528 ] 51530 ] 51540 ] 51550 ] 51561 ] +51569 } 51574 ] 51585 ] 51591 ] +51598 } 51604 ] 51621 ] 51640 ] +51653 } +51655 } 51657 ] +51669 } 51673 ] +51677 } 51685 ] +51688 } 51695 ] 51704 ] +51707 } 51714 ] +51720 } 51722 ] 51725 ] 51730 ] 51734 ] +} 51740 ] 51745 ] 51753 ] 51760 ] 51768 ] +} 51772 ] +51774 } +51780 } 51782 ] 51788 ] 51796 ] 51798 ] 51801 ] +51803 } 51808 ] 51815 ] 51828 ] @@ -3627,38 +6350,63 @@ 51881 ] 51895 ] 51899 ] +51902 } 51911 ] -51919 ] +51918 } +] +51921 } 51937 ] 51941 ] 51950 ] 51952 ] +} 51968 ] -51990 ] +51979 } +51984 } +51990 )] 52018 ] ] 52031 ] 52044 ] 52047 ] +52062 } 52076 ] 52080 ] +52085 } +52101 } 52109 ] 52112 ] +52115 } 52133 ] 52138 ] 52140 ] -52161 ] -52165 ] +52160 } +] +52164 } +] 52167 ] +52170 } +52173 } 52188 ] 52193 ] +52203 } 52227 ] +52256 } +52265 } +52273 } +52282 } +52285 } +52289 } +52294 } 52313 ] -52335 ] -52357 ] -52366 ] +52335 )] +52347 } +52357 )] +52365 } +] +52373 } 52377 ] -52389 ] +52389 )] 52399 ] 52407 ] 52417 ] @@ -3672,8 +6420,14 @@ 52460 ] 52478 ] 52488 ] +52491 } +52502 } +52504 } +52507 } 52518 ] 52571 ] +52577 } +52581 } 52587 >> 52601 ] 52603 ] @@ -3681,14 +6435,17 @@ 52620 ] 52638 ] 52664 ] +52668 } 52684 ] 52702 ] +52707 } 52718 ] 52733 ] ] +52736 } 52749 ] 52751 ] 52768 ] -52787 ] +52787 }] 52811 ] 52829 ] diff --git a/tf/0.3/atfpre.tf b/tf/0.3/atfpre.tf index a3e4a09..f29fe25 100644 --- a/tf/0.3/atfpre.tf +++ b/tf/0.3/atfpre.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z [ 9 [ @@ -16,22 +16,26 @@ 57 < 66 [ 91 [ +111 { 119 [ 144 [ +155 { 162 [ 177 [ 196 [ 227 [ 248 [ 256 [ -258 [ +258 [{ 260 [ +262 { 264 [ 268 [ 284 [ 287 [ 296 [ 301 %sux [ +305 { 310 %sux [ 326 %sux [ 341 %sux [ @@ -52,24 +56,29 @@ 557 [ 587 [ 619 [ +634 { 639 [ 654 [ 673 [ 680 [ 687 [ 704 [ +707 { 711 [ +{ 716 [ 725 [ 741 [ -755 [ +755 {[ 767 [ +772 { 775 [ 782 [ 794 [ 802 [ 816 [ 823 [ +826 { 833 [ 836 [ 852 [ @@ -80,7 +89,8 @@ 896 [ 902 [ 908 [ -921 [ +920 { +[ 924 [ 938 [ 941 [ @@ -96,17 +106,25 @@ 1009 [ 1026 [ 1043 [ +1061 { 1066 [ 1081 [ +1096 { 1101 [ 1123 [ +1139 { 1145 [ +1153 { 1159 [ [ +1175 { +1180 { 1183 [ [ 1200 [ [ +1212 { +1216 { 1222 [ 1224 [ 1233 [ @@ -117,6 +135,7 @@ 1277 [ 1291 [ 1294 [ +{ 1305 [ 1308 [ 1314 [ @@ -125,6 +144,7 @@ 1335 [ 1358 [ 1363 [ +1365 { 1368 [ 1370 [ 1372 ( @@ -134,17 +154,21 @@ 1386 [ 1396 [ 1399 [ +1401 { 1413 [ [ 1429 [ [ +1437 { 1440 [ 1442 [ 1449 [ [ 1464 [ [ +1467 { 1472 [ +{ 1475 [ 1484 [ 1486 [ @@ -153,12 +177,16 @@ 1497 [ 1500 [ [ +{ 1505 [ +1508 { 1510 [ +1513 { 1515 [ 1522 [ 1528 [ 1533 [ +1537 { 1539 [ 1543 [ 1547 [ @@ -166,10 +194,15 @@ 1550 [ 1553 [ 1556 [ +1561 { 1571 [ +1574 { +1577 { 1581 [ +1588 { 1590 [ 1596 [ +1601 { 1605 [ 1612 [ 1615 [( @@ -180,6 +213,7 @@ 1630 [ 1634 [ 1644 [ +{ 1647 [ 1655 [ 1658 [ @@ -187,6 +221,7 @@ 1667 [ 1672 [ 1677 [ +{ 1681 [ 1686 [ 1689 [ @@ -194,19 +229,32 @@ 1694 [ 1720 [ 1723 [ +1735 { 1749 [ 1754 [ 1781 [ 1784 ( 1787 [ +1800 { 1813 [ +1824 { 1827 {( -1835 [ +{ +1831 { +1833 { +1835 [{ 1859 [ 1885 [ +1891 { +{ +1902 { 1905 [ +1909 { 1929 [ +1938 { 1946 [ +1950 { +1958 { 1962 [ 1967 [ 1992 [ @@ -218,6 +266,9 @@ 2030 [( 2045 [ 2047 [ +2055 { +2058 { +2060 { 2063 [ 2069 [ 2089 [ @@ -228,16 +279,24 @@ 2130 [ 2142 [ [ +2145 { 2155 [ [ 2173 [ -[ -2181 [ +[{ +2180 { +{[ 2189 [ +2191 { +2197 { 2201 [ 2213 [ -2224 [ +2223 { +[ +{ +2232 { 2234 [ +2236 { 2244 [ 2250 [ 2264 [ @@ -251,13 +310,17 @@ 2311 [ 2313 [ 2316 [ +2327 { 2331 [ -2337 [ +2336 { +[ 2355 [ 2385 [ 2410 [ 2431 [ +2436 { 2456 [ +2459 { 2476 [ 2485 [ 2489 ( @@ -270,26 +333,35 @@ 2543 [ 2553 [ 2565 [ -2577 [ +2577 {[ 2588 [ 2595 [ 2620 [ +2623 { +2625 { 2627 [ +2635 { 2639 [ 2644 [ 2650 [ 2659 [ 2661 [ 2667 [ +2671 { +2683 { 2686 [ -2691 [ +2690 { +[ +2693 { 2700 [ 2704 [ 2733 [ +{ 2756 [ 2758 ( 2768 {( 2770 [ +2776 { 2778 [ 2797 [ 2827 [ @@ -297,83 +369,123 @@ 2848 [ 2867 [ ( +2876 { 2883 [ 2902 [ +{ 2908 ( 2918 [ 2926 [ 2934 [ 2949 [ 2952 [ +2962 { 2967 [ 2981 [ +2991 { 2998 [ ( +{ 3013 [ 3019 [ 3030 [ 3045 [ 3056 [ +3063 { 3069 [ 3080 [ +3082 { +3089 { 3094 [ +3098 { 3109 [ 3117 [ 3133 [ 3164 [ 3197 [ +3199 { +3203 { +3208 { 3212 [ 3219 {( 3228 [ 3240 [ 3256 [ 3262 [ +3269 { 3274 [ +3279 { 3287 [ 3294 [ 3308 [ +3311 { 3315 [ +3328 { 3333 [ 3349 [ -3374 [( -3395 [ +3374 [({ +3379 { +3382 { +3387 { +3394 { +[ +3398 { +3403 { 3409 [ +3420 { 3423 [ [ 3432 [ 3443 [ [ +3454 { 3456 [ +3460 { 3468 [ [ +3479 { 3482 [ +3488 { 3492 [ 3494 [ 3515 [ 3517 [ +3537 { 3540 [ 3542 [ +3554 { 3566 [ -3568 [ +{ +[ 3582 [ +3594 { 3599 [ 3601 [ 3611 [ -3620 [ -3628 [ +{ +3619 { +[ +3628 {[ 3637 [ +3642 { 3658 [ +3663 { +3678 { +3684 { 3686 [ +3692 { 3708 [ 3718 [ 3724 [ 3730 [ 3732 [ 3735 [ +{ 3739 [ [ 3745 [( [ +3749 { 3759 [ 3762 [ 3772 [ @@ -381,44 +493,63 @@ 3794 [ 3796 [ 3798 [ -3813 [ +3810 { +3812 { +[ 3828 [ 3848 [ +{ 3854 [ +3866 { 3875 [ +3881 { 3888 [ ( 3894 [ 3905 [ +3917 { 3923 [ +{ +3928 { 3931 [ 3952 [ 3961 [ +3963 { 3979 [ 3990 [ 3994 [ +3996 { +3999 { 4020 [ 4024 [ 4029 [ 4037 [ 4042 [ +4045 { 4055 [ 4072 [ 4086 [ 4094 [ +4097 { 4107 [ +4113 { 4116 [ 4118 [ 4135 [ 4151 [ +4164 { 4173 [ +4175 { +4182 { 4185 [ 4196 [ +4199 { 4207 [ 4215 [ 4218 [ 4222 [ 4226 [ +4232 { 4234 [ 4237 [ 4242 [ @@ -446,14 +577,18 @@ 4355 [ 4360 [ 4363 [ +{ 4369 [ 4377 [ 4386 [ 4398 [ 4412 [ +4418 { +4423 { +4426 { 4431 [ 4448 [ -4461 [ +4461 {[ 4470 [ 4480 [ 4487 [ @@ -461,8 +596,11 @@ 4502 [ 4509 [ 4520 [ +4524 { +4527 { 4529 [ 4539 [ +4548 { 4554 [ 4557 [ 4564 [ @@ -483,52 +621,119 @@ 4628 [ 4633 [ 4637 [ +4639 { +4650 { +4652 { +4655 { 4669 [ 4673 [ 4677 [ 4698 [ 4718 [ +4727 { +4731 { 4740 [ 4756 °\\ 4778 < +4782 { +4788 { +4791 { +4794 { +4797 { +4800 { +4803 { +4844 { 4862 %sux -4879 %akk +4871 { +4879 %akk { 4885 %sux 4900 {( 4907 %sux 4910 %akk +4924 { +4943 { +5005 { 5080 < +5121 { +5126 { +5129 { +5132 { +5135 { +5138 { +5142 { 5151 [ -5167 [ +5166 { +[ +5173 { 5182 [ 5197 [ 5204 [ +5209 { +5213 { 5220 [ 5232 [ 5259 [ +5261 { +5264 { +5266 { +5270 { +5274 { +5278 { +5289 { 5307 [ 5335 [ +5368 { +5384 { +5396 { +5470 { +5477 { 5502 [ 5529 [ [ 5549 [ 5553 [ -5565 [ -5572 [ -5576 [ +5556 { +5564 { +[ +5567 { +5571 { +[ +5576 [{ +5579 { 5586 [ 5596 [ -5616 [ +{ +5610 { +5616 [{ +5621 { 5627 [ -5629 [ +{ +[ +5652 { +5657 { +5663 { 5665 [ [ +5671 { +5675 { +5682 { 5695 [ 5722 [ +5726 { 5754 [ +5763 { 5783 [ +5786 { +5790 { 5810 [ +5813 { +5817 { +5820 { +5823 { +5873 { +5933 { 5940 [ +5944 { 5957 [ 5966 [ 5979 [ @@ -539,41 +744,117 @@ 6001 [ 6003 [ 6007 [ +6013 { 6019 [ 6027 << +6039 { +6055 { +6063 { +6068 { +6073 { +6078 { +6082 { +6087 { +6091 { +6156 { +6158 { 6168 [ -6235 [ +{ +6171 { +6198 { +6209 { +6219 { +6231 { +6234 { +[ 6256 [ +6264 { 6271 [ +6280 { +6283 { +6286 { +6290 { 6293 [ 6318 [ 6341 [ +{ +6348 { +6350 { +6409 { +6413 { +6419 { +6421 { +6423 { 6472 [ 6494 [ [ 6521 [ 6541 [ 6566 [ -6593 [ +6568 { +6584 { +6592 { +[ 6642 [ 6662 [ +6677 { +6680 { +6683 { 6686 [ +6688 { +6695 { +6699 { 6708 [ +6722 { +6727 { 6730 {( +6732 { +6735 { 6742 [ +6754 { +6757 { +6760 { 6763 {( +{ +6767 { 6789 [ +6792 { +6803 { +6805 { 6809 [ 6813 {( 6831 [ +6840 { +6844 { +6847 { +6851 { +6855 { +6861 { +6864 { +6867 { +6870 { +6873 { +6877 { +6901 { +6903 { +6920 { +6924 { +6928 { +6931 { +6934 { +6937 { +6941 { 6943 [ 6954 [ -6962 [ +6961 { +[ +6964 { 6969 [ 6974 [ 6983 [ 6994 [ 7003 [ +7007 { 7012 [ 7023 [ [ @@ -582,10 +863,13 @@ [ 7065 [ 7086 [ +7102 { 7112 [ 7135 [ 7155 [ 7171 [ +7177 { +7182 { 7184 [ [ 7200 [ @@ -593,38 +877,47 @@ 7213 [ 7219 [ 7221 %sux [ +7225 { 7229 [ %sux [ 7246 [ %sux [ 7263 %sux [ +7266 { 7280 %sux [ +7288 { 7296 %sux [ +7299 { 7320 %sux [ 7333 << 7353 [ 7378 %sux [ 7385 %sux [ -7393 [ +{ +7392 { +[ 7401 [ 7417 [ -7423 [ +7423 [{ 7439 [ 7445 [ 7458 [ 7465 [ 7472 [ 7475 [ +7480 { 7490 [ 7500 [ 7515 [ 7521 [ +7523 { 7532 [ +{ 7535 [ 7552 [ 7564 [ -7585 [ +7585 [{ 7593 [ 7606 [ 7613 [ @@ -634,27 +927,46 @@ 7642 [ 7649 [ 7656 [ +7658 { 7660 [ +7665 { 7669 [ 7675 [ 7681 [ 7691 [ 7696 [ 7705 [ +7708 { 7713 [ +7723 { +7727 { 7729 [ +7733 { +7741 { 7752 [ +7777 { 7779 [ +7786 { +7888 { +7892 { +7896 { +7901 { +{ 7909 [ 7924 [ 7927 [ 7945 [ +{ +7955 { 7957 [ 7969 [ 7973 [ +7989 { 7991 [ 7999 [ +8005 { 8011 [ +8014 { 8021 [ 8035 [ 8041 [ @@ -662,25 +974,39 @@ 8068 [ 8073 [ 8079 {( +8083 { +8089 { 8110 [ 8135 [ 8155 [ +8162 { +8167 { 8169 [ 8185 [ 8188 [ 8193 [ 8197 [ [ +8203 { 8212 [ 8224 [ 8241 [ +8246 { +8358 { +8366 { +8424 { +8435 { +8445 { 8500 [ 8521 [ 8528 [ 8546 [ 8554 [ +8570 { 8579 [ [ +8583 { +8587 { 8594 [ [ 8613 [ @@ -691,16 +1017,29 @@ 8660 [ 8672 [ 8682 [ +8685 { 8694 [ 8702 [ +8714 { 8724 [ +8729 { +8740 { +8752 { +8755 { +8760 { +8770 { 8960 [ 8979 [ 9001 [ 9013 [ 9032 [ 9054 [ +9060 { +9064 { +9069 { +9073 { 9076 [ +{ 9084 [ 9093 < 9101 [ @@ -718,24 +1057,42 @@ 9224 [ 9232 [ 9249 [ +9256 { +9259 { +9261 { +9263 { 9265 [ 9276 [ 9287 [ 9297 [ +9300 { +9303 { +9306 { 9309 [ 9319 [ 9323 [ +9326 { +9330 { 9336 [ [ +9340 { 9347 [ 9350 [ +9361 { 9370 [ 9414 < -9542 [ +9417 { +9428 { +9430 { +9432 { +9502 { +9506 { +9542 [{ 9544 [ 9567 [ 9573 [ -9593 [ +9588 { +9593 {[ 9608 [ 9619 [ 9634 [ @@ -743,32 +1100,47 @@ 9653 [ 9663 [ 9666 [ -9673 [ +9671 { +9673 {[ +9729 { +9748 { +9776 { +9793 { +9804 { 9823 [ 9843 [ +9850 { 9859 [ 9880 [ 9902 [ 9915 [ 9928 [ +9932 { 9935 [ 9943 [ -9951 [ +9951 [{ 9960 [ 9966 [ 9976 [ 9981 [ +9986 { 9993 [ 9999 [ +10002 { 10010 [ 10021 [ 10027 [ +{ 10041 [ 10046 [ 10055 [ 10065 [ +10078 { 10081 [ +10089 { 10095 [ +{ +10106 { 10108 [ [ 10111 [ @@ -776,9 +1148,15 @@ 10116 [ [ 10124 [ -10138 [ +10137 { +[ +10141 { +10150 { 10157 [ +10174 { 10179 [ +{ +10182 { 10196 [ 10210 [ 10215 [ @@ -791,6 +1169,7 @@ [ 10240 [ [ +10249 { 10257 [ [ 10266 [ @@ -800,15 +1179,28 @@ 10301 [ 10303 [ 10313 [ +10324 { 10336 [ 10360 [ -10377 [ -10399 [ +10377 [{ +10387 { +10399 [{ +10408 { 10421 [ +{ +10432 { 10434 [ +{ +10443 { 10449 [ +10488 { 10503 [ +10514 { +10519 { 10530 [ +10542 { +10544 { +10547 { 10551 [ 10571 [ 10585 [ @@ -816,50 +1208,88 @@ 10619 [ 10627 [ 10642 [ -10665 [ +{ +10665 [{ +10677 { 10688 [ +10702 { +10705 { +10707 { +10711 { +10716 { +10719 { +10727 { +10733 { +10736 { 10748 [ 10776 [ +10783 { +10790 { 10805 [ +10807 { +10826 { 10832 [ 10859 [ 10884 [ +10890 { 10898 [ 10926 [ +{ +10975 { 10981 [ +10988 { +11001 { 11003 [ +11017 { 11020 [ +11030 { 11033 [ 11043 [ 11050 [ -11058 [ +11053 { +11055 { +11058 [{ 11064 [ 11072 [ 11079 [ 11083 [ 11092 [ +11094 { +11096 { 11100 [ +11106 { 11119 [ 11124 [ +11134 { +11139 { 11144 [ +11149 { 11154 [ +{ 11160 [ 11166 [ 11168 [ 11175 [ +11182 { 11187 [ [ -11206 [ +11203 { +11206 {[ 11209 [ +11217 { 11226 [ 11228 [ 11242 [ 11244 [ -11249 [ +11246 { +11249 {[ +11251 { +11253 { 11264 [ 11271 [ 11286 [ 11295 [ +11299 { 11304 [ 11307 %sux 11312 [ @@ -888,12 +1318,15 @@ 11448 [ [ 11452 [( +11454 { 11456 [ [ 11460 [ 11466 [ 11468 [ +11474 { 11481 [ +11486 { 11488 [ 11497 [ 11506 [ @@ -903,76 +1336,160 @@ 11545 [ 11550 [ 11557 [ +11564 { 11569 [ -11574 [ +11574 {[ +11579 { 11582 [ 11587 [ 11594 [ 11597 [ +11603 { 11608 [ [ +11616 { 11621 [ 11623 [ +11630 { 11635 [ 11637 [ 11650 [ 11653 [ +11668 { +11674 { 11676 [ 11679 [ +11690 { 11701 [ +11715 { 11720 [ +11731 { 11745 [ +11750 { +11763 { 11772 [ +11776 { +11787 { 11793 [ +11809 { 11815 {( 11821 [ +11834 { 11842 [ 11848 {([ +11864 { 11871 [ 11879 [ +11889 { 11896 [ +11912 { +11923 { +11928 { 11932 [ +11945 { 11949 [ -11967 [ +11959 { +11967 [{ +11973 { +11979 { 11983 [ +11986 { +11996 { 12002 [ +12004 { +12012 { 12016 [ +12022 { 12024 [ +12029 { 12035 [ +12045 { 12049 [ +12053 { +12059 { 12063 [ +12074 { 12078 [ +12089 { 12093 [ +12100 { +12118 { 12122 [ +12133 { 12137 [ +12144 { 12148 [ 12163 [ 12183 [ +12185 { +12191 { +12197 { +12202 { 12208 [ +{ +12267 { 12276 [ +12284 { 12300 [ +12303 { +12306 { +12308 { +12313 { +12320 { 12333 [ +12336 { +12339 { +12342 { 12362 [ +12383 { 12388 [ +12399 { 12418 [ +12426 { +12429 { 12443 [ 12447 [ +12449 { +12452 { +12455 { 12465 [ +12470 { 12481 [ 12504 [ -12513 [ +12512 { +[ +12515 { 12544 [ +12552 { +12555 { +12559 { +12563 { 12567 [ +12570 { 12583 %sux 12587 [ 12592 %sux 12609 [ -12628 [ +12619 { +12623 { +12625 { +12628 {[ +12630 { +12633 { +12636 { +12638 { +12643 { 12647 [ +{ +12652 { +12655 { +12659 { +12671 { 12676 [ 12698 [ 12720 [ 12722 [ +12739 { 12768 [ 12788 %sux 12797 [ @@ -981,66 +1498,131 @@ 12823 [ 12842 [ 12846 [ +12851 { +12858 { +12862 { 12866 [ 12892 [ 12894 %sux [ 12909 [ +12918 { +12928 { +12932 { 12943 [ 12957 [ 12984 [ 13010 [ -13077 [ -13104 [ +13033 { +13056 { +13070 { +13074 { +13076 { +[ +13079 { +13090 { +13093 { +13099 { +{ +13103 { +[ 13133 [ +13197 { +13201 { +13205 { +13217 { 13242 [ 13266 [ 13292 [ 13317 [ +13337 { 13343 [ 13367 [ +13374 { 13394 [ +13398 { +13409 { 13423 [ +13491 { +13494 { +13497 { +13510 { +13514 { 13518 [ 13550 [ 13571 [ 13597 [ 13617 [ 13634 [ +13641 { 13664 [ 13684 [ -13702 [ -13719 [ -13744 [ +13702 [{ +13719 {[ +13723 { +13726 { +13729 { +13734 { +13737 { +13739 { +13744 [{ +13755 { 13763 [ 13779 [ -13787 [ +13784 { +13787 {[ +13789 { +13794 { 13796 [ +13802 { +13805 { +13808 { 13810 [ +13812 { 13819 [ -13838 [ +13838 {[ 13849 [ +13856 { +13858 { 13869 [ +13875 { +13886 { 13889 [ 13898 [ +{ 13919 [ 13926 [ 13933 [ 13936 [ +13940 { +13944 { +13946 { 13950 [ 13953 [ 13956 [ +13963 { 13973 [ +13979 { +13984 { +13988 { 13990 << 13993 [ +14004 { 14019 [ +14025 { +14028 { +14030 { +14033 { 14035 [ +14037 { 14039 [ 14050 [ 14056 [ 14070 [ +14078 { 14084 [ 14088 [ 14098 [ +{ 14105 [ 14112 [ 14125 [ @@ -1048,15 +1630,21 @@ 14144 [ 14158 [ 14164 [ -14174 [ -14180 [ +14168 { +14171 { +14173 { +[ +14177 { +14180 {[ 14186 [ -14191 [ +14191 {[ 14196 [ +14208 { 14210 [ 14220 [ 14232 [ 14241 [ +14247 { 14250 [ 14255 [ 14257 [ @@ -1065,66 +1653,109 @@ [ 14262 [ 14265 [ +{ 14271 [ -14279 [ +14275 { +14278 { +[ 14283 [ 14290 [ [ +14300 { 14303 [ +14315 { +14326 { +14328 { +14331 { 14369 [ 14392 [ +14403 { +14407 { 14443 [ 14454 [ -[ +[{ +14458 { 14461 [ [ -14472 [ +14465 { +14468 { +14472 {[ 14474 [ +14477 { 14482 [ [ 14498 [ 14516 [ 14533 [ +{ +14536 { +14540 { +14543 { +14547 { 14550 [ 14571 [ +{ +14574 { 14580 [ 14589 < 14596 [ 14614 [ 14616 [ +14620 { +14623 { +14626 { 14628 [ 14630 [ 14641 [ [ 14655 [ 14669 [ -14685 [ +14673 { +14685 {[ +14687 { 14698 [ 14700 [ +14720 { 14728 [ [ 14752 [ [ +14756 { 14764 [ 14789 [ +14795 { +14798 { +14802 { 14809 [ [ -14834 [ -14836 [ +14833 { +[ +14836 [{ +14839 { +14842 { +14845 { +14849 { 14857 [ 14859 [ -14877 [ +14868 { +14870 { +14877 {[ 14879 [ 14884 [ +14886 { 14901 [ 14904 [ -14909 [ +14909 [{ 14924 [ +14932 { 14936 [ 14949 [ +{ 14958 [ 14973 [ 14992 [ +14997 { +15004 { 15006 [ 15013 [ 15037 [ @@ -1137,10 +1768,12 @@ [ 15099 [ 15105 [ +{ 15112 [ 15120 [ 15130 [ 15139 [ +15144 { 15149 [ 15152 [ 15156 [ @@ -1148,41 +1781,86 @@ 15165 [ [ 15170 [ +15181 { +15185 { 15187 [ +15191 { +15196 { +15202 { 15209 [ 15233 [ +15251 { +{ +15255 { +15258 { 15266 [ 15289 [ 15296 [ -15311 [ +15298 { +15300 { +15303 { +15308 { +15311 {[ +15313 { +15316 { 15318 [ +15320 { +15323 { +15325 { +15328 { 15330 [ 15344 [ 15357 [ -15370 [ +15369 { +[ +{ 15376 [ +15382 { +15384 { +15386 { 15392 [ 15413 [ -15432 [ -15451 [ -15467 [ -15481 [ +15428 { +15431 { +[ +15438 { +15450 { +[ +15464 { +15467 {[ +15473 { +15481 [{ 15488 [ ( 15498 [ -15505 [ +15501 { +15504 { +[ 15517 [ 15523 [ -15540 [ +15536 { +15539 { +[ +{ +15546 { +15553 { 15557 [ 15563 [ +15574 { 15578 [ 15591 [ -15660 [ +15596 { +15602 { +15612 { +15648 { +15660 [{ +15666 { +15669 { 15676 [ 15688 [ [ -15707 [ +15702 { +15707 {[ 15714 ( 15724 [ 15735 [ @@ -1192,6 +1870,7 @@ 15770 [ 15791 [ 15810 [ +15820 { 15826 [ 15841 [ 15861 [ @@ -1202,114 +1881,273 @@ 15939 [ 15950 [ 15975 [ +15993 { 16002 [ +16019 { +16023 { 16029 [ 16040 [ +{ +16058 { 16060 [ +16069 { +16074 { 16079 [ +16084 { +16088 { +16095 { +16098 { 16101 [ +16118 { +16121 { 16123 [ +16129 { +16145 { +16147 { +16153 { +16161 { +16186 { +16190 { +16194 { +16203 { +16206 { +16228 { +16230 { +16234 { +16237 { 16278 [ +16292 { +16297 { 16300 [ +{ +16313 { +16318 { +16337 { +16340 { +16342 { +16345 { +16371 { +16374 { +16405 { +16407 { +16428 { +16471 { +16477 { 16529 [ 16544 [ 16548 [ 16556 [ 16574 [ 16587 [ +16593 { +16599 { 16606 [ 16631 [ +16638 { +16641 { 16652 [ 16673 [ 16694 [ +16705 { +16733 { +16772 { +16776 { +16788 { +16793 { +16822 { +16827 { 16852 [ -16867 [ -16873 [ +16867 [{ +16873 [{ +16877 { 16884 [ 16892 [ 16901 [ 16918 [ +16939 { +16942 { 16944 [ +16948 { +16952 { 16957 [ 16959 [ 16969 [ 16973 [ +16992 { +16995 { 17000 [ +17005 { +17013 { 17023 [ +17030 { +17033 { +17036 { +17039 { +17051 { 17055 [ +17064 { +17102 { +17108 { +17111 { +17115 { +17123 { +17125 { +17167 { +17172 { +17204 { +17210 { +17214 { +17245 { +17251 { +17294 { +17309 { +17313 { 17340 [ +17350 { +17360 { 17363 [ 17378 [ 17380 [ [ +17384 { 17388 [ [ 17399 [ 17403 [ +17417 { +17420 { 17422 [ -17427 [ +{ +17427 [{ +17436 { 17441 [ 17445 [ +17447 { 17469 [ -17493 [ -17512 [ +17483 { +17487 { +17492 { +[ +17496 { +17501 { +17511 { +[ +17515 { +17520 { +17524 { 17530 [ +17535 { +17538 { 17548 [ 17565 [ 17583 [ 17600 [ 17613 [ -17617 [ +17617 {[ +17619 { +17623 { 17627 [ 17632 [ 17644 [ 17649 [ +17653 { 17664 [ 17666 ( 17670 [ +17675 { +17678 { +17683 { 17685 [ +17688 { 17690 [ +17693 { +17698 { +17702 { 17707 [ 17709 ( -17713 [ +17712 { +[ +{ +17719 { +17721 { +17726 { 17730 [ +17732 { 17735 [ +17739 { +17744 { +{ 17751 [ 17754 ( 17757 [ +17759 { 17781 [ -17819 [ +17818 { +[ +17821 { +17836 { 17849 [ 17871 [ 17896 [ 17915 [ -17933 [ +17925 { +17929 { +17932 { +[ ( +{ +17939 { +17943 { 17951 [ [ 17971 [ +17974 { +17977 { +17983 { 17987 [ +17999 { +18002 { +18005 { 18007 [ +{ +18013 { +18017 { 18029 [ +18031 { +18061 { +18064 { +18068 { +18071 { 18125 [ +18137 { +18140 { 18148 [ ( +18161 { +18164 { +18168 { 18170 [ 18190 [ +18204 { +18208 { 18210 [ 18219 [ +18222 { 18225 [ 18230 [ +18236 { 18239 [ 18243 [ 18248 [ -18252 [ -18255 [ +18252 {[ +18255 {[ 18262 [ +18267 { 18272 [ 18284 [ 18290 [ 18300 [ +18311 { 18314 [ 18322 [ 18324 [ @@ -1319,55 +2157,128 @@ 18337 [ 18341 [ 18351 [ +18364 { 18367 [ 18376 [ 18387 [ 18402 [ 18411 [ +18419 { 18427 [ -18452 [ +18444 { +18447 { +18451 { +[ +18464 { 18470 [ +18477 { 18492 [ +18509 { 18515 [ 18533 [ 18560 [ 18573 [ 18579 [ 18597 [ +18606 { 18611 [ +18617 { +18619 { +18622 { 18639 [ 18652 [ 18673 [ 18680 [ +18694 { +18698 { 18705 [ 18728 [ 18737 [ -18748 [ +18744 { +18748 {[ +18750 { +18753 { 18756 [ 18765 [ 18773 [ +18775 { 18780 [ +18786 { +18788 { 18791 [ 18804 [ -18813 [ +18807 { +18812 { +[ 18824 [ 18834 [ +18841 { +{ 18850 [ +18853 { 18858 [ 18870 [ +18878 { 18882 [ 18892 [ 18903 [ +18906 { +18911 { +18915 { 18920 [ 18934 [ 18938 [ -18959 [ +18957 { +18959 {[ +18963 { 18967 ( +18970 { +18976 { 18985 [ +18992 { 19014 [ +19045 { +19048 { +19051 { +19054 { +19057 { +19060 { +19063 { +19072 { +19077 { +19107 { +19109 { +19113 { +19116 { +19124 { +19159 { +19173 { +19202 { +19208 { +19220 { +19223 { +19225 { +19227 { +19232 { +19235 { +{ +19255 { +19277 { +19292 { +19295 { +19304 { +19311 { +19323 { +19327 { 19345 [ +19348 { 19364 [ +{ +19371 { +19375 { 19387 [ +19407 { +19411 { 19426 %sux 19433 [ 19445 [ @@ -1375,25 +2286,42 @@ 19463 %sux 19466 [ 19513 [ +19521 { +19523 { +19527 { 19529 [ 19533 ( +19536 { +19547 { 19549 [ 19562 [ +19564 { 19574 [ 19585 [ 19596 [ -19599 [ +19599 {[ +19601 { +19605 { 19623 [ +19627 { 19629 [ 19637 %sux 19647 [ +19649 { 19658 [ +{ +19668 { 19679 [ 19692 [ +19695 { 19698 [ ( +19701 { +19703 { +19712 { 19716 [ 19723 [ +{ 19735 [ 19742 [ 19747 [ @@ -1414,7 +2342,8 @@ 19862 [ 19871 [ 19887 [ -19889 [ +19889 [{ +19893 { 19901 [ [ 19914 [ @@ -1425,90 +2354,136 @@ 20025 [ 20039 [ 20061 [ +{ 20067 [ 20069 [ [ +20086 { +20090 { 20107 [ +20128 { 20133 [ -20135 [ +20135 {[ 20137 °\\ -[ +{[ 20140 [( +20144 { 20161 [ 20167 [ 20182 [ 20189 [ 20199 [ +20223 { 20225 [ +20238 { 20253 [ -20300 [ -20315 [ +20300 {[ +20315 {[ 20330 [ +20349 { 20355 [ +20358 { +20377 { +20381 { +20403 { +20405 { 20412 [ 20420 [ 20434 [ 20437 ( 20445 [ +20447 { +20449 { +20452 { +20454 { 20456 [ +{ 20460 [ 20464 [ +20470 { 20479 [ 20483 ( 20504 [ +20517 { 20520 [ 20527 [ +20542 { 20555 [ +20564 { 20566 [ [ -20576 [ +20576 [{ 20580 [ +20582 { 20586 [ 20599 [ -20613 [ +20609 { +20613 [{ +20625 { +20627 { 20640 [ +20649 { 20658 [ 20670 [ 20672 ( 20677 [ +20688 { 20697 [ 20707 [ 20710 ( +{ 20728 [ 20734 [ 20755 [ 20765 [ +20780 { 20783 [ 20790 [ 20804 [ 20814 [ +20816 { 20830 [ 20839 [ -20845 [ +20841 { +20844 { +[ +20847 { 20849 [ +20854 { 20859 [ 20866 [ +{ 20871 [ 20886 [ -20892 [ +20892 [{ 20903 [ +{ 20917 [ 20919 ( -20923 [ +{ +20922 { +[ ( 20931 [ +20938 { +20941 { 20943 [ 20953 [ 20963 [ +20965 { 20973 [ 20982 [ 20992 [ +{ +20997 { 21001 [ 21005 [ -21010 [ +21009 { +[ 21014 [ 21019 [ 21025 [ +{ 21030 [ 21033 [ 21036 [ @@ -1518,42 +2493,70 @@ 21045 [ 21050 [ 21052 [ -21055 [ -21060 [ +21054 { +[ +21059 { +[ 21064 [ +21069 { 21073 [ 21080 [ 21087 [ +21093 { 21108 [ +21124 { +21133 { 21135 [ +21139 { +21141 { 21143 [ 21157 [ 21166 [ 21171 ( 21194 [ 21216 [ +21235 { 21241 [ 21245 [ -21254 [ -21271 [ +21249 { +21253 { +[ +21267 { +21271 {[ +21285 { 21289 [ +{ 21310 [ +21315 { +21318 { 21328 [ +{ +21340 { 21344 [ 21354 [ 21363 [ +21376 { 21381 [ +21388 { +21397 { 21399 [ +{ 21415 [ 21421 [ +{ 21424 [ 21426 [ 21435 [ +21444 { 21448 [ +21458 { +21461 { 21472 [ 21491 [ 21500 [ +21506 { 21516 [ +21518 { 21538 [ 21548 [ 21558 [ @@ -1566,58 +2569,93 @@ [ 21610 [ 21612 [ -21619 [ +21616 { +21618 { +[ 21631 [ 21641 [ 21655 [ 21667 [ 21680 [ +21682 { 21711 [ +21723 { 21739 [ +21760 { 21768 [ -21795 [ +21783 { +21789 { +21794 { +[ [ +21803 { +21805 { +21817 { 21820 [ 21823 [ 21835 [ 21840 [ -21858 [ +21857 { +[ 21862 [ +21864 { 21876 [ 21886 [ +21892 { 21913 [ 21931 [ +21935 { +21938 { +21950 { 21953 [ 21975 [ 21978 [ +21981 { 21991 [ 21997 ( [ 22008 [ [ +22012 { 22023 [ 22031 ( [ +22039 { 22042 [ 22056 [ 22064 [ +{ 22075 [ +{ 22083 [ -22092 [ +22092 [{ +22094 { 22098 [ +{ +22106 { 22109 [ 22116 [ -22137 [ -22160 [ +22119 { +22128 { +22133 { +22137 {[ +22145 { +22160 {[ +22170 { 22175 [ +22177 { +22180 { +22192 { 22199 [ 22215 [ -22236 {( +22234 { +22236 {({ 22239 [ 22246 [ 22257 [ 22262 [ 22266 [ +22270 { 22272 [ 22277 [ 22284 [ @@ -1628,19 +2666,29 @@ 22320 [ 22327 [ 22332 [ -22347 [ +22347 {[ 22352 [ +22354 { +22357 { 22374 [ 22381 [ 22394 [ +{ +22405 { +22409 { 22412 [ 22416 [ 22427 [ +22433 { 22439 [ +22442 { 22451 [ +22461 { 22463 [ 22475 [ +22484 { 22488 [ +{ 22494 [ 22502 [ 22510 [ @@ -1651,14 +2699,20 @@ 22555 [ 22562 [ 22574 [ +22585 { 22591 [ +22593 { +22598 { 22600 [ +22605 { 22609 [ 22619 [ 22622 [ -22628 [ +22628 {[ 22631 [ +{ 22635 [ +22639 { 22642 [ 22645 [ 22648 [ @@ -1676,6 +2730,7 @@ [ 22669 [ 22671 [ +22674 { 22676 [ [ 22680 [ @@ -1685,7 +2740,7 @@ 22704 [ 22711 [ 22719 [ -22726 [ +22726 {[ 22732 [ 22734 [ [ @@ -1719,65 +2774,92 @@ 22822 [ 22827 [ 22830 [ -22834 [ +22833 { +[ 22838 [ 22843 [ 22849 [ +22851 { 22855 [ 22859 [ 22867 [ +{ 22871 [ 22877 [ 22885 [ -22892 [ +22891 { +[ 22901 [ 22909 [ 22917 [ 22923 [ +22938 { 22941 [ 22954 [ 22964 [ +{ 22979 [ +22982 { 22985 [ 22992 [ +22995 { 22998 [ 23004 [ +23006 { +23010 { +23013 { +23020 { 23033 [ 23038 [ 23059 [ 23080 [ +23091 { 23101 [ 23121 [ +23125 { 23142 [ 23153 [ 23158 [ 23160 [ -23164 [ +23163 { +[ [ +23169 { 23182 [ 23198 [ 23212 [ +23222 { +23225 { 23237 [ 23239 ( 23256 [ +23268 { 23275 [ 23291 [ 23318 [ 23342 [ +23347 { 23359 [ +{ +23362 { +23365 { 23374 [ +23385 { 23390 [ [ +23402 { 23408 [ [ 23424 [ [ -23432 {( +23429 { +23432 {({ 23439 [ 23458 [ 23460 [ 23479 [ 23481 [ +23492 { 23497 [ 23499 [ 23503 [ @@ -1790,7 +2872,7 @@ 23529 [ 23537 [ 23542 {( -23547 [ +23547 [{ 23556 [ 23561 [ 23563 [ @@ -1808,6 +2890,7 @@ 23602 [ 23608 [ 23617 [ +23620 { 23628 [ 23645 [ 23652 [ @@ -1816,56 +2899,96 @@ 23683 [ 23694 [ 23703 [ +23709 { 23712 [ 23725 [ +23728 { 23733 [ 23737 [ 23743 [ 23758 [ 23769 [ +23773 { 23777 [ +23780 { 23783 [ 23786 [ +23788 { 23803 [ 23818 [ 23826 [ 23829 [ +23843 { +23850 { 23859 [ 23880 [ +23884 { +23894 { 23896 [ +23904 { +23915 { 23917 [ 23935 [ 23961 [ 23975 [ 23979 [ 23996 [ +24001 { +24004 { 24009 [ 24024 [ 24038 [ +24052 { 24056 [ +24061 { 24079 [ +24087 { 24089 [ +{ +24096 { +24100 { +24105 { +24153 { +24164 { +24166 { 24168 [ +{ +24241 { +24245 { 24275 [ 24282 [ 24288 [ +{ +24292 { 24302 [ -24314 [ +24306 { +24313 { +[ 24327 [ 24340 [ +24349 { 24356 [ +24359 { 24364 [ +24367 { 24373 [ +24376 { 24379 [ 24381 [ 24386 [ 24390 [ 24392 [ 24399 [ +{ +24403 { +{ 24414 [ 24430 [ +24439 { +24445 { 24450 [ -24472 [ +24472 [{ +24475 { 24483 [ 24487 [ 24501 [ @@ -1879,7 +3002,10 @@ 24541 [ 24551 [ 24560 [ -24572 [ +24563 { +24572 {[ +24577 { +24584 { 24587 [ 24607 [ 24627 [ @@ -1889,15 +3015,29 @@ 24690 [ 24702 [ 24723 [ +24729 { +24735 { +24738 { 24740 [ +24743 { +24746 { +24748 { +24751 { +24753 { 24757 [ 24759 [ +{ +24763 { +24770 { 24772 [ 24774 [ 24790 [ 24792 [ +24795 { +24798 { 24804 [ 24806 [ +{ 24819 [ [ 24838 [ @@ -1905,12 +3045,15 @@ 24842 ( 24854 [ 24860 [ +{ +24863 { 24867 [ [ 24873 [ [ 24877 [ 24879 [ +{ 24882 [ [ 24885 [ @@ -1924,6 +3067,7 @@ 24899 [ 24901 [ [ +24906 { 24908 [ 24914 [ 24921 [ @@ -1931,60 +3075,109 @@ 24943 [ 24953 [ 24955 [ +24961 { 24969 [ 24981 [ +24998 { 25004 [ +25015 { 25019 [ +{ +25024 { +25031 { 25035 [ 25054 [ 25072 [ 25091 [ 25112 [ +{ +25120 { +25132 { 25136 [ +25144 { 25156 [ +{ +25168 { 25174 [ -25187 [ +25177 { +25186 { +[ +25190 { +25195 { +25201 { 25230 [ 25235 [ 25244 [ 25254 [ +25258 { +25262 { 25264 [ 25276 [ 25279 [ +25299 { +25309 { 25318 [ +25339 { 25343 [ -25359 {( +25346 { +25353 { +25359 {({ 25363 [ +25365 { +25369 { 25372 [ 25386 [ +25391 { 25400 [ 25411 [ 25426 [ +{ 25437 [ 25443 [ 25448 [ +25451 { 25455 [ 25458 [ 25468 [ 25476 [ -25483 {( +25478 { +25483 {({ 25488 [ +25490 { 25492 [ 25497 [ 25503 [ +25515 { 25518 [ 25535 [ +25583 { +25588 { +25591 { +25631 { +25635 { +25658 { +25679 { +25728 { +25733 { +25739 { +25750 { +25755 { 25777 [ -25793 [ +25780 { +25793 [{ 25809 [ 25829 [ +25831 { 25845 [ 25865 [ 25868 ( 25876 [ +25884 { +25890 { 25896 [ 25911 [ 25927 [ +25931 { 25939 [ 25952 [ 25960 [ @@ -1994,35 +3187,78 @@ [ 25979 [ 25985 [ +25989 { +25991 { 25995 [ -25998 [ +25997 { +[ +26008 { +26011 { 26013 [ 26031 [ 26047 [ +26049 { +26053 { +26056 { +26060 { +26070 { +26073 { +26084 { +26091 { +{ +26096 { +26099 { +26105 { +26108 { +26134 { +26137 { +26141 { +{ +26146 { +26149 { +26182 { +26188 { +26191 { +26196 { +26207 { +26218 { +26225 { 26229 [ -26236 [ +26231 { +26235 { +[ 26247 [ 26253 [ +{ 26256 [ 26258 [ 26262 ( [ 26268 [ +{ 26277 [ -26288 [ +26280 { +26284 { +26287 { +[ 26301 [ +26319 { 26321 [ +26336 { 26340 [ 26362 [ 26381 [ 26392 [ 26418 [ +26437 { 26444 [ 26455 [ 26463 [ 26474 [ +26480 { 26486 [ -26490 [ +26489 { +[ 26499 [ 26505 [ 26509 [ @@ -2034,19 +3270,26 @@ [ 26541 [ 26543 [ +26549 { +26557 { 26559 [ 26564 [ +26570 { 26581 ( 26589 [ 26592 [ +{ 26600 [ 26609 [ 26611 [ 26617 [ ( 26620 [ +26631 { 26642 [ 26644 [ +26648 { +26657 { 26661 [ 26669 [ 26687 [ @@ -2056,26 +3299,42 @@ [ 26713 [ 26717 [ +26719 { 26723 [ 26728 [ +26745 { +26749 { 26757 [ 26771 [ 26776 [ 26785 [ +26789 { 26794 [ +26803 { 26805 [ 26813 [ 26826 [ 26830 [ 26834 [ 26849 [ +26856 { +26860 { 26871 [ +26874 { 26883 [ 26900 [ +{ 26909 [ -26932 [ +26924 { +{ +26929 { +26932 [{ +26935 { +26940 { 26958 [ +26962 { 26970 [ +26974 { 26996 [ %sux 27002 %sb @@ -2083,30 +3342,43 @@ 27023 [ 27047 [ 27056 [ +27060 { +27064 { 27086 [ 27114 [ 27125 [ +27128 { 27141 [ %sux 27163 [ 27185 [ +27203 { 27212 [ 27234 [ 27245 [ 27265 [ 27274 [ +27283 { 27302 [ +{ +27321 { 27328 [ 27353 [ +27360 { +27369 { 27380 [ 27403 [ +27407 { 27429 [ 27450 [ +27452 { +27456 { 27462 [ 27466 [ 27469 [ 27477 [ 27486 [ +27489 { 27498 [ 27505 [ %sux @@ -2117,8 +3389,16 @@ [ 27564 [ 27588 [ +27601 { +27611 { 27615 [ +27636 { +27640 { 27644 [ +{ +27649 { +27653 { +27660 { 27671 [ 27679 [ 27709 [ @@ -2126,12 +3406,22 @@ 27729 [%sux 27741 %sb 27758 [ +27771 { 27778 [ +27800 { 27810 [ +27813 { +27819 { 27842 [ 27865 [ 27884 [ +27888 { +27891 { +27896 { +27900 { +27904 { 27906 [ +27911 { 27915 [ 27920 [ 27927 [ @@ -2143,6 +3433,7 @@ 27993 %sb 28008 [ 28025 [ +28045 { 28047 [ 28068 [ 28072 [ @@ -2155,10 +3446,14 @@ 28151 %sux 28158 [ 28170 [ -28179 [ +28178 { +[ 28190 [ 28198 [ -28228 [ +28214 { +28227 { +[ +28233 { 28245 [ 28284 %sux 28303 [ @@ -2171,6 +3466,7 @@ 28391 [ [ 28395 [ +{ 28401 [ 28408 [ 28417 [ @@ -2190,7 +3486,8 @@ [ 28504 %sux 28508 [ -28510 [ +28510 [{ +28519 { 28527 [ [ 28547 [ @@ -2213,8 +3510,11 @@ 28662 [ 28664 [ 28672 [ +{ +28682 { 28688 [ 28690 [ +28701 { 28715 [ [ 28740 [ @@ -2230,12 +3530,16 @@ 28867 %sux 28893 [ 28895 %sux +28901 { 28907 [ +28918 { 28923 %sux +{ 28940 %sux 28956 %sux -28971 %sux +28971 %sux { 28979 [ +28987 { 28991 [ 29004 %sux 29007 [ @@ -2243,26 +3547,34 @@ 29037 [ 29044 [ 29069 [ +29073 { 29082 [ 29086 [ -29092 [ +29092 {[ 29114 [ 29134 [ +29153 { 29156 [ +29161 { +29164 { 29184 [ 29197 [ 29215 [ 29217 [ 29222 [ +29226 { 29244 [ 29246 [ 29272 [ +29277 { 29301 [ 29317 [ 29327 [ +29336 { 29341 [ 29352 [ 29362 [ +{ 29365 [ 29372 [ 29381 [ @@ -2279,34 +3591,48 @@ 29437 [ 29452 [ 29456 [ +29467 { 29480 [ 29482 [ 29501 [ +29508 { 29512 [ +29517 { 29527 [ 29531 ( 29539 [ 29547 [ 29551 [ 29558 [ +29561 { +29565 { +29570 { +29573 { 29576 [ 29601 [ +29611 { 29622 [ 29644 [ 29659 [ +29661 { 29673 [ 29679 [ +29681 { 29683 [ 29692 [ -29701 [ +29700 { +[ 29711 [ 29725 [ 29737 [ 29746 [ +{ +29750 { 29755 [ 29764 [ 29777 [ 29785 [ +{ 29789 %sux 29791 [ 29793 %sb @@ -2323,6 +3649,7 @@ [ 29902 [ [ +29906 { 29918 [ [ %sux @@ -2330,6 +3657,7 @@ 29941 [ 29960 [ 29963 [ +29981 { 29986 [ 29990 [ 30010 [ @@ -2338,22 +3666,30 @@ 30024 [ 30047 [ 30057 [ +30062 { 30080 [ +30082 { 30084 [ +30100 { 30105 [ 30113 [ 30131 [ -30139 [ +30139 {[ +30148 { 30156 [ 30169 [ 30181 [ +30186 { 30193 [ 30207 [ 30228 [ +30231 { +30235 { 30239 [ 30247 [ 30256 [ 30264 [ +30268 { 30283 [ 30285 %sux 30303 [ @@ -2366,10 +3702,17 @@ 30343 [ 30365 [ 30367 [ +30380 { 30389 [ +{ 30394 [ -30419 [ +30415 { +30419 [{ 30423 [ +{ +30428 { +30432 { +30438 { 30446 [ 30450 [ 30457 [ @@ -2381,9 +3724,19 @@ [ 30511 [ 30514 [ +30523 { 30526 [ 30544 [ +30552 { 30563 [ +30566 { +30572 { +30639 { +30642 { +30647 { +30651 { +30655 { +30662 { 30690 [ 30712 %sux 30714 [ @@ -2393,6 +3746,7 @@ 30752 [ 30773 [ 30783 [ +30791 { 30795 [ 30801 [ 30817 [ @@ -2407,11 +3761,15 @@ 30906 [ 30911 [ 30914 [ -30922 [ +30921 { +[ 30934 [ 30954 [ +30957 { 30963 [ -30978 [ +30971 { +30977 { +[ 30983 [ 31005 [ 31011 [ @@ -2434,7 +3792,8 @@ 31136 [ 31138 %sux 31146 [ -31150 [ +31150 [{ +31159 { 31166 [ 31168 [ 31187 [ @@ -2448,6 +3807,9 @@ 31245 [%sux 31256 [ 31270 [ +31280 { +31289 { +31308 { 31358 °\\ 31362 %sux 31397 %sux @@ -2459,20 +3821,24 @@ 31468 %sb 31474 %sux 31502 %sux +31508 { 31517 %sb +31526 { 31531 %sux +{ 31540 %sb 31549 %sux 31558 %sb 31566 %sux [ 31574 %sb -31582 %sux [ -31598 [ +31582 %sux [{ +31598 [{ 31615 %sux [ 31628 [ 31647 [ 31655 [ 31680 [ +31691 { 31694 [ 31709 [ 31718 [ @@ -2499,10 +3865,21 @@ 31888 [ 31909 [ 31931 [ +31951 { 31954 [ +31958 { +31962 { +31966 { +31974 { 31978 [ 32025 [ 32060 [ +32065 { +32070 { +32075 { +32082 { +32097 { +32100 { 32137 [ 32143 [ 32147 [ @@ -2512,59 +3889,148 @@ 32161 ( 32164 [ 32180 [ +32195 { 32197 [ +32214 { 32222 [ +32243 { +32245 { 32248 [ +32255 { +32259 { +32264 { 32270 [ 32287 [ 32302 [ +32321 { 32323 [ -32342 [ -32360 [ +32326 { +32329 { +32332 { +32334 { +32337 { +32339 { +32342 [{ +32345 { +32347 { +32350 { +32356 { +32360 [{ +32366 { +32373 { +32377 { 32381 [ +32390 { +32399 { 32402 [ -32415 [ +32406 { +32409 { +32412 { +32415 [{ +32418 { +32420 { +32424 { +32427 { +32431 { 32434 [ +32438 { +32441 { +32446 { +32450 { 32452 [ +32463 { 32469 [ -32484 [ +32484 [{ +32494 { +32497 { 32501 [ +32506 { +32509 { +32512 { +32517 { 32522 [ -[ +[{ +32526 { +32529 { 32539 [ -[ +[{ +32547 { +32551 { 32556 [ -[ +[{ +32564 { +32566 { +32568 { +32570 { +32576 { +32579 { +32629 { +32636 { +32651 { +32654 { +32657 { +32678 { +32680 { +32688 { 32690 [ +{ 32707 [ +32709 { 32714 [ 32716 [ 32735 [ 32759 [ 32778 [ 32794 %sux [ +32805 { 32812 %sux [ 32828 %sux [ -32843 %sux [ +32843 %sux [{ +32850 { +32856 { 32859 %sux +32888 { +32897 { +32909 { +32919 { +32922 { +32925 { +32930 { +32961 { +33004 { +33007 { +33028 { +33033 { +33044 { +33048 { +33050 { 33078 %sux 33096 %sux +33105 { +33111 { +33125 { +33128 { 33166 [ %sux 33185 %sux [ +33197 { 33200 %sux 33216 [ 33218 [ +{ 33233 [ -[ +[{ [ 33248 [ %sux [ 33261 [ 33263 %sux [ +33273 { 33278 [ 33280 [ +33284 { +33287 { 33297 [ 33302 [ 33315 [ @@ -2579,17 +4045,21 @@ 33414 [ 33438 [ 33457 [ +33474 { 33478 [ 33496 %sux 33501 [ 33508 %sux 33511 [ 33517 [ -33523 %sux +33523 %sux { 33530 [ 33536 [ +33549 { 33552 [ +33557 { 33559 [ +33562 { 33565 [ 33572 [ 33574 %sux @@ -2599,23 +4069,32 @@ 33600 [ 33617 [ ( +33622 { +33661 { 33673 %sux 33684 [ 33686 [ 33688 %sux +33690 { +33697 { 33703 [ %sux 33714 [ 33722 [ ( %sux +33738 { +33741 { 33743 [ 33746 %sux 33757 [ 33764 %sux -33773 [ -33783 %sux +33772 { +[ +33777 { +33783 %sux { 33795 [ +33820 { 33850 %sux 33868 %sux 33886 %sux @@ -2623,10 +4102,13 @@ 33920 [ 33925 %sux 33942 [ +33959 { 33963 [ 33965 %sux 33982 [ 33984 %sux +{ +33991 { 34036 [ 34049 [ 34054 %sux [ @@ -2634,45 +4116,83 @@ 34066 %akk 34068 %sux 34071 %sux [ +{ +34078 { 34080 [ +34084 { 34092 [ 34100 [ 34116 [ 34130 %sux [ +34141 { 34152 %sux [ 34159 ( 34162 [ 34167 [ 34171 [ +34178 { 34185 [ 34189 [ 34195 [ -34205 [ +34199 { +34201 { +34204 { +[ +34207 { +34210 { +34214 { +34227 { 34236 [ +34244 { 34254 %sux +34283 { +34285 { +34314 { 34326 [ +34343 { 34345 [ +34349 { +34365 { +34370 { 34386 [ +34398 { 34409 [ 34424 [ +{ 34433 [ +34445 { 34447 [ +{ 34459 [ 34474 [ +{ 34484 [ -34549 [ +34523 { +34527 { +34534 { +34538 { +{ +34548 { +[ 34570 [ +34574 { 34585 [ 34602 [ +34604 { +34615 { +34617 { +34620 { 34634 [ 34658 [ 34676 [ 34689 [ +34691 { 34697 [ 34714 [ 34732 [ 34751 [ 34773 [ +34787 { 34789 [ 34804 [ 34822 [ @@ -2681,25 +4201,49 @@ 34877 [ 34900 [ 34916 [ +34919 { +34923 { 34935 [ 34947 [ +34959 { 34962 [ 34980 [ +34993 { +34996 { 35000 [ +35010 { 35014 [ 35018 ( +35028 { +35031 { +35033 { 35039 [ 35054 [ +35061 { +35064 { +35066 { +35071 { 35073 [ 35092 [ +35098 { 35115 [ +35124 { +35134 { 35137 [ 35155 [ 35172 [ 35174 ( +35176 { +35188 { 35191 [ +35197 { +35204 { 35210 [ +35217 { +35220 { +35228 { 35230 [ +35234 { 35241 [ 35244 ( 35247 [ @@ -2709,14 +4253,42 @@ 35257 [ 35261 [ 35276 [ +35278 { +35287 { +35296 { +35310 { +35327 { +35343 { 35349 [ +{ 35365 [ +35374 { 35383 [ 35400 [ +35409 { +35436 { +35445 { +35449 { +35473 { +35487 { +35491 { +35498 { +35500 { +35503 { +35506 { +35534 { +35538 { +35549 { +35571 { +35578 { +35604 { +35630 { 35637 [ +35649 { 35656 [ 35663 [ 35673 [ +35687 { 35689 [ 35701 [ 35725 [ @@ -2725,20 +4297,26 @@ 35791 [ 35797 [ 35820 [ +35844 { 35852 [ 35877 [ 35904 [ -35926 [ +35925 { +[ 35955 [ +35971 { 35975 [ 35996 [ 36022 [ 36035 ( 36041 [ +36044 { 36048 [ 36055 [ +36058 { 36061 [ 36067 [ +36087 { 36091 [ 36115 [ 36132 [ @@ -2750,33 +4328,51 @@ 36189 [ 36194 [ 36202 [ -36211 [ +36204 { +36206 { +36210 { +[ 36218 {( +36221 { +36225 { 36227 [ +36233 { 36236 [ +36241 { 36245 [ +36248 { 36252 [ 36258 [ 36267 [ -36271 [ +36271 [{ +36274 { 36276 [ [ -36280 [ +36280 {[ 36282 [ %sux -36286 [ +36285 { +[ 36290 [ 36295 [ 36299 [ 36302 [ [ 36306 ( +{ +36310 { 36313 [ +36325 { 36331 [ 36350 [ +36363 { 36368 [ -36388 [ -36408 [ +36387 { +[ +36394 { +36407 { +[ +36420 { 36430 [ 36450 [ 36471 [ @@ -2785,107 +4381,266 @@ 36509 [ 36519 [ 36543 [ +36550 { +36561 { +36563 { +36565 { 36567 [ 36589 [ 36611 [ 36629 [ +36636 { +36640 { 36644 [ 36657 [ 36672 [ +36699 { +36702 { +36708 { +36728 { +36733 { +36751 { +36758 { +36766 { +36770 { +36786 { +36798 { +36806 { +36811 { +36825 { +36945 { +36961 { +36981 { +36984 { +36986 { +36989 { +37001 { +37018 { +37032 { +37095 { +37122 { +37129 { +37147 { +37156 { +37168 { +37184 { +37192 { +37204 { +37337 { 37339 [ +{ +37342 { 37365 [ 37380 [ 37387 [ +37395 { 37407 [ +37415 { 37428 [ +37435 { 37445 [ +37452 { 37465 [ 37486 [ -37513 [ +37512 { +[ +37517 { +37524 { +37529 { 37540 [ +37554 { 37564 [ 37590 [ 37593 [ 37599 [ 37603 [ 37609 [ +37614 { +37616 { +37619 { 37623 [ +37630 { 37632 [ 37646 [ +37656 { 37658 [ 37670 [ +37673 { 37682 [ -37759 [ +37688 { +37759 [{ +37761 { +37764 { +37770 { 37772 [ -37801 [ +37790 { +37794 { +37801 [{ 37824 [ 37838 [ -37853 [ +37853 [{ +37856 { +37858 { 37862 [ -37874 [ +37865 { +37869 { +37871 { +37874 [{ +37876 { +37881 { 37884 [ 37898 [ +37901 { 37908 [ +{ +37911 { +37913 { +37917 { 37919 [ -37929 [ +{ +37925 { +37929 [{ 37941 [ -37951 [ +37944 { +37947 { +37951 [{ +37954 { +37962 { 37964 [ -37973 [ -37983 [ +37970 { +37972 { +[ +37975 { +37982 { +[ 37988 [ 37990 [ -37999 [ +37997 { +{ +[ +38004 { 38008 [ -38013 [ +38013 [{ 38021 [ 38025 [ +38028 { +38031 { 38035 [ -38043 [ +38043 [{ +38047 { +38050 { 38052 [ +38058 { +38061 { 38065 [ 38072 [ 38085 [ -38090 [ +38089 { +[ +{ 38100 [ 38114 [ -38116 [ +{ +[ 38133 [ +38135 { 38137 [ -38153 [ +{ +38144 { +38147 { +38150 { +38153 [{ +38156 { +38160 { +38163 { 38168 [ 38179 [ +38182 { 38190 [ 38207 [ +38210 { +38216 { 38220 [ +38225 { 38236 [ 38248 [ 38259 [ 38274 [ +{ 38278 [ +{ +38282 { +38286 { +38289 { 38305 [ -38322 [ +38307 { +38311 { +38317 { +38321 { +[ +{ +38328 { +38334 { 38336 [ +{ 38340 {( -38342 [ -38350 [ +{ +[ +38344 { +38346 { +38349 { +[ 38352 [ +38355 { 38359 {( +38361 { 38363 [ +{ 38370 [ +38372 { +38375 { 38381 [ -38395 [ -38409 [ -38425 [ +38395 {[ +38397 { +38400 { +38403 { +38405 { +38409 {[ +38424 { +[ +{ 38433 [ 38437 [ +38444 { 38453 [ 38464 [ 38482 [ +38491 { +38494 { +38497 { +38500 { 38502 [ +38508 { +38515 { +38517 { 38522 [ +38525 { +38528 { +38535 { +38537 { 38542 [ +38546 { +38549 { +38554 { +38557 { 38568 [ +38595 { +38600 { +38606 { +38667 { +38670 { +38675 { +38678 { 38719 [ 38733 [ 38744 [ @@ -2905,8 +4660,9 @@ 38794 %sux 38798 [ 38800 %sux -38804 [ -38807 %sux +38803 { +[ +38807 %sux { 38811 [ 38813 %sux 38817 [ @@ -2917,14 +4673,24 @@ 38843 [ 38853 [ 38864 [ +38871 { 38879 [ +38955 { +38990 { +39019 { +39043 { 39046 [ +{ +39052 { +39056 { 39061 [ 39068 [ +39076 { 39085 [ 39088 [ 39096 [ 39100 [ +{ 39104 [ 39109 [ 39120 [ @@ -2932,22 +4698,76 @@ 39132 [ 39138 [ 39151 [ -39168 [ -39183 [ -39197 [ +39167 { +[ +39182 { +[ +39196 { +[ 39211 [ +39240 { +39256 { +39269 { 39279 [ +39287 { 39306 [ -39771 [ +39327 { +39339 { +39357 { +39388 { +39436 { +39439 { +39441 { +39458 { +39463 { +39577 { +39583 { +39590 { +39597 { +39602 { +39613 { +39623 { +39631 { +39638 { +39646 { +39667 { +39673 { +39680 { +39686 { +39710 { +39723 { +39726 { +39734 { +39742 { +39752 { +39758 { +39766 { +39770 { +[ +39792 { +39797 { +39811 { +39817 { +39862 { +39870 { +39878 { 39884 [ +39886 { +39894 { 39907 [ +39911 { 39923 [ +{ +39936 { 39938 [ +39948 { 39954 [ 39964 [ -39971 [ +39966 { +39971 [{ 39974 [ 39979 [ +39981 { 39984 [ 39988 [ 39995 [ @@ -2958,11 +4778,19 @@ 40021 [ 40030 [ 40047 [ +40054 { +40074 { 40080 [ +40082 { 40105 [ +40107 { +40110 { 40136 [ +40145 { +40151 { 40161 [ 40186 [ +40196 { 40211 [ 40232 [ 40245 [ @@ -2970,32 +4798,83 @@ 40256 [ 40262 [ 40265 [ +40274 { 40285 [ 40289 [ -40317 [ +40299 { +40316 { +[ +{ +40322 { 40339 [ +{ +40343 { +40396 { +40408 { +40421 { +40429 { +40447 { +40464 { +40474 { +40513 { +40524 { +40535 { +40557 { 40566 [ 40586 [ +40618 { +40624 { +40642 { +40649 { +40666 { +40679 { +40699 { +40704 { 40727 [ 40751 [ 40775 [ +40785 { +40791 { +40799 { 40801 [ -40832 [ -40846 [ +40806 { +40814 { +40822 { +40825 { +40831 { +[ +40843 { +40845 { +[ 40851 [ 40875 [ 40905 [ +40910 { +40920 { +40927 { 40930 [ +40935 { +40945 { +40953 { 40957 [ +40964 { +40968 { 40986 [ 41030 [ 41052 [ +41060 { 41072 [ 41095 [ +41101 { +41112 { +41114 { +41117 { 41129 [ 41145 [ 41167 [ 41182 [ +41189 { +41193 { 41200 [ 41212 [ 41232 [ @@ -3008,31 +4887,56 @@ 41275 [ 41292 [ [ +41307 { 41312 [ [ 41331 [ [ +41340 { 41358 [ +41370 { +41388 { 41420 [ +41443 { 41451 [ +41454 { +41464 { +41467 { +41475 { 41477 [ +41481 { 41498 [ +41513 { 41518 [ 41522 [ +41528 { +41535 { +41559 { +41563 { +41566 { 41579 [ +41583 { 41600 [ 41603 [ 41630 [ [ 41635 [ +41639 { +41643 { 41659 [ 41661 [ +41667 { +41671 { +41675 { 41690 [ 41693 [ 41711 [ [ 41718 [ 41722 [ +41725 { +41728 { +41730 { 41733 [ [ 41745 [ @@ -3041,19 +4945,21 @@ [ 41764 [ 41769 [ -41775 [ +41772 { +41775 {[ 41777 [ 41783 [ 41785 [ 41791 [ 41796 [ +41799 { 41802 [ 41804 [ 41808 [ 41814 [ 41816 [ 41819 [ -41826 [ +41826 {[ 41828 [ 41832 [ 41842 [ @@ -3067,13 +4973,20 @@ 41903 [ 41921 [ 41939 [ -41952 [ +41946 { +41952 {[ +41955 { 41959 [ +41969 { 41971 [ -41985 [ +41984 { +[ +41995 { 42002 [ +42006 { 42017 [ 42033 [ +42040 { 42044 [ 42051 [ 42066 [ @@ -3085,6 +4998,8 @@ 42122 [ 42124 [ 42129 < +42138 { +42140 { 42142 [ 42151 [ 42153 [ @@ -3096,14 +5011,25 @@ [ 42221 [ 42226 [ +42240 { 42247 [ +{ 42251 [ 42257 [ +42265 { +42267 { 42276 [ 42279 [ 42282 [ +42285 { +42288 { +42290 { 42308 [ 42316 [ +42323 { +42326 { +42331 { +42333 { 42342 [ 42348 [ 42370 [ @@ -3116,6 +5042,8 @@ 42438 [ 42444 [ [ +42449 { +{ 42467 [ 42471 %sux [ 42487 [ @@ -3125,20 +5053,28 @@ [ 42510 [ 42512 [ +42515 { 42520 [ 42532 [ 42541 [ +{ 42549 [ +42551 { 42555 [ 42565 [ -42567 [ -42572 [ -42583 [ +42567 [{ +42571 { +[ +42576 { +42583 [{ 42585 [ 42602 [ [ +42617 { +42622 { 42626 [ 42628 [ +42649 { 42651 [ 42655 [ 42665 [ @@ -3152,26 +5088,34 @@ 42735 [ 42754 [ 42757 [ +42772 { 42782 [ 42784 [ 42789 [ 42792 [ 42798 [ 42801 [ +{ 42813 [ ( [ 42826 [ 42828 [ +42833 { 42838 [ 42841 [ 42849 [ 42851 [ [ +42862 { +42864 { +42867 { +42870 { 42874 [ [ 42898 [ 42900 [ +42913 { 42924 [ 42926 [ 42935 [ @@ -3197,30 +5141,54 @@ 43079 [ [ 43097 [ +43104 { 43115 [ 43117 [ +43121 { 43123 [ +43134 { 43143 [ [ +43147 { +43158 { +43172 { 43179 [ [ +43183 { 43188 {( +43197 { 43211 [ [ 43236 [ 43257 [ +43275 { +43282 { +43286 { 43291 [ +43311 { +43313 { 43315 [ 43323 [ 43328 [ +43332 { +43335 { 43340 [ +43347 { 43349 [( 43365 [ 43368 [ 43381 [ +43398 { +43400 { 43406 [ +43416 { +43419 { +43422 { +43426 { 43432 [ 43446 [ +43451 { +43453 { 43461 [ [ 43469 [ @@ -3229,21 +5197,51 @@ [ 43476 [ 43480 [ +43483 { 43494 [ [ 43507 [ +43513 { 43525 [ +43533 { +43536 { 43543 [ +43555 { 43561 [ +43584 { 43590 [ -43622 [ +43605 { +43609 { +43616 { +43621 { +[ +43636 { +43639 { 43645 [ +43649 { +43654 { +43658 { +43665 { 43668 [ 43688 [ +43691 { +43700 { +43704 { 43709 [ +43729 { 43731 [ -43752 [ -43781 [ +43733 { +43738 { +43744 { +43748 { +43751 { +[ +43763 { +43768 { +43774 { +43780 { +[ +43797 { 43807 [ 43837 [ 43839 [ @@ -3251,10 +5249,15 @@ 43846 [ 43856 [ [ +43861 { +43863 { 43865 [ 43867 [ +43870 { 43873 [ 43882 [ +43884 { +43890 { 43892 [ 43895 [ 43901 [ @@ -3263,18 +5266,23 @@ 43928 [ 43931 [ 43939 [ +43945 { 43949 [ 43957 [ 43965 [ 43974 [ -43981 [ +43977 { +43980 { +[ 43986 [ 44001 [ 44003 [ +44019 { 44024 [ 44028 [ 44030 [ [ +44037 { 44056 [ [ 44077 [ @@ -3287,10 +5295,13 @@ 44117 [ [ 44122 [ -44133 [ +44132 { +[ +{ 44145 [ 44160 [ 44172 [ +44176 { 44182 [ 44191 [ 44200 [ @@ -3299,10 +5310,14 @@ [ 44219 [ 44226 [ +44230 { +{ +44235 { 44237 [ 44239 [ 44250 [ 44252 [ +44259 { 44265 [ [ 44280 [ @@ -3320,6 +5335,7 @@ 44374 [ 44402 [ 44430 [ +44443 { 44451 [ 44470 [ 44480 [ @@ -3329,72 +5345,158 @@ 44518 [ 44520 [ 44522 [ +44531 { 44540 [ +44547 { +44555 { 44557 [ +44562 { 44573 [ -44591 [ -44602 [ +44591 [{ +44602 {[ +44607 { 44620 [ -44646 [ +44625 { +44630 { +44636 { +44645 { +[ +44675 { +44685 { +44690 { +44718 { +44725 { 44733 [ +44752 { +44755 { +44758 { 44770 [ +44794 { +44800 { +44808 { 44814 [ +44820 { 44836 [ +44856 { 44916 [ +44931 { +44949 { +44961 { +44979 { 45021 [ 45031 [ 45045 [ 45053 [ +45057 { 45062 [ 45070 [ 45078 [ 45084 [ 45097 [ -45113 [ +45113 [{ 45123 [ +45136 { 45139 [ +45144 { 45153 [ 45166 [ +45172 { +45175 { 45179 [ -45189 [ -45200 [ -45210 [ +45188 { +[ +45197 { +45200 [{ +45204 { +45207 { +45209 { +[ 45223 [ +45226 { 45239 [ 45246 [ +{ +45252 { 45259 [ +45263 { 45265 [ +{ +45269 { 45274 [ 45280 [ +45283 { +45287 { 45295 [ 45307 [ +{ +45312 { +45315 { 45319 [ -45331 [ -45337 [ +45325 { +45330 { +[ +45336 { +[ +{ +45345 { 45356 [ 45362 [ 45364 [ 45367 [ 45370 [ 45379 [ +45381 { 45384 [ 45389 [ +45395 { +45397 { +45400 { +45404 { 45413 [ +45422 { +45434 { 45446 [ +45452 { +45471 { 45476 [ +45481 { +45484 { +45488 { 45502 < 45505 [ 45512 [ +45515 { +45535 { 45538 [ -45540 [ +45540 [{ +45543 { +45546 { +45554 { 45560 [ 45562 [ -45588 [ +45577 { +45580 { +45584 { +45588 {[ +45593 { +45595 { 45619 [ -45638 [ -45640 [ -45661 [ +45628 { +45631 { +45634 { +45637 { +[ +45640 [{ +45644 { +45647 { +45650 { +45654 { +45656 { +45661 {[ 45663 [ +{ +45668 { +45685 { 45687 [ [ 45691 [ @@ -3407,6 +5509,7 @@ 45736 [ 45745 [ 45750 [ +45753 { 45757 [ 45762 [ 45771 [ @@ -3423,77 +5526,162 @@ 45802 [ 45807 [ 45813 [ +45815 { 45821 [ +45823 { +45829 { 45833 [ +45835 { 45848 [ +45850 { 45857 [ +45868 { 45877 [ 45896 [ +45899 { 45913 [ +45915 { 45921 [ +45927 { +45933 { 45938 [ 45943 [ +45949 { 45966 [ -45968 [ +45968 {[ +45978 { 45986 [ +46015 { +{ +46034 { 46054 [ +46078 { 46085 [ +{ +46088 { +{ 46113 [ 46141 [ +46144 { 46165 [ +46181 { +46191 { 46195 [ 46223 < 46227 [ 46231 < +46248 { 46254 [ +46256 { +{ 46264 [ +46274 { 46282 [ +46294 { 46299 [ +46312 { 46317 [ -46322 [ +{ +46321 { +[ +46326 { +46329 { 46337 [ 46346 < [ +46354 { 46362 [ 46370 [ +46375 { 46384 [ 46386 [ 46389 [ 46393 [ 46397 [ +46400 { +46402 { +46405 { 46411 [ -46489 [ +46478 { +46481 { +46484 { +46488 { +[ 46510 [ -46534 [ +46526 { +46529 { +46533 { +[ 46561 [ +{ +46575 { +46578 { +46580 { +46584 { +46588 { +46592 { +46597 { +46616 { +46650 { +46663 { +46670 { +46707 { +{ +46715 { 46718 [ +46724 { 46740 [ 46761 [ +46771 { +46773 { 46783 [ 46803 [ 46807 [ +46813 { 46824 [ [ -46828 [ +46828 {[ +46834 { 46838 [ [ -46842 [ +46842 {[ +46855 { 46862 [ 46864 [ +46867 { +46872 { 46881 [ [ 46900 [ 46919 < 46921 [ +46926 { 46954 [ +46970 { +46974 { 46987 [ +46990 { +47003 { +47006 { +47008 { 47014 [ +47016 { +47031 { 47042 [ +47056 { +47060 { 47067 [ -47092 [ +47081 { +47091 { +[ +47096 { +47099 { +47103 { 47122 [ 47150 [ +47159 { 47161 [ +{ 47167 [ 47169 [ 47171 [ @@ -3503,120 +5691,366 @@ 47205 [ 47212 [ 47237 [ -47240 [ +47239 { +[ +47263 { 47267 [ +47281 { 47295 [ +47306 { +47309 { +47313 { +47318 { +{ +47323 { +47326 { 47329 [ +{ +47333 { +47336 { +47339 { +47341 { +47344 { +47352 { 47354 [ +47372 { 47388 [ +47414 { 47420 {( +{ +47428 { +47439 { 47457 < +47475 { 47486 [ +{ +47497 { 47512 [ -47536 [ +47514 { +47518 { +47520 { +47523 { +47526 { +47528 { +47531 { +47534 { +47536 {[ 47541 [ +47562 { 47568 [ 47572 [ 47603 [ 47606 [ +47610 { +47613 { +47616 { +47621 { +47627 { +47631 { 47636 [ +47652 { +47654 { +47656 { +47659 { 47661 [ 47663 [ 47688 [ 47690 [ 47714 [ +47722 { +47725 { +47729 { +47732 { +47734 { +{ 47743 [ +47748 { 47771 [ -47776 [ +47776 {[ 47787 [ -47792 [ +47791 { +[ 47802 [ 47809 [ +47815 { +47823 { 47827 [ 47831 [ 47838 [ 47847 [ +47849 { +47854 { 47877 [ -47909 [ +47884 { +47889 { +47895 { +47899 { +47908 { +[ 47941 [ 47969 [ 48001 [ -48031 [ +48008 { +48010 { +48013 { +48020 { +48025 { +48030 { +[ 48062 [ +48074 { +48080 { 48086 [ +48091 { 48107 [ 48130 < 48134 [ -48164 [ +48157 { +48163 { +[ 48182 [ 48200 [ 48208 [ 48226 [ 48228 [ +48234 { 48242 [ 48246 [ 48264 [ 48280 [ +48304 { 48306 [ +{ +48311 { +48316 { +48319 { +48321 { +48324 { +48326 { 48332 [ +48345 { 48354 [ 48383 [ +48389 { +48403 { 48411 [ +48435 { +48438 { +48441 { 48443 [ +48445 { +48450 { +48515 { +48518 { +48521 { +48524 { +48527 { +48529 { +48535 { +48540 { +48544 { +48548 { +48567 { +48577 { +48636 { +48650 { +48654 { +48664 { +48669 { +48677 { +48683 { +48685 { +48704 { +48708 { +48714 { +{ +48720 { +48722 { +48727 { +48731 { +48735 { +48761 { +48766 { +48778 { +48784 { +48786 { +48789 { +48791 { +48794 { +48810 { +48820 { +48824 { +{ +48827 { +48830 { +48840 { +48844 { 48847 [ 48874 [ 48890 [ 48895 < +48902 { 48904 [ +48909 { 48920 [ -48936 [ -48958 [ +48929 { +48935 { +[ +48945 { +48950 { +48957 { +[ +48965 { +48970 { 48972 [ +48986 { +48992 { 48995 [ +49000 { 49006 [ 49012 [ 49015 [ 49017 [ 49019 [ 49026 [ +{ +49030 { 49036 [ 49048 [ +49052 { 49069 [ 49075 [ 49085 [ 49101 [ +49103 { 49115 [ +49123 { +49126 { +49129 { +49132 { 49135 [ 49157 [ -49185 [ +49185 [{ +49195 { +49197 { +49200 { +49203 { 49218 [ +49229 { 49278 [ +49282 { +49288 { +49295 { +49312 { 49315 [ +49325 { 49340 [ +49344 { +49349 { +49353 { +49361 { +49363 { 49366 [ +49372 { +49387 { +49402 { +49417 { +49423 { +49430 { +49439 { +49453 { +49474 { +49479 { +49488 { +49514 { +49529 { +49556 { +49558 { +49562 { +49566 { +49568 { +49575 { +49589 { 49603 [ +49607 { +49609 { +49612 { +49614 { +49617 { +49622 { +49624 { +49626 { 49628 [ +{ +49635 { +49651 { +49686 { +49689 { +49695 { +49697 { +49702 { +49707 { +49713 { +49715 { 49739 [ 49747 [ 49762 [ +49766 { 49769 [ 49786 [ +49822 { +49827 { +49833 { +49838 { +49851 { 49856 [ 49888 [ 49924 [ 49931 [ -49962 [ +49934 { +49940 { +49945 { +49947 { +49961 { +[ +49966 { 49969 [ +49972 { 49995 [ +50012 { +50016 { +50022 { 50030 [ +50042 { 50072 [ 50106 [ +50111 { +50114 { 50148 [ 50170 [ 50190 [ 50209 [ -50248 [ +50247 { +[ +50255 { +50278 { 50282 [ +50304 { +50307 { +50311 { +50315 { +50318 { +50320 { +50349 { +50353 { +50363 { +50367 { +50428 { +50439 { +50441 { +50444 { +50516 { +50520 { 50548 [ 50558 [ 50560 [ @@ -3629,15 +6063,19 @@ 50606 %sux 50611 [ 50619 [ +50622 { 50624 [ -50637 [ +50637 [{ 50641 [ 50652 %sux [ 50658 [ 50666 %sux 50672 [ +50676 { 50680 [ 50683 [ +50686 { +50690 { 50698 [ 50703 [ 50719 [ @@ -3658,7 +6096,10 @@ 50815 %sux [ 50825 [ 50834 [ -50840 [ +50837 { +50840 {[ +50847 { +50849 { 50852 [ 50861 %sux [ 50867 [ @@ -3677,26 +6118,38 @@ 50936 [ 50945 [ 50948 [ +{ +50952 { 50965 [ 50969 [ 50987 [ [ 51009 [ 51013 [ +51021 { +51025 { 51035 [ 51037 [ +51044 { 51059 [ 51061 [ -51080 [ +51065 { +51079 { +[ 51082 [ +51093 { +51096 { 51104 [ 51108 [ +51120 { 51129 [ 51132 [ 51155 [ [ +51170 { 51172 [ 51174 [ +{ 51186 [ 51190 [ 51207 [ @@ -3711,63 +6164,111 @@ 51238 [ 51240 [ 51242 [ -51254 [ +{ +51247 { +51250 { +51252 { +51254 {[ 51256 ( [ +{ +51261 { +51265 { +51269 { 51272 [ 51288 [ 51302 [ +51319 { +51323 { 51326 [ +51329 { +51333 { 51345 [ 51359 [ 51374 [ +51392 { +51394 { 51397 [( +{ +51400 { +51402 { +51405 { +51408 { +51410 { +51412 { +51416 { +{ 51422 [( +51433 { +51441 { +51443 { 51450 [( +51453 { 51474 [ -51478 [ +51478 [{ +51480 { +51483 { +51485 { +51487 { +51489 { 51499 [( 51507 [ +51510 { +51512 { +51521 { 51523 [ 51529 [ 51540 [ 51545 [ 51559 [ +51569 { 51572 [ 51583 [ 51591 [ +51598 { 51604 [ 51620 [ 51640 [ -51656 [ +51653 { +51655 { +[ +51669 { 51673 [ %sux +51677 { 51684 [ 51686 %sux +51688 { 51693 [ 51696 %sux 51701 [ 51705 %sux +51707 { 51710 [ 51715 %sux -51721 [ +51720 { +[ 51724 [ 51726 %sux 51730 [ 51733 [ -51735 %sux +51735 %sux { 51739 [ 51744 [ 51746 %sux 51753 [ 51759 [ 51768 [ +{ 51771 [ -51781 [ +51774 { +51780 { +[ 51785 [ 51796 [ 51798 [ 51801 [ +51803 { 51808 [ 51815 [ 51828 [ @@ -3785,13 +6286,19 @@ 51875 [ 51890 [ 51896 [ +51902 { 51907 [ 51912 [ +51918 { +51921 { 51933 [ 51938 [ 51945 [ 51951 [ +51953 { 51965 [ +51979 { +51984 { 51988 [ 51990 ( 52016 [ @@ -3799,24 +6306,42 @@ 52030 [ 52043 [ 52045 [ +52062 { 52074 [ 52077 [ +52085 { +52101 { 52108 [ 52110 [ +52115 { 52132 [ 52138 [ [ -52160 [ -52165 [ +52160 {[ +52164 { +[ [ +52170 { +52173 { 52186 [ 52192 [ +52203 { 52226 [ +52256 { +52265 { +52273 { +52282 { +52285 { +52289 { +52294 { 52310 [ 52335 [( +52347 { 52355 [ 52357 ( 52364 [ +{ +52373 { 52377 [ 52389 [( 52398 [ @@ -3832,8 +6357,14 @@ 52460 [ 52473 [ 52488 [ +52491 { +52502 { +52504 { +52507 { 52518 [ 52570 [ +52577 { +52581 { 52586 << 52595 [ 52602 [ @@ -3842,15 +6373,19 @@ 52622 [ 52639 %sux 52644 [ +52668 { 52671 [ 52692 [ +52707 { 52711 [ 52719 %sux 52726 [ 52734 %sux [ +52736 { 52741 [ 52750 %sux [ 52757 [ 52770 [ +52787 { 52789 [ 52813 [ diff --git a/tf/0.3/col.tf b/tf/0.3/col.tf index 685708d..086ee69 100644 --- a/tf/0.3/col.tf +++ b/tf/0.3/col.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59362 1 1 diff --git a/tf/0.3/collated.tf b/tf/0.3/collated.tf index 49359d9..39ca3f9 100644 --- a/tf/0.3/collated.tf +++ b/tf/0.3/collated.tf @@ -6,6 +6,6 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 27444 1 diff --git a/tf/0.3/collection.tf b/tf/0.3/collection.tf index eca7c00..4c6e5c0 100644 --- a/tf/0.3/collection.tf +++ b/tf/0.3/collection.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59226 Kuyunjik diff --git a/tf/0.3/colofon.tf b/tf/0.3/colofon.tf index 35607e7..f127bef 100644 --- a/tf/0.3/colofon.tf +++ b/tf/0.3/colofon.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59375 colophon 60155 colophon diff --git a/tf/0.3/comment.tf b/tf/0.3/comment.tf index fbb327a..a4db798 100644 --- a/tf/0.3/comment.tf +++ b/tf/0.3/comment.tf @@ -6,10 +6,10 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59699 (approximately 10 missing lines) -60084 (erased line) +60084 (erased line)\n (erased line) 60255 (approximately 5 missing lines) 60307 (approximately 23 missing lines) 60331 (approximately 25 missing lines) diff --git a/tf/0.3/damage.tf b/tf/0.3/damage.tf index f22e7d4..fbc3def 100644 --- a/tf/0.3/damage.tf +++ b/tf/0.3/damage.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 6 1 18 1 diff --git a/tf/0.3/description.tf b/tf/0.3/description.tf index 3ba3821..f518b0e 100644 --- a/tf/0.3/description.tf +++ b/tf/0.3/description.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59226 diff --git a/tf/0.3/det.tf b/tf/0.3/det.tf index f4d6bc0..b0670f7 100644 --- a/tf/0.3/det.tf +++ b/tf/0.3/det.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 111 1 155 1 diff --git a/tf/0.3/docnumber.tf b/tf/0.3/docnumber.tf index 63b25c2..82dba97 100644 --- a/tf/0.3/docnumber.tf +++ b/tf/0.3/docnumber.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59226 AO.7482 AO.7765 diff --git a/tf/0.3/erasure.tf b/tf/0.3/erasure.tf index 0a0fcd9..b73181e 100644 --- a/tf/0.3/erasure.tf +++ b/tf/0.3/erasure.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 20137 2 2 diff --git a/tf/0.3/excised.tf b/tf/0.3/excised.tf index 5d9b3fb..3e3068d 100644 --- a/tf/0.3/excised.tf +++ b/tf/0.3/excised.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 6027 1 7333 1 diff --git a/tf/0.3/face.tf b/tf/0.3/face.tf index 781c891..13c0997 100644 --- a/tf/0.3/face.tf +++ b/tf/0.3/face.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59260 obverse obverse diff --git a/tf/0.3/flags.tf b/tf/0.3/flags.tf index abd658a..5133991 100644 --- a/tf/0.3/flags.tf +++ b/tf/0.3/flags.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 6 # 18 # diff --git a/tf/0.3/gloss.tf b/tf/0.3/gloss.tf index 916b04d..d13c476 100644 --- a/tf/0.3/gloss.tf +++ b/tf/0.3/gloss.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 1827 1 1 diff --git a/tf/0.3/grapheme.tf b/tf/0.3/grapheme.tf index 7ae0a41..a01e6c1 100644 --- a/tf/0.3/grapheme.tf +++ b/tf/0.3/grapheme.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z DU₃ DU₃ diff --git a/tf/0.3/lang.tf b/tf/0.3/lang.tf index c42c19b..11121cb 100644 --- a/tf/0.3/lang.tf +++ b/tf/0.3/lang.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 62626 sux sux diff --git a/tf/0.3/lemma.tf b/tf/0.3/lemma.tf index 20a4556..3cfa8f2 100644 --- a/tf/0.3/lemma.tf +++ b/tf/0.3/lemma.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 62396 epuštu I, -šu I diff --git a/tf/0.3/lln.tf b/tf/0.3/lln.tf index 6deba71..ebd4104 100644 --- a/tf/0.3/lln.tf +++ b/tf/0.3/lln.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59314 1 2 diff --git a/tf/0.3/ln.tf b/tf/0.3/ln.tf index d447e7c..1d4fb5f 100644 --- a/tf/0.3/ln.tf +++ b/tf/0.3/ln.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59314 1 2 diff --git a/tf/0.3/lnno.tf b/tf/0.3/lnno.tf index 5b7f6e1..79803be 100644 --- a/tf/0.3/lnno.tf +++ b/tf/0.3/lnno.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59314 1' 2' diff --git a/tf/0.3/missing.tf b/tf/0.3/missing.tf index afe1360..ab679e0 100644 --- a/tf/0.3/missing.tf +++ b/tf/0.3/missing.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 1 1 diff --git a/tf/0.3/modifiers.tf b/tf/0.3/modifiers.tf index e4ea2e6..3bf01d9 100644 --- a/tf/0.3/modifiers.tf +++ b/tf/0.3/modifiers.tf @@ -6,6 +6,6 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 29124 @v diff --git a/tf/0.3/museum.tf b/tf/0.3/museum.tf index 6d820a5..9ba5602 100644 --- a/tf/0.3/museum.tf +++ b/tf/0.3/museum.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59226 The British Museum Louvre Museum diff --git a/tf/0.3/note.tf b/tf/0.3/note.tf index a3ac037..f21b106 100644 --- a/tf/0.3/note.tf +++ b/tf/0.3/note.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 60418 pace CADS242a BBR No. 26 ii 10 @@ -36,7 +36,7 @@ bam480iv26ff ii63ff.seeBAM3iv12f.; Heeßel and Al-rawi 2003, 223 i 30-36; JMC10:12ll.70ff.(AO11447r.18-21) 60508 note:ii67f.seeBAM3iv14f. 60525 note:iii12-15seeJMC14,29ii1ff. -60556 ‘place a say and hear’ = qabâ u šemâ šakin, šuila language, e.g. AGH 108: 21: UFBG 249ff.). +60556 Following lines parallel BM 41289 + 41373 + 44238 i 1-4\n‘place a say and hear’ = qabâ u šemâ šakin, šuila language, e.g. AGH 108: 21: UFBG 249ff.). 60560 note:iii52-56seeBM41373i6-10 60565 join does not look great [SVP] 60570 note:62f.seeJMC14iv8f. @@ -65,6 +65,6 @@ ii63ff.seeBAM3iv12f.; Heeßel and Al-rawi 2003, 223 i 30-36; JMC10:12ll.70ff.(AO 60764 see AMT 24, 2: 8ff.' 60770 see AMT 24, 2: 17ff.' also BAM 539 60777 edition of a similar or the same incantation Collins, medical incantations 276. -60779 iv 34ff.' see AMT 23, 6:1ff. +60779 edition of the incantation Collins, medical incantations 262ff.\niv 31'-34' see AMT 25, 2 r. 15'-28'\niv 31'-39' see CT 17,50: 1-26\niv 34ff.' see AMT 23, 6:1ff. 60788 see CT 17,50: 25f. 60790 see AMT 23, 6: 1'-17'. edition of the incantation Collins, medical incantations 266ff. diff --git a/tf/0.3/number.tf b/tf/0.3/number.tf index b0d6e4d..c70aec4 100644 --- a/tf/0.3/number.tf +++ b/tf/0.3/number.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 5 5 173 2 diff --git a/tf/0.3/oslots.tf b/tf/0.3/oslots.tf index 260d106..79c8cef 100644 --- a/tf/0.3/oslots.tf +++ b/tf/0.3/oslots.tf @@ -5,7 +5,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:20Z 52830 1-4 9-12 diff --git a/tf/0.3/otext.tf b/tf/0.3/otext.tf index 9a235e6..7bae358 100644 --- a/tf/0.3/otext.tf +++ b/tf/0.3/otext.tf @@ -8,5 +8,5 @@ @sectionFeatures=pnumber,face,lnno @sectionTypes=document,face,line @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:20Z diff --git a/tf/0.3/otype.tf b/tf/0.3/otype.tf index dbbbaaf..b0e6ea4 100644 --- a/tf/0.3/otype.tf +++ b/tf/0.3/otype.tf @@ -5,7 +5,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 1-52829 sign 52830-59225 cluster diff --git a/tf/0.3/pnumber.tf b/tf/0.3/pnumber.tf index 19946a6..b091467 100644 --- a/tf/0.3/pnumber.tf +++ b/tf/0.3/pnumber.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59226 P285136 P479250 diff --git a/tf/0.3/primecol.tf b/tf/0.3/primecol.tf index f7dbcea..c5d448d 100644 --- a/tf/0.3/primecol.tf +++ b/tf/0.3/primecol.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59437 1 1 diff --git a/tf/0.3/primeln.tf b/tf/0.3/primeln.tf index 384b88e..33a19b2 100644 --- a/tf/0.3/primeln.tf +++ b/tf/0.3/primeln.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59314 1 1 diff --git a/tf/0.3/publication.tf b/tf/0.3/publication.tf index 054744a..1b230ba 100644 --- a/tf/0.3/publication.tf +++ b/tf/0.3/publication.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59226 Edition by NinMed diff --git a/tf/0.3/question.tf b/tf/0.3/question.tf index a371a7b..922eaf9 100644 --- a/tf/0.3/question.tf +++ b/tf/0.3/question.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 444 1 689 1 diff --git a/tf/0.3/reading.tf b/tf/0.3/reading.tf index b31ee37..8407398 100644 --- a/tf/0.3/reading.tf +++ b/tf/0.3/reading.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 14 su ub diff --git a/tf/0.3/remarkable.tf b/tf/0.3/remarkable.tf index 15c40c9..4013bf0 100644 --- a/tf/0.3/remarkable.tf +++ b/tf/0.3/remarkable.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 1194 1 1198 1 diff --git a/tf/0.3/ruling.tf b/tf/0.3/ruling.tf index f4bcb4d..99c948a 100644 --- a/tf/0.3/ruling.tf +++ b/tf/0.3/ruling.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59314 single ruling single ruling @@ -390,7 +390,7 @@ single ruling single ruling 60083 single ruling - single ruling + single ruling\n single ruling single ruling 60088 single ruling 60091 single ruling diff --git a/tf/0.3/seal.tf b/tf/0.3/seal.tf index c6a30e7..408a075 100644 --- a/tf/0.3/seal.tf +++ b/tf/0.3/seal.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59471 about 20 lines missing 59494 end of column diff --git a/tf/0.3/supplied.tf b/tf/0.3/supplied.tf index e488ce9..8f49ec9 100644 --- a/tf/0.3/supplied.tf +++ b/tf/0.3/supplied.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 57 1 1327 1 diff --git a/tf/0.3/sym.tf b/tf/0.3/sym.tf index cd545f7..0e3bce8 100644 --- a/tf/0.3/sym.tf +++ b/tf/0.3/sym.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z DU₃ DU₃ diff --git a/tf/0.3/tr@en.tf b/tf/0.3/tr@en.tf index 452317c..af29af1 100644 --- a/tf/0.3/tr@en.tf +++ b/tf/0.3/tr@en.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59314 Its ritual: [you rub him with the nagappu of vinegar, you scatter qutru-plant (over it) . . .]. Wording of five spells [for removing? the kurāru-boil]. @@ -22,7 +22,7 @@ Wording of two spells [for healing . . .]. 59340 [The sick? belly?] is bound up like a reed basket, [like water in a river, it does not know where it will go, like water in a well], it is without flow, [like a fermentation vat, its mouth is covered, neither food nor water] is able to enter. [. . . Asalluḫi (took) notice (and told Enki about this. Enki answered)] ‘What I (know, you know as well). Go, my son!’ You should take [a lump? of salt? and ḫašû-thyme, you should cast the spell of Eridu over them], you should put them in the mouth [of the man, son of his god, (and) the man, son? of his god?, can fart it (= the disease) out like excrement], belch it up [like a burp], pass it [from his anus like wind]. [Its ritual: . . ., you cast the incantation over it, he sucks on it in his mouth, and then] he drinks it in beer; then he will get better. [. . .] sick belly? -59346 [. . .] may he release its blockage, [. . . may Asalluḫi, the son of Eridu], release its blockage. +59346 tr.en: \n[. . .] may he release its blockage, [. . . may Asalluḫi, the son of Eridu], release its blockage. [Its ritual: . . . you recite the incantation seven times], he sucks on it in his mouth, and then he will get better. 59350 [Incantation: “Šakkan, his belly is bound up in the steppe], his hands are filled with murderous dust, [he (has) no mother, who cheers him up], he (has) no sister, who takes care of him, [he (is) like a . . .] carrying a dagger.” Incantation-formula. [Its ritual: you take a lump of salt (and) nuḫurtu-plant], you cast the incantation over them, he sucks on them in his mouth, and then he will get better. diff --git a/tf/0.3/trans.tf b/tf/0.3/trans.tf index 815953f..9555b9d 100644 --- a/tf/0.3/trans.tf +++ b/tf/0.3/trans.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z 59314 1 1 diff --git a/tf/0.3/type.tf b/tf/0.3/type.tf index 8746ad7..aa6b918 100644 --- a/tf/0.3/type.tf +++ b/tf/0.3/type.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=str @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:19Z grapheme grapheme diff --git a/tf/0.3/uncertain.tf b/tf/0.3/uncertain.tf index 38e4b5b..477f93d 100644 --- a/tf/0.3/uncertain.tf +++ b/tf/0.3/uncertain.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:20Z 1372 1 1615 1 diff --git a/tf/0.3/variant.tf b/tf/0.3/variant.tf index 0fa5845..0123045 100644 --- a/tf/0.3/variant.tf +++ b/tf/0.3/variant.tf @@ -6,7 +6,7 @@ @project=BabMed @valueType=int @writtenBy=Text-Fabric -@dateWritten=2022-02-09T16:41:26Z +@dateWritten=2022-02-10T09:59:20Z 807 1 2 diff --git a/tutorial/display.ipynb b/tutorial/display.ipynb index c2e9329..66a3e6b 100644 --- a/tutorial/display.ipynb +++ b/tutorial/display.ipynb @@ -19,6 +19,33 @@ "We show the ins and outs of displaying cuneiform ATF transcriptions." ] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Before you compute\n", + "\n", + "You can open the corpus in the Text-Fabric browser and\n", + "explore the contents in a browser window which is served\n", + "from your computer:" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "!!text-fabric Nino-cunei/ninmed:clone --checkout=clone" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Prepare to compute" + ] + }, { "cell_type": "code", "execution_count": 1, @@ -45,7 +72,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 29, "metadata": {}, "outputs": [ { @@ -105,7 +132,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -148,7 +175,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -191,7 +218,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -234,7 +261,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -277,7 +304,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -320,7 +347,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -363,7 +390,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -406,7 +433,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -449,7 +476,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -492,7 +519,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -535,7 +562,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -578,7 +605,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -621,7 +648,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -664,7 +691,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -707,7 +734,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -750,7 +777,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -793,7 +820,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -836,7 +863,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -879,7 +906,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -922,7 +949,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -965,7 +992,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1008,7 +1035,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1051,7 +1078,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1094,7 +1121,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1137,7 +1164,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1180,7 +1207,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1223,7 +1250,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1266,7 +1293,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1309,7 +1336,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1352,7 +1379,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1395,7 +1422,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1438,7 +1465,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1481,7 +1508,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1524,7 +1551,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1567,7 +1594,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1610,7 +1637,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1653,7 +1680,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1696,7 +1723,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1739,7 +1766,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1782,7 +1809,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1825,7 +1852,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1868,7 +1895,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1911,7 +1938,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1954,7 +1981,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:19Z
\n", "
\n", "\n", "
\n", @@ -1997,7 +2024,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:20Z
\n", "
\n", "\n", "
\n", @@ -2040,7 +2067,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:20Z
\n", "
\n", "\n", "
\n", @@ -2083,7 +2110,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-09T16:41:26Z
\n", + "
2022-02-10T09:59:20Z
\n", "
\n", "\n", "
\n", @@ -2791,7 +2818,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 30, "metadata": {}, "outputs": [], "source": [ @@ -2806,37 +2833,37 @@ "source": [ "# Raw text\n", "\n", - "The most basic way is to show the source material for each line by its `atf` feature.\n", - "As this does not include the line number, we grab that from the `lnno` feature." + "The most basic way is to show the source material for each line by its `atf` feature." ] }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 31, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "2:1' 1'. [x x x] x lu#-u₂# ina KAŠ.SAG [x x x x x x x]\n", - "2:2' 2'. [DIŠ NA SA]G.KI.DAB.BA TUKU.TUKU [x x x x]\n", - "2:3' 3'. [x x x x x UGU-š]u₂ KUM₂ [x x]\n", - "2:4' 4'. [x x x x x x x x Š]U₂? L[UGAL? x x x x]\n" + "1'. [x x x] x lu#-u₂# ina KAŠ.SAG [x x x x x x x]\n", + " [x x x] x lu#-u₂# ina KAŠ.SAG [x x x x x x x]\n", + "\n", + "2'. [DIŠ NA SA]G.KI.DAB.BA TUKU.TUKU [x x x x]\n", + " [DIŠ NA SAG].KI.DAB.BA TUKU.TUKU [x x x x]\n", + "\n", + "3'. [x x x x x UGU-š]u₂ KUM₂ [x x]\n", + " [x x x x x UGU-šu₂] KUM₂ [x x]\n", + "\n", + "4'. [x x x x x x x x Š]U₂? L[UGAL? x x x x]\n", + " [x x x x x x x x ŠU₂?] [LUGAL? x x x x]\n", + "\n" ] } ], "source": [ "for ln in lines:\n", - " print(F.lnno.v(ln), F.atf.v(ln))" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Note that the document starts with an empty line, which is not ATF-numbered.\n", - "Here the feature `lnno` contains `!` followed by the logical line number on the face." + " print(F.atf.v(ln))\n", + " print(\" \", T.text(ln))" ] }, { @@ -2861,7 +2888,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 32, "metadata": {}, "outputs": [ { @@ -2873,7 +2900,7 @@ " 'layout-orig-plain': 'sign'}" ] }, - "execution_count": 12, + "execution_count": 32, "metadata": {}, "output_type": "execute_result" } @@ -2896,60 +2923,26 @@ "\n", "This format is really close to the ATF. It contains all original information.\n", "\n", - "This is the default format. We do not have to specify it." - ] - }, - { - "cell_type": "code", - "execution_count": 13, - "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "atf='x' atfpre='[' atfpost=None after=' '\n", - "atf='x' atfpre=None atfpost=None after=' '\n", - "atf='x' atfpre=None atfpost=']' after=' '\n", - "atf='x' atfpre=None atfpost=None after='-'\n", - "atf='lu#' atfpre=None atfpost=None after=' '\n", - "atf='u₂#' atfpre=None atfpost=None after='- '\n", - "atf='ina' atfpre=None atfpost=None after='.'\n", - "atf='KAŠ' atfpre=None atfpost=None after=' '\n", - "atf='SAG' atfpre=None atfpost=None after='. '\n", - "atf='x' atfpre='[' atfpost=None after=' '\n", - "atf='x' atfpre=None atfpost=None after=' '\n", - "atf='x' atfpre=None atfpost=None after=' '\n", - "atf='x' atfpre=None atfpost=None after=' '\n", - "atf='x' atfpre=None atfpost=None after=' '\n", - "atf='x' atfpre=None atfpost=None after=' '\n", - "atf='x' atfpre=None atfpost=']' after='\\n'\n" - ] - } - ], - "source": [ - "for s in L.d(lines[0], otype=\"sign\"):\n", - " atf = F.atf.v(s)\n", - " after = F.after.v(s)\n", - " atfpre = F.atfpre.v(s)\n", - " atfpost = F.atfpost.v(s)\n", - " print(f\"{atf=} {atfpre=} {atfpost=} {after=}\")" + "This is the default format. We do not have to specify it.\n", + "\n", + "Line numbers are not included in this way of getting at the text, so we add them\n", + "by means of the `lnno` feature, which contains the column numbers as well." ] }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 33, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "2:1' [x x x] x-lu# u₂#- ina.KAŠ SAG. [x x x x x x x]\n", + "2:1' [x x x] x lu#-u₂# ina KAŠ.SAG [x x x x x x x]\n", "\n", - "2:2' [DIŠ NA.SAG].KI.DAB. BA.TUKU TUKU. [x x x x]\n", + "2:2' [DIŠ NA SAG].KI.DAB.BA TUKU.TUKU [x x x x]\n", "\n", - "2:3' [x x x x x-UGU šu₂]- KUM₂ [x x]\n", + "2:3' [x x x x x UGU-šu₂] KUM₂ [x x]\n", "\n", "2:4' [x x x x x x x x ŠU₂?] [LUGAL? x x x x]\n", "\n" @@ -2971,13 +2964,13 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 34, "metadata": {}, "outputs": [ { "data": { "text/html": [ - "
P285109 reverse:2:1'  [x x x] x-lu# u₂#- ina.KAŠ SAG. [x x x x x x x]\n", + "
P285109 reverse:2:1'  [x x x] x lu#-u₂# ina KAŠ.SAG [x x x x x x x]\n", "
" ], "text/plain": [ @@ -2990,7 +2983,7 @@ { "data": { "text/html": [ - "
P285109 reverse:2:2'  [DIŠ NA.SAG].KI.DAB. BA.TUKU TUKU. [x x x x]\n", + "
P285109 reverse:2:2'  [DIŠ NA SAG].KI.DAB.BA TUKU.TUKU [x x x x]\n", "
" ], "text/plain": [ @@ -3003,7 +2996,7 @@ { "data": { "text/html": [ - "
P285109 reverse:2:3'  [x x x x x-UGU šu₂]- KUM₂ [x x]\n", + "
P285109 reverse:2:3'  [x x x x x UGU-šu₂] KUM₂ [x x]\n", "
" ], "text/plain": [ @@ -3038,14 +3031,14 @@ "tags": [] }, "source": [ - "# Links to all tablets\n", + "### Excursion: links to tablets\n", "\n", - "We produce a links to CDLI for all tablets in the corpus" + "We produce a links to CDLI for the first 10 tablets in the corpus" ] }, { "cell_type": "code", - "execution_count": 16, + "execution_count": 35, "metadata": {}, "outputs": [ { @@ -3167,11 +3160,32 @@ }, "metadata": {}, "output_type": "display_data" - }, + } + ], + "source": [ + "for doc in F.otype.s(\"document\")[0:10]:\n", + " A.plain(doc)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### `text-orig-plain`\n", + "\n", + "This is a somewhat reduced format. It omits all flags and bracketing constructs." + ] + }, + { + "cell_type": "code", + "execution_count": 36, + "metadata": {}, + "outputs": [ { "data": { "text/html": [ - "
P393782   
" + "
P285109 reverse:2:1'  x x x x lu-u₂ ina KAŠ.SAG x x x x x x x\n", + "
" ], "text/plain": [ "" @@ -3183,7 +3197,8 @@ { "data": { "text/html": [ - "
P404547   
" + "
P285109 reverse:2:2'  DIŠ NA SAG.KI.DAB.BA TUKU.TUKU x x x x\n", + "
" ], "text/plain": [ "" @@ -3195,7 +3210,8 @@ { "data": { "text/html": [ - "
P365742   
" + "
P285109 reverse:2:3'  x x x x x UGU-šu₂ KUM₂ x x\n", + "
" ], "text/plain": [ "" @@ -3207,7 +3223,8 @@ { "data": { "text/html": [ - "
P394390   
" + "
P285109 reverse:2:4'  x x x x x x x x ŠU₂ LUGAL x x x x\n", + "
" ], "text/plain": [ "" @@ -3215,11 +3232,39 @@ }, "metadata": {}, "output_type": "display_data" - }, + } + ], + "source": [ + "for ln in lines:\n", + " A.plain(ln, fmt=\"text-orig-plain\")" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Styled text formats\n", + "\n", + "The formats whose names start with `layout-` are the styled text formats.\n", + "\n", + "### `layout-orig-full`\n", + "\n", + "This format looks like `text-orig-full`, but now we re-introduce the flags and clusters by specific\n", + "layout devices.\n", + "\n", + "See below for detailed examples." + ] + }, + { + "cell_type": "code", + "execution_count": 37, + "metadata": {}, + "outputs": [ { "data": { "text/html": [ - "
P365744   
" + "
P285109 reverse:2:1'  x x x x lu-u ina KAŠ.SAG x x x x x x x\n", + "
" ], "text/plain": [ "" @@ -3231,7 +3276,8 @@ { "data": { "text/html": [ - "
P394422   
" + "
P285109 reverse:2:2'  DIŠ NA SAG.KI.DAB.BA TUKU.TUKU x x x x\n", + "
" ], "text/plain": [ "" @@ -3243,7 +3289,8 @@ { "data": { "text/html": [ - "
P394434   
" + "
P285109 reverse:2:3'  x x x x x UGU-šu KUM₂ x x\n", + "
" ], "text/plain": [ "" @@ -3255,7 +3302,8 @@ { "data": { "text/html": [ - "
P394454   
" + "
P285109 reverse:2:4'  x x x x x x x x ŠU₂ LUGAL x x x x\n", + "
" ], "text/plain": [ "" @@ -3263,11 +3311,35 @@ }, "metadata": {}, "output_type": "display_data" - }, + } + ], + "source": [ + "for ln in lines:\n", + " A.plain(ln, fmt=\"layout-orig-full\")" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### `layout-orig-plain`\n", + "\n", + "This format looks like `text-orig-plain`, but now we re-introduce the flags and clusters by specific\n", + "layout devices.\n", + "\n", + "See below for detailed examples." + ] + }, + { + "cell_type": "code", + "execution_count": 38, + "metadata": {}, + "outputs": [ { "data": { "text/html": [ - "
P394492   
" + "
P285109 reverse:2:1'  x x x x lu-u ina KAŠ.SAG x x x x x x x\n", + "
" ], "text/plain": [ "" @@ -3279,7 +3351,8 @@ { "data": { "text/html": [ - "
P432416   
" + "
P285109 reverse:2:2'  DIŠ NA SAG.KI.DAB.BA TUKU.TUKU x x x x\n", + "
" ], "text/plain": [ "" @@ -3291,7 +3364,8 @@ { "data": { "text/html": [ - "
P394520   
" + "
P285109 reverse:2:3'  x x x x x UGU-šu KUM₂ x x\n", + "
" ], "text/plain": [ "" @@ -3303,7 +3377,8 @@ { "data": { "text/html": [ - "
P394523   
" + "
P285109 reverse:2:4'  x x x x x x x x ŠU₂ LUGAL x x x x\n", + "
" ], "text/plain": [ "" @@ -3311,23 +3386,68 @@ }, "metadata": {}, "output_type": "display_data" - }, + } + ], + "source": [ + "for ln in lines:\n", + " A.plain(ln, fmt=\"layout-orig-plain\")" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Here is the text of the face in each of the plain text formats, i.e. no additional HTML formatting is applied." + ] + }, + { + "cell_type": "markdown", + "metadata": { + "tags": [] + }, + "source": [ + "# Pretty\n", + "\n", + "The ultimate of graphical display is by means of the `pretty()` function.\n", + "\n", + "This display is less useful for reading, but instead optimized for showing all information that you might\n", + "wish for.\n", + "\n", + "It shows a base representation according to a text format of your choice\n", + "(here we choose `layout-orig-full`), and it shows the values\n", + "of a standard set of features." + ] + }, + { + "cell_type": "code", + "execution_count": 39, + "metadata": {}, + "outputs": [ { "data": { - "text/html": [ - "
P395359   
" - ], "text/plain": [ - "" + "'hur.ri.im#'" ] }, + "execution_count": 39, "metadata": {}, - "output_type": "display_data" - }, + "output_type": "execute_result" + } + ], + "source": [ + "w = F.otype.s(\"word\")[10]\n", + "F.atf.v(w)" + ] + }, + { + "cell_type": "code", + "execution_count": 40, + "metadata": {}, + "outputs": [ { "data": { "text/html": [ - "
P395407   
" + "
P285136 obverse:3'
word hur.ri.im#
" ], "text/plain": [ "" @@ -3335,11 +3455,21 @@ }, "metadata": {}, "output_type": "display_data" - }, + } + ], + "source": [ + "A.pretty(w)" + ] + }, + { + "cell_type": "code", + "execution_count": 41, + "metadata": {}, + "outputs": [ { "data": { "text/html": [ - "
P396343   
" + "
P285136 obverse:3'
word:62406 hur.ri.im
" ], "text/plain": [ "" @@ -3347,11 +3477,28 @@ }, "metadata": {}, "output_type": "display_data" - }, + } + ], + "source": [ + "A.pretty(w, fmt=\"layout-orig-full\", withNodes=True)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "By default, pretty displays descend to the word level, but you can also descend to the sign level:" + ] + }, + { + "cell_type": "code", + "execution_count": 42, + "metadata": {}, + "outputs": [ { "data": { "text/html": [ - "
P393735   
" + "
P285136 obverse:3'
word hur.ri.im#
hur.
ri.
im#
" ], "text/plain": [ "" @@ -3359,11 +3506,21 @@ }, "metadata": {}, "output_type": "display_data" - }, + } + ], + "source": [ + "A.pretty(w, baseTypes=\"sign\")" + ] + }, + { + "cell_type": "code", + "execution_count": 43, + "metadata": {}, + "outputs": [ { "data": { "text/html": [ - "
P396392   
" + "
P285136 obverse:3'
word:62406 hur.ri.im
16 hur.
17 ri.
18 im
" ], "text/plain": [ "" @@ -3371,11 +3528,43 @@ }, "metadata": {}, "output_type": "display_data" + } + ], + "source": [ + "A.pretty(w, fmt=\"layout-orig-full\", baseTypes=\"sign\", withNodes=True)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "Here is a line with some pretty convoluted clusters.\n", + "\n", + "The line based `atf` feature contains the original ATF.\n", + "The `T.text` is a reconstruction of ATF based on the interpreted JSON source.\n", + "\n", + "**Note that we have interpreted `mu[n` by `[mun`**." + ] + }, + { + "cell_type": "code", + "execution_count": 44, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "original: 23. [{ši]m}GIG U₂.BABBAR U₅.ARGAB{mušen} {mu[n}eme-sal-li₃ 1-niš SUD₂ ...]\n", + "interpreted: 23. [{šim]}GIG U₂.BABBAR U₅.ARGAB{mušen} {[mun}eme-sal-li₃ 1-niš SUD₂ ...]\n", + "\n" + ] }, { "data": { "text/html": [ - "
P393743   
" + "
P394104 obverse:1:23  [{šim]}GIG U₂.BABBAR U₅.ARGAB{mušen} {[mun}eme-sal-li₃ 1-niš SUD₂ ...]\n", + "
" ], "text/plain": [ "" @@ -3387,67 +3576,8 @@ { "data": { "text/html": [ - "
P397315   
" - ], - "text/plain": [ - "" - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "data": { - "text/html": [ - "
P397594   
" - ], - "text/plain": [ - "" - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "data": { - "text/html": [ - "
P398154   
" - ], - "text/plain": [ - "" - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "data": { - "text/html": [ - "
P424899   
" - ], - "text/plain": [ - "" - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "data": { - "text/html": [ - "
P365747   
" - ], - "text/plain": [ - "" - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "data": { - "text/html": [ - "
P425685   
" + "
P394104 obverse:1:23
line
cluster
type=missing
cluster
type=det
word [{šim]}
type=word
word GIG
type=word
word U₂.BABBAR
type=word
word U₅.ARGAB
type=word
cluster
type=det
word {mušen}
type=word
cluster
type=missing
cluster
type=det
word {[mun}
type=word
word eme-sal-li₃
type=word
word 1-niš
type=word
word SUD₂
type=word
word ...]\n", + "
type=word
" ], "text/plain": [ "" @@ -3458,68 +3588,39 @@ } ], "source": [ - "for doc in F.otype.s(\"document\"):\n", - " A.plain(doc)" + "ln = T.nodeFromSection((\"P394104\", \"obverse\", \"1:23\"))\n", + "print(f\"original: {F.atf.v(ln)}\")\n", + "print(f\"interpreted: {F.ln.v(ln)}. {T.text(ln)}\")\n", + "A.plain(ln)\n", + "A.pretty(ln, extraFeatures=\"type\", baseTypes=[\"word\"])" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "### `text-orig-plain`\n", + "Later on, in the [search](search.ipynb) tutorial we see that `pretty()` can also display other features,\n", + "even features that you or other people have created and added later.\n", "\n", - "This is a somewhat reduced format. It omits all flags and bracketing constructs." + "Here we call for the feature `atf`, which shows the original atf for the sign in question\n", + "excluding the bracketing characters.\n", + "\n", + "Consult the\n", + "[feature documentation](https://github.com/Nino-cunei/oldbabylonian/blob/master/docs//transcription.md)\n", + "to see what information is stored in all the features.\n", + "\n", + "We show it with node numbers, but you could leave them out in an obvious way." ] }, { "cell_type": "code", - "execution_count": 17, + "execution_count": 45, "metadata": {}, "outputs": [ { "data": { "text/html": [ - "
P285109 reverse:2:1'  x x x x-lu u₂- ina.KAŠ SAG. x x x x x x x\n", - "
" - ], - "text/plain": [ - "" - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "data": { - "text/html": [ - "
P285109 reverse:2:2'  DIŠ NA.SAG.KI.DAB. BA.TUKU TUKU. x x x x\n", - "
" - ], - "text/plain": [ - "" - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "data": { - "text/html": [ - "
P285109 reverse:2:3'  x x x x x-UGU šu₂- KUM₂ x x\n", - "
" - ], - "text/plain": [ - "" - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "data": { - "text/html": [ - "
P285109 reverse:2:4'  x x x x x x x x ŠU₂ LUGAL x x x x\n", - "
" + "
P285109 reverse
face:59264 P285109 reverse
" ], "text/plain": [ "" @@ -3530,75 +3631,42 @@ } ], "source": [ - "for ln in lines:\n", - " A.plain(ln, fmt=\"text-orig-plain\")" + "A.pretty(f, extraFeatures=\"atf\", fmt=\"layout-orig-full\", withNodes=True)" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "## Styled text formats\n", - "\n", - "The formats whose names start with `layout-` are the styled text formats.\n", - "\n", - "### `layout-orig-full`\n", + "We do not see much, because the default condense type is `line`, and a `document` is bigger than that.\n", + "Objects bigger than de condense type will be abbreviated to a label that indicates their identity,\n", + "not their contents.\n", "\n", - "This format looks like `text-orig-full`, but now we re-introduce the flags and clusters by specific\n", - "layout devices.\n", + "But we can override this by adding `full=True`.\n", "\n", - "See below for detailed examples." + "See also the documentation on [`pretty`](https://annotation.github.io/text-fabric/tf/advanced/display.html#tf.advanced.display.pretty)." + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "We show a face with per line the ATF for that line displayed as well the English translation." ] }, { "cell_type": "code", - "execution_count": 18, + "execution_count": 46, "metadata": {}, "outputs": [ { "data": { "text/html": [ - "
P285109 reverse:2:1'  x x x x-lu u- ina.KAŠ SAG. x x x x x x x\n", - "
" - ], - "text/plain": [ - "" - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "data": { - "text/html": [ - "
P285109 reverse:2:2'  DIŠ NA.SAG.KI.DAB. BA.TUKU TUKU. x x x x\n", - "
" - ], - "text/plain": [ - "" - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "data": { - "text/html": [ - "
P285109 reverse:2:3'  x x x x x-UGU šu- KUM₂ x x\n", - "
" - ], - "text/plain": [ - "" - ] - }, - "metadata": {}, - "output_type": "display_data" - }, - { - "data": { - "text/html": [ - "
P285109 reverse:2:4'  x x x x x x x x ŠU₂ LUGAL x x x x\n", - "
" + "
P285109 reverse
face:59264 P285109 reverse
line:59375
atf=1'. [x x x] x lu#-u₂# ina KAŠ.SAG [x x x x x x x]tr@en=[... he should drink it] either in prime quality beer [or in wine ...]
cluster:52919
word:63111 x
atf=[x
word:63112 x
atf=x
word:63113 x
atf=x]
word:63114 x
atf=x
word:63115 lu-u
atf=lu#-u₂#
word:63116 ina
atf=ina
word:63117 KAŠ.SAG
atf=KAŠ.SAG
cluster:52920
word:63118 x
atf=[x
word:63119 x
atf=x
word:63120 x
atf=x
word:63121 x
atf=x
word:63122 x
atf=x
word:63123 x
atf=x
word:63124 x\n", + "
atf=x]
line:59376
atf=2'. [DIŠ NA SA]G.KI.DAB.BA TUKU.TUKU [x x x x]tr@en=[If a man] is continuously affected with headache: [errû-colocynth seed].
cluster:52921
word:63125 DIŠ
atf=[DIŠ
word:63126 NA
atf=NA
word:63127 SAG.
atf=SA]G.KI.DAB.BA
word:63127 KI.DAB.BA
atf=SA]G.KI.DAB.BA
word:63128 TUKU.TUKU
atf=TUKU.TUKU
cluster:52922
word:63129 x
atf=[x
word:63130 x
atf=x
word:63131 x
atf=x
word:63132 x\n", + "
atf=x]
line:59377
atf=3'. [x x x x x UGU-š]u₂ KUM₂ [x x]tr@en=[First tablet of (the series called) \"If a man’s cranium holds] heat.\"
cluster:52923
word:63133 x
atf=[x
word:63134 x
atf=x
word:63135 x
atf=x
word:63136 x
atf=x
word:63137 x
atf=x
word:63138 UGU-šu
atf=UGU-š]u₂
word:63139 KUM₂
atf=KUM₂
cluster:52924
word:63140 x
atf=[x
word:63141 x\n", + "
atf=x]
line:59378
atf=4'. [x x x x x x x x Š]U₂? L[UGAL? x x x x]tr@en=[Palace of Aššur-ban-apli, king of the univ]erse?, ki[ng? of the land of Aššur],
cluster:52925
word:63142 x
atf=[x
word:63143 x
atf=x
word:63144 x
atf=x
word:63145 x
atf=x
word:63146 x
atf=x
word:63147 x
atf=x
word:63148 x
atf=x
word:63149 x
atf=x
word:63150 ŠU₂
atf=Š]U₂?
cluster:52926
word:63151 LUGAL
atf=L[UGAL?
word:63152 x
atf=x
word:63153 x
atf=x
word:63154 x
atf=x
word:63155 x\n", + "
atf=x]
" ], "text/plain": [ "" @@ -3609,44 +3677,64 @@ } ], "source": [ - "for ln in lines:\n", - " A.plain(ln, fmt=\"layout-orig-full\")" + "A.pretty(f, extraFeatures=\"atf tr@en\", fmt=\"layout-orig-plain\", withNodes=True, full=True)" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "### `layout-orig-plain`\n", + "# More examples\n", "\n", - "This format looks like `text-orig-plain`, but now we re-introduce the flags and clusters by specific\n", - "layout devices.\n", + "There are word dividers in the corpus.\n", "\n", - "See below for detailed examples." + "We look them up:" ] }, { "cell_type": "code", - "execution_count": 19, + "execution_count": 47, "metadata": {}, "outputs": [ { "data": { - "text/html": [ - "
P285109 reverse:2:1'  x x x x-lu u- ina.KAŠ SAG. x x x x x x x\n", - "
" - ], "text/plain": [ - "" + "102" ] }, + "execution_count": 47, "metadata": {}, - "output_type": "display_data" + "output_type": "execute_result" + } + ], + "source": [ + "wdivs = F.type.s(\"wdiv\")\n", + "len(wdivs)" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "We show a few" + ] + }, + { + "cell_type": "code", + "execution_count": 48, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "7'. %sux [... nig₂ g]e₂₆-e : gen-na dumu-gu₁₀\n" + ] }, { "data": { "text/html": [ - "
P285109 reverse:2:2'  DIŠ NA.SAG.KI.DAB. BA.TUKU TUKU. x x x x\n", + "
P479250 obverse:7'  %sux [... nig₂ ge₂₆]-e : gen-na dumu-gu₁₀\n", "
" ], "text/plain": [ @@ -3656,10 +3744,17 @@ "metadata": {}, "output_type": "display_data" }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "5'. [...] x bi# za te : I₃ {šim}LI\n" + ] + }, { "data": { "text/html": [ - "
P285109 reverse:2:3'  x x x x x-UGU šu- KUM₂ x x\n", + "
P401255 obverse:5'  [...] x bi# za te : I₃ {šim}LI\n", "
" ], "text/plain": [ @@ -3669,10 +3764,17 @@ "metadata": {}, "output_type": "display_data" }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "20. x [x NUMUN] GI.ZU₂.LUM.MA ina LAL₃ SUD₂ MAR : x [...]\n" + ] + }, { "data": { "text/html": [ - "
P285109 reverse:2:4'  x x x x x x x x ŠU₂ LUGAL x x x x\n", + "
P394104 obverse:1:20  x [x NUMUN] GI.ZU₂.LUM.MA ina LAL₃ SUD₂ MAR : x [...]\n", "
" ], "text/plain": [ @@ -3681,68 +3783,19 @@ }, "metadata": {}, "output_type": "display_data" - } - ], - "source": [ - "for ln in lines:\n", - " A.plain(ln, fmt=\"layout-orig-plain\")" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Here is the text of the face in each of the plain text formats, i.e. no additional HTML formatting is applied." - ] - }, - { - "cell_type": "markdown", - "metadata": { - "tags": [] - }, - "source": [ - "# Pretty\n", - "\n", - "The ultimate of graphical display is by means of the `pretty()` function.\n", - "\n", - "This display is less useful for reading, but instead optimized for showing all information that you might\n", - "wish for.\n", - "\n", - "It shows a base representation according to a text format of your choice\n", - "(here we choose `layout-orig-full`), and it shows the values\n", - "of a standard set of features." - ] - }, - { - "cell_type": "code", - "execution_count": 20, - "metadata": {}, - "outputs": [ + }, { - "data": { - "text/plain": [ - "'hur.ri.im#'" - ] - }, - "execution_count": 20, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "w = F.otype.s(\"word\")[10]\n", - "F.atf.v(w)" - ] - }, - { - "cell_type": "code", - "execution_count": 21, - "metadata": {}, - "outputs": [ + "name": "stdout", + "output_type": "stream", + "text": [ + "21. [x x {n]a₄}as-har ina I₃.NUN SUD₂ MAR : x [...]\n" + ] + }, { "data": { "text/html": [ - "
P285136 obverse:3'
word hur.ri. im#.
" + "
P394104 obverse:1:21  [x x {na₄]}as-har ina I₃.NUN SUD₂ MAR : x [...]\n", + "
" ], "text/plain": [ "" @@ -3750,21 +3803,19 @@ }, "metadata": {}, "output_type": "display_data" - } - ], - "source": [ - "A.pretty(w)" - ] - }, - { - "cell_type": "code", - "execution_count": 22, - "metadata": {}, - "outputs": [ + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "70'. DIŠ KIMIN U₂#.BA[BBAR A]N.ZAH.GE₆ tur-ar₂ ina I₃.NUN SUD₂ MAR : DIŠ KIMIN KU₃.GAN ina I₃.UDU GIR₃.PAD.DU UDU SUD₂ MAR#\n" + ] + }, { "data": { "text/html": [ - "
P285136 obverse:3'
word:62406 hur.ri. im.
" + "
P394104 obverse:1:70'  DIŠ KIMIN U₂#.[BABBAR AN].ZAH.GE₆ tur-ar₂ ina I₃.NUN SUD₂ MAR : DIŠ KIMIN KU₃.GAN ina I₃.UDU GIR₃.PAD.DU UDU SUD₂ MAR#\n", + "
" ], "text/plain": [ "" @@ -3772,28 +3823,19 @@ }, "metadata": {}, "output_type": "display_data" - } - ], - "source": [ - "A.pretty(w, fmt=\"layout-orig-full\", withNodes=True)" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "By default, pretty displays descend to the word level, but you can also descend to the sign level:" - ] - }, - { - "cell_type": "code", - "execution_count": 23, - "metadata": {}, - "outputs": [ + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "2. DIŠ KIMIN SAG.DU EME.ŠID HAD₂.DU S[UD₂ ina I₃ ŠUB MAR : DIŠ K]IMIN EME.ŠID E₂.GAR₈ HAD₂.DU SUD₂ ina ŠU.LU₂.ZABAR? ina NE GAR-an MAR\n" + ] + }, { "data": { "text/html": [ - "
P285136 obverse:3'
word hur.ri. im#.
hur.
ri.
im#.
" + "
P394104 obverse:2:2  DIŠ KIMIN SAG.DU EME.ŠID HAD₂.DU [SUD₂ ina I₃ ŠUB MAR : DIŠ KIMIN] EME.ŠID E₂.GAR₈ HAD₂.DU SUD₂ ina ŠU.LU₂.ZABAR? ina NE GAR-an MAR\n", + "
" ], "text/plain": [ "" @@ -3801,21 +3843,19 @@ }, "metadata": {}, "output_type": "display_data" - } - ], - "source": [ - "A.pretty(w, baseTypes=\"sign\")" - ] - }, - { - "cell_type": "code", - "execution_count": 24, - "metadata": {}, - "outputs": [ + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "14. [...] x :#? GEŠTIN.KA₅.A SUD₂ ina I₃ ina {urudu}ŠEN.TUR BAL-at te-qi₂\n" + ] + }, { "data": { "text/html": [ - "
P285136 obverse:3'
word:62406 hur.ri. im.
16 hur.
17 ri.
18 im.
" + "
P394104 obverse:2:14  [...] x :#? GEŠTIN.KA₅.A SUD₂ ina I₃ ina {urudu}ŠEN.TUR BAL-at te-qi₂\n", + "
" ], "text/plain": [ "" @@ -3823,38 +3863,19 @@ }, "metadata": {}, "output_type": "display_data" - } - ], - "source": [ - "A.pretty(w, fmt=\"layout-orig-full\", baseTypes=\"sign\", withNodes=True)" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "Later on, in the [search](search.ipynb) tutorial we see that `pretty()` can also display other features,\n", - "even features that you or other people have created and added later.\n", - "\n", - "Here we call for the feature `atf`, which shows the original atf for the sign in question\n", - "excluding the bracketing characters.\n", - "\n", - "Consult the\n", - "[feature documentation](https://github.com/Nino-cunei/oldbabylonian/blob/master/docs//transcription.md)\n", - "to see what information is stored in all the features.\n", - "\n", - "We show it with node numbers, but you could leave them out in an obvious way." - ] - }, - { - "cell_type": "code", - "execution_count": 25, - "metadata": {}, - "outputs": [ + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "44. [DIŠ NA I]GI.MIN#-šu₂ IGI.SIG₇.SIG₇ DIRI ŠIKA {giš}NU.UR₂.[M]A ina I₃ SUD₂ MAR : {mun}eme-sal-li₃ S[UD₂? MAR?]\n" + ] + }, { "data": { "text/html": [ - "
P285109 reverse
face:59264 P285109 reverse
" + "
P394104 obverse:2:44  [DIŠ NA IGI].MIN#-šu₂ IGI.SIG₇.SIG₇ DIRI ŠIKA {giš}NU.UR₂.[MA] ina I₃ SUD₂ MAR : {mun}eme-sal-li₃ [SUD₂? MAR?]\n", + "
" ], "text/plain": [ "" @@ -3862,57 +3883,19 @@ }, "metadata": {}, "output_type": "display_data" - } - ], - "source": [ - "A.pretty(f, extraFeatures=\"atf\", fmt=\"layout-orig-full\", withNodes=True)" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "We do not see much, because the default condense type is `line`, and a `document` is bigger than that.\n", - "Objects bigger than de condense type will be abbreviated to a label that indicates their identity,\n", - "not their contents.\n", - "\n", - "But we can override this by adding `full=True`.\n", - "\n", - "See also the documentation on [`pretty`](https://annotation.github.io/text-fabric/tf/advanced/display.html#tf.advanced.display.pretty)." - ] - }, - { - "cell_type": "code", - "execution_count": 28, - "metadata": {}, - "outputs": [ + }, { - "data": { - "text/plain": [ - "59465" - ] - }, - "execution_count": 28, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "ln = T.nodeFromSection((\"P394104\", \"obverse\", \"1:23\"))\n", - "ln" - ] - }, - { - "cell_type": "code", - "execution_count": 32, - "metadata": {}, - "outputs": [ + "name": "stdout", + "output_type": "stream", + "text": [ + "69. DIŠ NA MIN 1 GIN₂ U₅.ARGAB#{mušen#} ina# I₃#.NUN# SUD₂# MAR# :# 15 ŠE Š[IKA ... ina ... S]UD₂ MAR#\n" + ] + }, { "data": { "text/html": [ - "
P394104 obverse:1:23
line
cluster
type=missing
cluster
type=det
word [šim] GIG.
type=word
[šim]
type=reading
word [šim] GIG.
type=word
GIG.
type=grapheme
word U₂ BABBAR.
type=word
U₂
type=grapheme
BABBAR.
type=grapheme
word U₅ ARGAB. mušen
type=word
U₅
type=grapheme
ARGAB.
type=grapheme
cluster
type=det
word U₅ ARGAB. mušen
type=word
mušen
type=reading
cluster
type=missing
cluster
type=det
word [mun-eme-sal- li₃-
type=word
[mun-
type=reading
word [mun-eme-sal- li₃-
type=word
eme-
type=reading
sal-
type=reading
li₃-
type=reading
word 1 niš-
type=word
1
type=numeral
niš-
type=reading
word SUD₂
type=word
SUD₂
type=grapheme
word ...]\n", - "
type=word
...]\n", - "
type=ellipsis
" + "
P394104 obverse:2:69  DIŠ NA MIN 1 GIN₂ U₅.ARGAB#{mušen#} ina# I₃#.NUN# SUD₂# MAR# :# 15 ŠE [ŠIKA ... ina ... SUD₂] MAR#\n", + "
" ], "text/plain": [ "" @@ -3920,25 +3903,19 @@ }, "metadata": {}, "output_type": "display_data" - } - ], - "source": [ - "A.pretty(ln, extraFeatures=\"type\", baseTypes=[\"sign\"])" - ] - }, - { - "cell_type": "code", - "execution_count": 27, - "metadata": {}, - "outputs": [ + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "5. EN₂ E₂.NU.RU %sux LU RA GAR dam gal kur MIN : gi {d}en.lil₂ a₂.e# nu.ub.zum %akk {d}zar-pa-ni-tu₄\n" + ] + }, { "data": { "text/html": [ - "
P285109 reverse
face:59264 P285109 reverse
line:59375
atf=1'. [x x x] x lu#-u₂# ina KAŠ.SAG [x x x x x x x]
cluster:52919
word:63111 x
atf=[x
word:63112 x
atf=x
word:63113 x
atf=x]
word:63114 x-
atf=x
word:63115 lu u-
atf=lu#-u₂#
word:63116 ina.
atf=ina
word:63117 KAŠ SAG.
atf=KAŠ.SAG
cluster:52920
word:63118 x
atf=[x
word:63119 x
atf=x
word:63120 x
atf=x
word:63121 x
atf=x
word:63122 x
atf=x
word:63123 x
atf=x
word:63124 x\n", - "
atf=x]
line:59376
atf=2'. [DIŠ NA SA]G.KI.DAB.BA TUKU.TUKU [x x x x]
cluster:52921
word:63125 DIŠ
atf=[DIŠ
word:63126 NA.
atf=NA
word:63127 SAG.
atf=SA]G.KI.DAB.BA
word:63127 KI.DAB. BA.
atf=SA]G.KI.DAB.BA
word:63128 TUKU TUKU.
atf=TUKU.TUKU
cluster:52922
word:63129 x
atf=[x
word:63130 x
atf=x
word:63131 x
atf=x
word:63132 x\n", - "
atf=x]
line:59377
atf=3'. [x x x x x UGU-š]u₂ KUM₂ [x x]
cluster:52923
word:63133 x
atf=[x
word:63134 x
atf=x
word:63135 x
atf=x
word:63136 x
atf=x
word:63137 x-
atf=x
word:63138 UGU šu-
atf=UGU-š]u₂
word:63139 KUM₂
atf=KUM₂
cluster:52924
word:63140 x
atf=[x
word:63141 x\n", - "
atf=x]
line:59378
atf=4'. [x x x x x x x x Š]U₂? L[UGAL? x x x x]
cluster:52925
word:63142 x
atf=[x
word:63143 x
atf=x
word:63144 x
atf=x
word:63145 x
atf=x
word:63146 x
atf=x
word:63147 x
atf=x
word:63148 x
atf=x
word:63149 x
atf=x
word:63150 ŠU₂
atf=Š]U₂?
cluster:52926
word:63151 LUGAL
atf=L[UGAL?
word:63152 x
atf=x
word:63153 x
atf=x
word:63154 x
atf=x
word:63155 x\n", - "
atf=x]
" + "
P393782 obverse:1:5  EN₂ E₂.NU.RU %sux LU RA GAR dam gal kur MIN : gi {d}en.lil₂ a₂.e# nu.ub.zum %akk {d}zar-pa-ni-tu₄\n", + "
" ], "text/plain": [ "" @@ -3949,7 +3926,10 @@ } ], "source": [ - "A.pretty(f, extraFeatures=\"atf\", fmt=\"layout-orig-plain\", withNodes=True, full=True)" + "for wdiv in wdivs[0:10]:\n", + " ln = L.u(wdiv, otype=\"line\")[0]\n", + " print(F.atf.v(ln))\n", + " A.plain(ln, highlights={wdiv})" ] }, { @@ -3977,26 +3957,22 @@ }, { "cell_type": "code", - "execution_count": 19, + "execution_count": 49, "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "(('grapheme', 20433),\n", - " ('reading', 20357),\n", - " ('joiner', 18957),\n", - " ('mark', 12454),\n", - " ('unknown', 4720),\n", - " ('ellipsis', 1236),\n", - " ('numeral', 958),\n", - " ('lang', 186),\n", - " ('wdiv', 92),\n", - " ('empty', 69),\n", - " ('erasure', 26))" + "(('reading', 23570),\n", + " ('grapheme', 22092),\n", + " ('unknown', 4768),\n", + " ('ellipsis', 1266),\n", + " ('numeral', 962),\n", + " ('wdiv', 102),\n", + " ('empty', 69))" ] }, - "execution_count": 19, + "execution_count": 49, "metadata": {}, "output_type": "execute_result" } @@ -4014,26 +3990,26 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 50, "metadata": {}, "outputs": [], "source": [ "lines = (\n", " ((\"P365742\", \"reverse\", \"1:15\"), (\"cluster: determinative\", [9, 10])),\n", - " ((\"P403381\", \"obverse\", \"1':3'\"), (\"cluster: missing\", [2, 3, 4, 5])),\n", - " ((\"P394104\", \"obverse\", \"1:14\"), (\"cluster: uncertain\", [7])),\n", - " ((\"P285136\", \"obverse\", \"6'\"), (\"cluster: supplied\", [11, 12])),\n", - " ((\"P393782\", \"obverse\", \"2:1\"), (\"cluster: excised\", [29, 30])),\n", - " ((\"P285109\", \"reverse\", \"2:1'\"), (\"flag: damage\", [7, 9])),\n", - " ((\"P285109\", \"reverse\", \"2:4'\"), (\"flag: question\", [11, 12])),\n", - " ((\"P403291\", \"obverse\", \"4'\"), (\"flag: remarkable\", [4])),\n", - " ((\"P394520\", \"obverse\", \"2:37'\"), (\"flag: collated\", [28])),\n", + " ((\"P403381\", \"obverse\", \"1':3'\"), (\"cluster: missing\", [1, 2, 3])),\n", + " ((\"P394104\", \"obverse\", \"1:14\"), (\"cluster: uncertain\", [4])),\n", + " ((\"P285136\", \"obverse\", \"6'\"), (\"cluster: supplied\", [7])),\n", + " ((\"P393782\", \"obverse\", \"2:1\"), (\"cluster: excised\", [21])),\n", + " ((\"P285109\", \"reverse\", \"2:1'\"), (\"flag: damage\", [5])),\n", + " ((\"P285109\", \"reverse\", \"2:4'\"), (\"flag: question\", [10])),\n", + " ((\"P403291\", \"obverse\", \"4'\"), (\"flag: remarkable\", [2])),\n", + " ((\"P394520\", \"obverse\", \"2:37'\"), (\"flag: collated\", [16])),\n", ")" ] }, { "cell_type": "code", - "execution_count": 21, + "execution_count": 51, "metadata": {}, "outputs": [ { @@ -4055,13 +4031,16 @@ "name": "stdout", "output_type": "stream", "text": [ - "1:15 [ana KI ] MIN# šimGUR₂.GUR₂ šimLI šim.dNIN.URTA NUMUN u₂AB₂.DUH KA A.AB.BA šimŠEŠ DIŠ-niš SUD₂ ina KAŠ SILA₁₁-aš SAR-ab KI MIN \n" + " 15. [ana KI MI]N {šim}GUR₂.GUR₂ {šim}LI {šim.d}NIN.URTA NUMUN {u₂}AB₂.DUH KA A.AB.BA {šim}ŠEŠ DIŠ-niš SUD₂ ina KAŠ SILA₁₁-aš SAR-ab KI MIN\n", + " 1:15 [ana KI MIN] {šim}GUR₂.GUR₂ {šim}LI {šim.d}NIN.URTA NUMUN {u₂}AB₂.DUH KA A.AB.BA {šim}ŠEŠ DIŠ-niš SUD₂ ina KAŠ SILA₁₁-aš SAR-ab KI MIN\n", + "\n" ] }, { "data": { "text/html": [ - "
P365742 reverse:1:15  [ana KI ] MIN# šimGUR₂.GUR₂ šimLI šim.dNIN.URTA NUMUN u₂AB₂.DUH KA A.AB.BA šimŠEŠ DIŠ-niš SUD₂ ina KAŠ SILA₁₁-aš SAR-ab KI MIN
" + "
P365742 reverse:1:15  ana KI MIN šimGUR₂.GUR₂ šimLI šim.dNIN.URTA NUMUN uAB₂.DUH KA A.AB.BA šimŠEŠ DIŠ-niš SUD₂ ina KAŠ SILA₁₁-aš SAR-ab KI MIN\n", + "
" ], "text/plain": [ "" @@ -4073,7 +4052,9 @@ { "data": { "text/html": [ - "
P365742 reverse:1:15
line:86712
tr@en=Alternatively, you pound together kukru-aromatic, burāšu-juniper, nikiptu-spurge, kammantu-plant seed, sea algae (and) bitter-plant. You knead it in beer, you shave (his head and) DITTO (= you put it on as a bandage; then you should not remove it for three days).
word:96675 [ana
18356 [
cluster:80931
word:96675 [ana
18357 ana
word:96676 KI
18358 KI
word:96677 ] MIN#
18359 ]
word:96677 ] MIN#
18360 MIN#
cluster:80932
word:96678 šimGUR₂.GUR₂
18361 šim
word:96678 šimGUR₂.GUR₂
18362 GUR₂
18363 .
18364 GUR₂
cluster:80933
word:96679 šimLI
18365 šim
word:96679 šimLI
18366 LI
cluster:80934
word:96680 šim.dNIN.URTA
18367 šim
18368 .
18369 d
word:96680 šim.dNIN.URTA
18370 NIN
18371 .
18372 URTA
word:96681 NUMUN
18373 NUMUN
cluster:80935
word:96682 u₂AB₂.DUH
18374 u₂
word:96682 u₂AB₂.DUH
18375 AB₂
18376 .
18377 DUH
word:96683 KA
18378 KA
word:96684 A.AB.BA
18379 A
18380 .
18381 AB
18382 .
18383 BA
cluster:80936
word:96685 šimŠEŠ
18384 šim
word:96685 šimŠEŠ
18385 ŠEŠ
word:96686 DIŠ-niš
18386 DIŠ
18387 -
18388 niš
word:96687 SUD₂
18389 SUD₂
word:96688 ina
18390 ina
word:96689 KAŠ
18391 KAŠ
word:96690 SILA₁₁-aš
18392 SILA₁₁
18393 -
18394 aš
word:96691 SAR-ab
18395 SAR
18396 -
18397 ab
word:96692 KI
18398 KI
word:96693 MIN
18399 MIN
" + "
P365742 reverse:1:15
line:60054
tr@en=Alternatively, you pound together kukru-aromatic, burāšu-juniper, nikiptu-spurge, kammantu-plant seed, sea algae (and) bitter-plant. You knead it in beer, you shave (his head and) DITTO (= you put it on as a bandage; then you should not remove it for three days).
cluster:54272
word:69928 ana
12300 ana
word:69929 KI
12301 KI
word:69930 MIN
12302 MIN
cluster:54273
word:69931 šimGUR₂.GUR₂
12303 šim
word:69931 šimGUR₂.GUR₂
12304 GUR₂.
12305 GUR₂
cluster:54274
word:69932 šimLI
12306 šim
word:69932 šimLI
12307 LI
cluster:54275
word:69933 šim.dNIN.URTA
12308 šim.
12309 d
word:69933 šim.dNIN.URTA
12310 NIN.
12311 URTA
word:69934 NUMUN
12312 NUMUN
cluster:54276
word:69935 uAB₂.DUH
12313 u
word:69935 uAB₂.DUH
12314 AB₂.
12315 DUH
word:69936 KA
12316 KA
word:69937 A.AB.BA
12317 A.
12318 AB.
12319 BA
cluster:54277
word:69938 šimŠEŠ
12320 šim
word:69938 šimŠEŠ
12321 ŠEŠ
word:69939 DIŠ-niš
12322 DIŠ-
12323 niš
word:69940 SUD₂
12324 SUD₂
word:69941 ina
12325 ina
word:69942 KAŠ
12326 KAŠ
word:69943 SILA₁₁-aš
12327 SILA₁₁-
12328 aš
word:69944 SAR-ab
12329 SAR-
12330 ab
word:69945 KI
12331 KI
word:69946 MIN\n", + "
12332 MIN\n", + "
" ], "text/plain": [ "" @@ -4101,13 +4082,16 @@ "name": "stdout", "output_type": "stream", "text": [ - "1':3' [... NU pa]-tan# NAG \n" + " 3'. [... NU pa]-tan# NAG\n", + " 1':3' [... NU pa]-tan# NAG\n", + "\n" ] }, { "data": { "text/html": [ - "
P403381 obverse:1':3'  [... NU pa]-tan NAG
" + "
P403381 obverse:1':3'  ... NU pa-tan NAG\n", + "
" ], "text/plain": [ "" @@ -4119,7 +4103,9 @@ { "data": { "text/html": [ - "
P403381 obverse:1':3'
line:86097
word:90303 [...
2448 [
cluster:79706
word:90303 [...
2449 ...
word:90304 NU
2450 NU
word:90305 pa]-tan
2451 pa
2452 ]
word:90305 pa]-tan
2453 -
2454 tan
word:90306 NAG
2455 NAG
" + "
P403381 obverse:1':3'
line:59439
cluster:53047
word:63633 ...
1681 ...
word:63634 NU
1682 NU
word:63635 pa-tan
1683 pa-
word:63635 pa-tan
1684 tan
word:63636 NAG\n", + "
1685 NAG\n", + "
" ], "text/plain": [ "" @@ -4147,13 +4133,16 @@ "name": "stdout", "output_type": "stream", "text": [ - "1:14 a-[na E₂ (NU?)] e#-de-e DU-ma KA₂ GU₃-si ki-ma# x x x [...] \n" + " 14. a-[na E₂ (NU?)] e#-de-e DU-ma KA₂ GU₃-si ki-ma# x x x [...]\n", + " 1:14 a-[na E₂ (NU?)] e#-de-e DU-ma KA₂ GU₃-si ki-ma# x x x [...]\n", + "\n" ] }, { "data": { "text/html": [ - "
P394104 obverse:1:14  a-[na E₂ (NU)] e-de-e DU-ma KA₂ GU₃-si ki-ma x x x [...]
" + "
P394104 obverse:1:14  a-na E₂ NU e-de-e DU-ma KA₂ GU₃-si ki-ma x x x ...\n", + "
" ], "text/plain": [ "" @@ -4165,7 +4154,9 @@ { "data": { "text/html": [ - "
P394104 obverse:1:14
line:86114
tr@en=(o i 15):He goes [to] an (un)known [house] and calls at the entrance door: ‘like ... [...] ... giddagiddû-fibers, ditto, remove your (pl.) giddagiddû-fibers, ... [...]!’
word:90474 a-[na
2973 a
2974 -
2975 [
cluster:79745
word:90474 a-[na
2976 na
word:90475 E₂
2977 E₂
word:90476 (NU)]
2978 (
cluster:79746
word:90476 (NU)]
2979 NU
2980 )
word:90476 (NU)]
2981 ]
word:90477 e-de-e
2982 e
2983 -
2984 de
2985 -
2986 e
word:90478 DU-ma
2987 DU
2988 -
2989 ma
word:90479 KA₂
2990 KA₂
word:90480 GU₃-si
2991 GU₃
2992 -
2993 si
word:90481 ki-ma
2994 ki
2995 -
2996 ma
word:90482 x
2997 x
word:90483 x
2998 x
word:90484 x
2999 x
word:90485 [...]
3000 [
cluster:79747
word:90485 [...]
3001 ...
3002 ]
" + "
P394104 obverse:1:14
line:59456
tr@en=(o i 15):He goes [to] an (un)known [house] and calls at the entrance door: ‘like ... [...] ... giddagiddû-fibers, ditto, remove your (pl.) giddagiddû-fibers, ... [...]!’
word:63802 a-na
2010 a-
cluster:53086
word:63802 a-na
2011 na
word:63803 E₂
2012 E₂
cluster:53087
word:63804 NU
2013 NU
word:63805 e-de-e
2014 e-
2015 de-
2016 e
word:63806 DU-ma
2017 DU-
2018 ma
word:63807 KA₂
2019 KA₂
word:63808 GU₃-si
2020 GU₃-
2021 si
word:63809 ki-ma
2022 ki-
2023 ma
word:63810 x
2024 x
word:63811 x
2025 x
word:63812 x
2026 x
cluster:53088
word:63813 ...\n", + "
2027 ...\n", + "
" ], "text/plain": [ "" @@ -4193,13 +4184,16 @@ "name": "stdout", "output_type": "stream", "text": [ - "6' EN₂ ma-mit GIM šar-ra- ina KA₂ pil-ši un gi ha ba# [x x x x x x x x x x x x] \n" + " 6'. EN₂ ma-mit GIM šar-ra- ina KA₂ pil-ši un gi ha ba# [x x x x x x x x x x x x]\n", + " 6' EN₂ ma-mit GIM šar-ra- ina KA₂ pil-ši un gi ha ba# [x x x x x x x x x x x x]\n", + "\n" ] }, { "data": { "text/html": [ - "
P285136 obverse:6'  EN₂ ma-mit GIM šar-ra-<qi> ina KA₂ pil-ši un gi ha ba [x x x x x x x x x x x x]
" + "
P285136 obverse:6'  EN₂ ma-mit GIM šar-ra-qi ina KA₂ pil-ši un gi ha ba x x x x x x x x x x x x\n", + "
" ], "text/plain": [ "" @@ -4211,7 +4205,9 @@ { "data": { "text/html": [ - "
P285136 obverse:6'
line:85977
tr@en=Incantation: “The curse, like a thief at the opening of a hole, . . . [. . .” Wording? of a spell? for removing the kurāru?-boil].
word:89081 EN₂
84 EN₂
word:89082 ma-mit
85 ma
86 -
87 mit
word:89083 GIM
88 GIM
word:89084 šar-ra-<qi>
89 šar
90 -
91 ra
92 -
93 <
cluster:79494
word:89084 šar-ra-<qi>
94 qi
95 >
word:89085 ina
96 ina
word:89086 KA₂
97 KA₂
word:89087 pil-ši
98 pil
99 -
100 ši
word:89088 un
101 un
word:89089 gi
102 gi
word:89090 ha
103 ha
word:89091 ba
104 ba
word:89092 [x
105 [
cluster:79495
word:89092 [x
106 x
word:89093 x
107 x
word:89094 x
108 x
word:89095 x
109 x
word:89096 x
110 x
word:89097 x
111 x
word:89098 x
112 x
word:89099 x
113 x
word:89100 x
114 x
word:89101 x
115 x
word:89102 x
116 x
word:89103 x]
117 x
118 ]
" + "
P285136 obverse:6'
line:59319
tr@en=Incantation: “The curse, like a thief at the opening of a hole, . . . [. . .” Wording? of a spell? for removing the kurāru?-boil].
word:62423 EN₂
51 EN₂
word:62424 ma-mit
52 ma-
53 mit
word:62425 GIM
54 GIM
word:62426 šar-ra-qi
55 šar-
56 ra-
cluster:52835
word:62426 šar-ra-qi
57 qi
word:62427 ina
58 ina
word:62428 KA₂
59 KA₂
word:62429 pil-ši
60 pil-
61 ši
word:62430 un
62 un
word:62431 gi
63 gi
word:62432 ha
64 ha
word:62433 ba
65 ba
cluster:52836
word:62434 x
66 x
word:62435 x
67 x
word:62436 x
68 x
word:62437 x
69 x
word:62438 x
70 x
word:62439 x
71 x
word:62440 x
72 x
word:62441 x
73 x
word:62442 x
74 x
word:62443 x
75 x
word:62444 x
76 x
word:62445 x\n", + "
77 x\n", + "
" ], "text/plain": [ "" @@ -4239,13 +4235,16 @@ "name": "stdout", "output_type": "stream", "text": [ - "2:1 [DIŠ NA ŠA₃-] šu₂# GU₇-šu₂ u₂HAR.HAR MUN SUD₂ lu ina# [A ] lu# ina KAŠ lu ina GEŠTIN <> ana ŠA₃ ŠUB-di NAG \n" + " 1. [DIŠ NA ŠA₃-š]u₂ GU₇-šu₂ {u₂}HAR.HAR MUN SUD₂ lu in[a A l]u ina KAŠ lu ina GEŠTIN <> ana ŠA₃ ŠUB-di NAG\n", + " 2:1 [DIŠ NA ŠA₃-šu₂] GU₇-šu₂ {u₂}HAR.HAR MUN SUD₂ lu [ina A lu] ina KAŠ lu ina GEŠTIN <> ana ŠA₃ ŠUB-di NAG\n", + "\n" ] }, { "data": { "text/html": [ - "
P393782 obverse:2:1  [DIŠ NA ŠA₃-] šu GU₇-šu₂ u₂HAR.HAR MUN SUD₂ lu ina [A ] lu ina KAŠ lu ina GEŠTIN <<EN₂>> ana ŠA₃ ŠUB-di NAG
" + "
P393782 obverse:2:1  DIŠ NA ŠA₃-šu GU₇-šu uHAR.HAR MUN SUD₂ lu ina A lu ina KAŠ lu ina GEŠTIN EN₂ ana ŠA₃ ŠUB-di NAG\n", + "
" ], "text/plain": [ "" @@ -4257,7 +4256,9 @@ { "data": { "text/html": [ - "
P393782 obverse:2:1
line:86364
tr@en=If a man’s belly hurts him: you pound salted ḫašû-thyme, you put it in water or beer or wine, (and) he drinks it.
word:92865 [DIŠ
9057 [
cluster:80234
word:92865 [DIŠ
9058 DIŠ
word:92866 NA
9059 NA
word:92867 ŠA₃-] šu
9060 ŠA₃
9061 -
9062 ]
word:92867 ŠA₃-] šu
9063 šu
word:92868 GU₇-šu₂
9064 GU₇
9065 -
9066 šu₂
cluster:80235
word:92869 u₂HAR.HAR
9067 u₂
word:92869 u₂HAR.HAR
9068 HAR
9069 .
9070 HAR
word:92870 MUN
9071 MUN
word:92871 SUD₂
9072 SUD₂
word:92872 lu
9073 lu
word:92873 ina [
9074 ina
9075 [
cluster:80236
word:92874 A
9076 A
word:92875 ] lu
9077 ]
word:92875 ] lu
9078 lu
word:92876 ina
9079 ina
word:92877 KAŠ
9080 KAŠ
word:92878 lu
9081 lu
word:92879 ina
9082 ina
word:92880 GEŠTIN
9083 GEŠTIN
word:92881 <<EN₂>>
9084 <<
cluster:80237
word:92881 <<EN₂>>
9085 EN₂
9086 >>
word:92882 ana
9087 ana
word:92883 ŠA₃
9088 ŠA₃
word:92884 ŠUB-di
9089 ŠUB
9090 -
9091 di
word:92885 NAG
9092 NAG
" + "
P393782 obverse:2:1
line:59706
tr@en=If a man’s belly hurts him: you pound salted ḫašû-thyme, you put it in water or beer or wine, (and) he drinks it.
cluster:53575
word:66167 DIŠ
6007 DIŠ
word:66168 NA
6008 NA
word:66169 ŠA₃-šu
6009 ŠA₃-
6010 šu
word:66170 GU₇-šu
6011 GU₇-
6012 šu
cluster:53576
word:66171 uHAR.HAR
6013 u
word:66171 uHAR.HAR
6014 HAR.
6015 HAR
word:66172 MUN
6016 MUN
word:66173 SUD₂
6017 SUD₂
word:66174 lu
6018 lu
cluster:53577
word:66175 ina
6019 ina
word:66176 A
6020 A
word:66177 lu
6021 lu
word:66178 ina
6022 ina
word:66179 KAŠ
6023 KAŠ
word:66180 lu
6024 lu
word:66181 ina
6025 ina
word:66182 GEŠTIN
6026 GEŠTIN
cluster:53578
word:66183 EN₂
6027 EN₂
word:66184 ana
6028 ana
word:66185 ŠA₃
6029 ŠA₃
word:66186 ŠUB-di
6030 ŠUB-
6031 di
word:66187 NAG\n", + "
6032 NAG\n", + "
" ], "text/plain": [ "" @@ -4285,13 +4286,16 @@ "name": "stdout", "output_type": "stream", "text": [ - "2:1' [x x x] x lu#-u₂# ina KAŠ.SAG [x x x x x x x] \n" + " 1'. [x x x] x lu#-u₂# ina KAŠ.SAG [x x x x x x x]\n", + " 2:1' [x x x] x lu#-u₂# ina KAŠ.SAG [x x x x x x x]\n", + "\n" ] }, { "data": { "text/html": [ - "
P285109 reverse:2:1'  [x x x] x lu-u ina KAŠ.SAG [x x x x x x x]
" + "
P285109 reverse:2:1'  x x x x lu-u ina KAŠ.SAG x x x x x x x\n", + "
" ], "text/plain": [ "" @@ -4303,7 +4307,9 @@ { "data": { "text/html": [ - "
P285109 reverse:2:1'
line:86033
tr@en=[... he should drink it] either in prime quality beer [or in wine ...]
word:89780 [x
1342 [
cluster:79578
word:89780 [x
1343 x
word:89781 x
1344 x
word:89782 x]
1345 x
1346 ]
word:89783 x
1347 x
word:89784 lu-u
1348 lu
1349 -
1350 u
word:89785 ina
1351 ina
word:89786 KAŠ.SAG
1352 KAŠ
1353 .
1354 SAG
word:89787 [x
1355 [
cluster:79579
word:89787 [x
1356 x
word:89788 x
1357 x
word:89789 x
1358 x
word:89790 x
1359 x
word:89791 x
1360 x
word:89792 x
1361 x
word:89793 x]
1362 x
1363 ]
" + "
P285109 reverse:2:1'
line:59375
tr@en=[... he should drink it] either in prime quality beer [or in wine ...]
cluster:52919
word:63111 x
956 x
word:63112 x
957 x
word:63113 x
958 x
word:63114 x
959 x
word:63115 lu-u
960 lu-
961 u
word:63116 ina
962 ina
word:63117 KAŠ.SAG
963 KAŠ.
964 SAG
cluster:52920
word:63118 x
965 x
word:63119 x
966 x
word:63120 x
967 x
word:63121 x
968 x
word:63122 x
969 x
word:63123 x
970 x
word:63124 x\n", + "
971 x\n", + "
" ], "text/plain": [ "" @@ -4331,13 +4337,16 @@ "name": "stdout", "output_type": "stream", "text": [ - "2:4' [x x x x x x x x ] ŠU₂?# LUGAL?# [x x x x] \n" + " 4'. [x x x x x x x x Š]U₂? L[UGAL? x x x x]\n", + " 2:4' [x x x x x x x x ŠU₂?] [LUGAL? x x x x]\n", + "\n" ] }, { "data": { "text/html": [ - "
P285109 reverse:2:4'  [x x x x x x x x ] ŠU₂ LUGAL [x x x x]
" + "
P285109 reverse:2:4'  x x x x x x x x ŠU₂ LUGAL x x x x\n", + "
" ], "text/plain": [ "" @@ -4349,7 +4358,9 @@ { "data": { "text/html": [ - "
P285109 reverse:2:4'
line:86036
tr@en=[Palace of Aššur-ban-apli, king of the univ]erse?, ki[ng? of the land of Aššur],
word:89811 [x
1399 [
cluster:79584
word:89811 [x
1400 x
word:89812 x
1401 x
word:89813 x
1402 x
word:89814 x
1403 x
word:89815 x
1404 x
word:89816 x
1405 x
word:89817 x
1406 x
word:89818 x
1407 x
word:89819 ] ŠU₂
1408 ]
word:89819 ] ŠU₂
1409 ŠU₂
word:89820 LUGAL [
1410 LUGAL
1411 [
cluster:79585
word:89821 x
1412 x
word:89822 x
1413 x
word:89823 x
1414 x
word:89824 x]
1415 x
1416 ]
" + "
P285109 reverse:2:4'
line:59378
tr@en=[Palace of Aššur-ban-apli, king of the univ]erse?, ki[ng? of the land of Aššur],
cluster:52925
word:63142 x
994 x
word:63143 x
995 x
word:63144 x
996 x
word:63145 x
997 x
word:63146 x
998 x
word:63147 x
999 x
word:63148 x
1000 x
word:63149 x
1001 x
word:63150 ŠU₂
1002 ŠU₂
cluster:52926
word:63151 LUGAL
1003 LUGAL
word:63152 x
1004 x
word:63153 x
1005 x
word:63154 x
1006 x
word:63155 x\n", + "
1007 x\n", + "
" ], "text/plain": [ "" @@ -4377,13 +4388,16 @@ "name": "stdout", "output_type": "stream", "text": [ - "4' [...] giš!EREN TAG#[-at x x x x x x] \n" + " 4'. [...] {giš!}EREN T[AG-at x x x x x x]\n", + " 4' [...] {giš!}EREN [TAG-at x x x x x x]\n", + "\n" ] }, { "data": { "text/html": [ - "
P403291 obverse:4'  [...] giš!EREN TAG[-at x x x x x x]
" + "
P403291 obverse:4'  ... gišEREN TAG-at x x x x x x\n", + "
" ], "text/plain": [ "" @@ -4395,7 +4409,9 @@ { "data": { "text/html": [ - "
P403291 obverse:4'
line:86092
word:90275 [...]
2388 [
cluster:79696
word:90275 [...]
2389 ...
2390 ]
cluster:79697
word:90276 giš!EREN
2391 giš!
word:90276 giš!EREN
2392 EREN
word:90277 TAG[-at
2393 TAG
2394 [
cluster:79698
word:90277 TAG[-at
2395 -
2396 at
word:90278 x
2397 x
word:90279 x
2398 x
word:90280 x
2399 x
word:90281 x
2400 x
word:90282 x
2401 x
word:90283 x]
2402 x
2403 ]
" + "
P403291 obverse:4'
line:59434
cluster:53037
word:63605 ...
1644 ...
cluster:53038
word:63606 gišEREN
1645 giš
word:63606 gišEREN
1646 EREN
cluster:53039
word:63607 TAG-at
1647 TAG-
1648 at
word:63608 x
1649 x
word:63609 x
1650 x
word:63610 x
1651 x
word:63611 x
1652 x
word:63612 x
1653 x
word:63613 x\n", + "
1654 x\n", + "
" ], "text/plain": [ "" @@ -4423,13 +4439,16 @@ "name": "stdout", "output_type": "stream", "text": [ - "2:37' [IGI.MIN-šu₂ DUL-ma u₂-kal IGI.] MIN#-šu₂ ta-kar-ma UD.9.KAM* an-na-a DU₃.MEŠ \n" + " 37'. [IGI.MIN-šu₂ DUL-ma u₂-kal IGI.MI]N-šu₂ ta-kar-ma UD.9.KAM* an-na-a DU₃.MEŠ\n", + " 2:37' [IGI.MIN-šu₂ DUL-ma u₂-kal IGI.MIN]-šu₂ ta-kar-ma UD.9.KAM* an-na-a DU₃.MEŠ\n", + "\n" ] }, { "data": { "text/html": [ - "
P394520 obverse:2:37'  [IGI.MIN-šu DUL-ma u-kal IGI.] MIN-šu ta-kar-ma UD.9.KAM an-na-a DU₃.MEŠ
" + "
P394520 obverse:2:37'  IGI.MIN-šu DUL-ma u-kal IGI.MIN-šu ta-kar-ma UD.9.KAM an-na-a DU₃.MEŠ\n", + "
" ], "text/plain": [ "" @@ -4441,7 +4460,9 @@ { "data": { "text/html": [ - "
P394520 obverse:2:37'
line:87676
tr@en=tr.en.(2 31-7): If a man’s eyes are sick and then full of blood. They (= the eyes) are suffused with baluhhu-granules (and) blood, blood (and) tear(s) come out from the middle of his eyes. A film pushes away the pupil of his eyes. The blurred vision has turned into a film, with seeing being burdensome to him. You squeeze bīnu- tamarisk while still fresh (and) soak (it) in strong vinegar and let it stay under a star (= stay overnight). In the morning, you press it out into a funnel (lit. huliam-vessel). You pound separately alluharu-mineral, white plant, emesallu-saline solution, fat, tuškû-mineral, black cumin (and) exudation of copper. You take in equal amounts, stir (them) together. You pour (them) into the funnel (lit. huliam- vessel), which you have (earlier) rinsed. You knead (it) in ghee and šumēnu- mineral, then you open the upper part of his eyes with a finger (and) put (the medication) into his eyes. He keeps his eyes closed (while) you rub his eyes (i.e. the eyelids and surroundings) and continuously do this for nine days.
word:105180 [IGI.MIN-šu
41591 [
cluster:82908
word:105180 [IGI.MIN-šu
41592 IGI
41593 .
41594 MIN
41595 -
41596 šu
word:105181 DUL-ma
41597 DUL
41598 -
41599 ma
word:105182 u-kal
41600 u
41601 -
41602 kal
word:105183 IGI.] MIN-šu
41603 IGI
41604 .
41605 ]
word:105183 IGI.] MIN-šu
41606 MIN
41607 -
41608 šu
word:105184 ta-kar-ma
41609 ta
41610 -
41611 kar
41612 -
41613 ma
word:105185 UD.9.KAM
41614 UD
41615 .
41616 9
41617 .
41618 KAM
word:105186 an-na-a
41619 an
41620 -
41621 na
41622 -
41623 a
word:105187 DU₃.MEŠ
41624 DU₃
41625 .
41626 MEŠ
" + "
P394520 obverse:2:37'
line:61018
tr@en=tr.en.(2 31-7): If a man’s eyes are sick and then full of blood. They (= the eyes) are suffused with baluhhu-granules (and) blood, blood (and) tear(s) come out from the middle of his eyes. A film pushes away the pupil of his eyes. The blurred vision has turned into a film, with seeing being burdensome to him. You squeeze bīnu- tamarisk while still fresh (and) soak (it) in strong vinegar and let it stay under a star (= stay overnight). In the morning, you press it out into a funnel (lit. huliam-vessel). You pound separately alluharu-mineral, white plant, emesallu-saline solution, fat, tuškû-mineral, black cumin (and) exudation of copper. You take in equal amounts, stir (them) together. You pour (them) into the funnel (lit. huliam- vessel), which you have (earlier) rinsed. You knead (it) in ghee and šumēnu- mineral, then you open the upper part of his eyes with a finger (and) put (the medication) into his eyes. He keeps his eyes closed (while) you rub his eyes (i.e. the eyelids and surroundings) and continuously do this for nine days.
cluster:56250
word:78379 IGI.MIN-šu
27429 IGI.
27430 MIN-
27431 šu
word:78380 DUL-ma
27432 DUL-
27433 ma
word:78381 u-kal
27434 u-
27435 kal
word:78382 IGI.MIN-šu
27436 IGI.
27437 MIN-
word:78382 IGI.MIN-šu
27438 šu
word:78383 ta-kar-ma
27439 ta-
27440 kar-
27441 ma
word:78384 UD.9.KAM
27442 UD.
27443 9.
27444 KAM
word:78385 an-na-a
27445 an-
27446 na-
27447 a
word:78386 DU₃.MEŠ\n", + "
27448 DU₃.
27449 MEŠ\n", + "
" ], "text/plain": [ "" @@ -4458,7 +4479,8 @@ " s = L.d(ln, otype=\"sign\")[0]\n", " \n", " highlights = {s + p - 1 for p in positions}\n", - " print(F.lnno.v(ln), T.text(ln))\n", + " print(\" \" * 2, F.atf.v(ln))\n", + " print(f\"{F.lnno.v(ln):>6} {T.text(ln)}\")\n", " A.plain(ln, fmt=\"layout-orig-full\", highlights=highlights)\n", " A.pretty(\n", " ln,\n", diff --git a/tutorial/exportExcel.ipynb b/tutorial/exportExcel.ipynb index af0e3b4..017dbd9 100644 --- a/tutorial/exportExcel.ipynb +++ b/tutorial/exportExcel.ipynb @@ -60,7 +60,7 @@ { "data": { "text/html": [ - "TF-app: ~/text-fabric-data/Nino-cunei/ninmed/app" + "TF-app: ~/github/Nino-cunei/ninmed/app" ], "text/plain": [ "" @@ -72,7 +72,7 @@ { "data": { "text/html": [ - "data: ~/text-fabric-data/Nino-cunei/ninmed/tf/0.2" + "data: ~/github/Nino-cunei/ninmed/tf/0.3" ], "text/plain": [ "" @@ -88,7 +88,7 @@ "This is Text-Fabric 9.2.5\n", "Api reference : https://annotation.github.io/text-fabric/tf/cheatsheet.html\n", "\n", - "45 features found and 0 ignored\n" + "48 features found and 0 ignored\n" ] }, { @@ -100,7 +100,7 @@ "\n", "
\n", "
\n", - "after\n", + "after\n", "
\n", "
str
\n", "
\n", @@ -114,7 +114,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:36Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -143,7 +143,7 @@ "\n", "
\n", "
\n", - "atf\n", + "atf\n", "
\n", "
str
\n", "
\n", @@ -157,7 +157,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -186,7 +186,93 @@ "\n", "
\n", "
\n", - "col\n", + "atfpost\n", + "
\n", + "
str
\n", + "
\n", + " cluster characters that follow a sign or word\n", + "
\n", + "\n", + "
\n", + "
converters:
\n", + "
Cale Johnson, Dirk Roorda
\n", + "
\n", + "\n", + "
\n", + "
dateWritten:
\n", + "
2022-02-10T07:10:40Z
\n", + "
\n", + "\n", + "
\n", + "
editor:
\n", + "
Cale Johnson et al.
\n", + "
\n", + "\n", + "
\n", + "
name:
\n", + "
NinMed Medical Texts from Nineveh
\n", + "
\n", + "\n", + "
\n", + "
project:
\n", + "
BabMed
\n", + "
\n", + "\n", + "
\n", + "
writtenBy:
\n", + "
Text-Fabric
\n", + "
\n", + "\n", + "
\n", + "
\n", + "
\n", + "\n", + "
\n", + "
\n", + "atfpre\n", + "
\n", + "
str
\n", + "
\n", + " cluster characters that precede a sign or word\n", + "
\n", + "\n", + "
\n", + "
converters:
\n", + "
Cale Johnson, Dirk Roorda
\n", + "
\n", + "\n", + "
\n", + "
dateWritten:
\n", + "
2022-02-10T07:10:40Z
\n", + "
\n", + "\n", + "
\n", + "
editor:
\n", + "
Cale Johnson et al.
\n", + "
\n", + "\n", + "
\n", + "
name:
\n", + "
NinMed Medical Texts from Nineveh
\n", + "
\n", + "\n", + "
\n", + "
project:
\n", + "
BabMed
\n", + "
\n", + "\n", + "
\n", + "
writtenBy:
\n", + "
Text-Fabric
\n", + "
\n", + "\n", + "
\n", + "
\n", + "
\n", + "\n", + "
\n", + "
\n", + "col\n", "
\n", "
int
\n", "
\n", @@ -200,7 +286,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -229,7 +315,7 @@ "\n", "
\n", "
\n", - "collated\n", + "collated\n", "
\n", "
int
\n", "
\n", @@ -243,7 +329,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -272,7 +358,7 @@ "\n", "
\n", "
\n", - "collection\n", + "collection\n", "
\n", "
str
\n", "
\n", @@ -286,7 +372,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -315,7 +401,7 @@ "\n", "
\n", "
\n", - "colofon\n", + "colofon\n", "
\n", "
str
\n", "
\n", @@ -329,7 +415,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -358,7 +444,7 @@ "\n", "
\n", "
\n", - "comment\n", + "comment\n", "
\n", "
str
\n", "
\n", @@ -372,7 +458,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -401,7 +487,7 @@ "\n", "
\n", "
\n", - "damage\n", + "damage\n", "
\n", "
int
\n", "
\n", @@ -415,7 +501,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -444,7 +530,7 @@ "\n", "
\n", "
\n", - "description\n", + "description\n", "
\n", "
str
\n", "
\n", @@ -458,7 +544,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -487,7 +573,7 @@ "\n", "
\n", "
\n", - "det\n", + "det\n", "
\n", "
int
\n", "
\n", @@ -501,7 +587,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -530,7 +616,7 @@ "\n", "
\n", "
\n", - "docnumber\n", + "docnumber\n", "
\n", "
str
\n", "
\n", @@ -544,7 +630,50 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", + "
\n", + "\n", + "
\n", + "
editor:
\n", + "
Cale Johnson et al.
\n", + "
\n", + "\n", + "
\n", + "
name:
\n", + "
NinMed Medical Texts from Nineveh
\n", + "
\n", + "\n", + "
\n", + "
project:
\n", + "
BabMed
\n", + "
\n", + "\n", + "
\n", + "
writtenBy:
\n", + "
Text-Fabric
\n", + "
\n", + "\n", + "
\n", + "
\n", + "
\n", + "\n", + "
\n", + "
\n", + "erasure\n", + "
\n", + "
int
\n", + "
\n", + " whether a sign is in an erasure - between ° / °: 1: between ° and /; 2: between / and °\n", + "
\n", + "\n", + "
\n", + "
converters:
\n", + "
Cale Johnson, Dirk Roorda
\n", + "
\n", + "\n", + "
\n", + "
dateWritten:
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -573,7 +702,7 @@ "\n", "
\n", "
\n", - "excised\n", + "excised\n", "
\n", "
int
\n", "
\n", @@ -587,7 +716,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -616,7 +745,7 @@ "\n", "
\n", "
\n", - "face\n", + "face\n", "
\n", "
str
\n", "
\n", @@ -630,7 +759,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -659,7 +788,7 @@ "\n", "
\n", "
\n", - "flags\n", + "flags\n", "
\n", "
str
\n", "
\n", @@ -673,7 +802,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -702,7 +831,7 @@ "\n", "
\n", "
\n", - "gloss\n", + "gloss\n", "
\n", "
int
\n", "
\n", @@ -716,7 +845,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -745,7 +874,7 @@ "\n", "
\n", "
\n", - "grapheme\n", + "grapheme\n", "
\n", "
str
\n", "
\n", @@ -759,7 +888,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -788,7 +917,7 @@ "\n", "
\n", "
\n", - "lang\n", + "lang\n", "
\n", "
str
\n", "
\n", @@ -802,7 +931,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -831,7 +960,7 @@ "\n", "
\n", "
\n", - "lemma\n", + "lemma\n", "
\n", "
str
\n", "
\n", @@ -845,7 +974,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -874,7 +1003,7 @@ "\n", "
\n", "
\n", - "lln\n", + "lln\n", "
\n", "
int
\n", "
\n", @@ -888,7 +1017,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -917,7 +1046,7 @@ "\n", "
\n", "
\n", - "ln\n", + "ln\n", "
\n", "
int
\n", "
\n", @@ -931,7 +1060,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -960,7 +1089,7 @@ "\n", "
\n", "
\n", - "lnno\n", + "lnno\n", "
\n", "
str
\n", "
\n", @@ -974,7 +1103,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1003,7 +1132,7 @@ "\n", "
\n", "
\n", - "missing\n", + "missing\n", "
\n", "
int
\n", "
\n", @@ -1017,7 +1146,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1046,7 +1175,7 @@ "\n", "
\n", "
\n", - "modifiers\n", + "modifiers\n", "
\n", "
str
\n", "
\n", @@ -1060,7 +1189,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1089,7 +1218,7 @@ "\n", "
\n", "
\n", - "museum\n", + "museum\n", "
\n", "
str
\n", "
\n", @@ -1103,7 +1232,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1132,7 +1261,7 @@ "\n", "
\n", "
\n", - "note\n", + "note\n", "
\n", "
str
\n", "
\n", @@ -1146,7 +1275,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1175,7 +1304,7 @@ "\n", "
\n", "
\n", - "number\n", + "number\n", "
\n", "
int
\n", "
\n", @@ -1189,7 +1318,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1218,7 +1347,7 @@ "\n", "
\n", "
\n", - "otype\n", + "otype\n", "
\n", "
str
\n", "
\n", @@ -1232,7 +1361,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1261,7 +1390,7 @@ "\n", "
\n", "
\n", - "pnumber\n", + "pnumber\n", "
\n", "
str
\n", "
\n", @@ -1275,7 +1404,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1304,7 +1433,7 @@ "\n", "
\n", "
\n", - "primecol\n", + "primecol\n", "
\n", "
int
\n", "
\n", @@ -1318,7 +1447,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1347,7 +1476,7 @@ "\n", "
\n", "
\n", - "primeln\n", + "primeln\n", "
\n", "
int
\n", "
\n", @@ -1361,7 +1490,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1390,7 +1519,7 @@ "\n", "
\n", "
\n", - "publication\n", + "publication\n", "
\n", "
str
\n", "
\n", @@ -1404,7 +1533,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1433,7 +1562,7 @@ "\n", "
\n", "
\n", - "question\n", + "question\n", "
\n", "
int
\n", "
\n", @@ -1447,7 +1576,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1476,7 +1605,7 @@ "\n", "
\n", "
\n", - "reading\n", + "reading\n", "
\n", "
str
\n", "
\n", @@ -1490,7 +1619,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1519,7 +1648,7 @@ "\n", "
\n", "
\n", - "remarkable\n", + "remarkable\n", "
\n", "
int
\n", "
\n", @@ -1533,7 +1662,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1562,7 +1691,7 @@ "\n", "
\n", "
\n", - "ruling\n", + "ruling\n", "
\n", "
str
\n", "
\n", @@ -1576,7 +1705,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1605,7 +1734,7 @@ "\n", "
\n", "
\n", - "seal\n", + "seal\n", "
\n", "
str
\n", "
\n", @@ -1619,7 +1748,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1648,7 +1777,7 @@ "\n", "
\n", "
\n", - "supplied\n", + "supplied\n", "
\n", "
int
\n", "
\n", @@ -1662,7 +1791,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1691,7 +1820,7 @@ "\n", "
\n", "
\n", - "sym\n", + "sym\n", "
\n", "
str
\n", "
\n", @@ -1705,7 +1834,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1734,7 +1863,7 @@ "\n", "
\n", "
\n", - "tr@ll\n", + "tr@ll\n", "
\n", "
str
\n", "
\n", @@ -1748,7 +1877,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1777,7 +1906,7 @@ "\n", "
\n", "
\n", - "trans\n", + "trans\n", "
\n", "
int
\n", "
\n", @@ -1791,7 +1920,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1820,7 +1949,7 @@ "\n", "
\n", "
\n", - "type\n", + "type\n", "
\n", "
str
\n", "
\n", @@ -1834,7 +1963,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1863,7 +1992,7 @@ "\n", "
\n", "
\n", - "uncertain\n", + "uncertain\n", "
\n", "
int
\n", "
\n", @@ -1877,7 +2006,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1906,7 +2035,7 @@ "\n", "
\n", "
\n", - "variant\n", + "variant\n", "
\n", "
int
\n", "
\n", @@ -1920,7 +2049,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1949,7 +2078,7 @@ "\n", "
\n", "
\n", - "oslots\n", + "oslots\n", "
\n", "
none
\n", "
\n", @@ -1963,7 +2092,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -2658,7 +2787,8 @@ } ], "source": [ - "A = use(\"Nino-cunei/ninmed\", hoist=globals())" + "A = use(\"Nino-cunei/ninmed:clone\", checkout=\"clone\", hoist=globals())\n", + "# A = use(\"Nino-cunei/ninmed\", hoist=globals())" ] }, { @@ -2726,7 +2856,7 @@ "name": "stdout", "output_type": "stream", "text": [ - " 0.07s 6 results\n" + " 0.05s 8 results\n" ] } ], @@ -2780,12 +2910,15 @@ "output_type": "stream", "text": [ "R\tS1\tS2\tS3\tNODE1\tTYPE1\tTEXT1\tln1\tNODE2\tTYPE2\tTEXT2\treading2\n", - "1\tP365742\treverse\t1:1\t86698\tline\tana# KI# [MIN ...] DE₃ ṣar-ba-te ina A GAZIsar SILA₁₁-aš LAL \t1\t18001\tsign\tana# \tana\n", - "2\tP365742\treverse\t1:2\t86699\tline\tana# [KI MIN ... ] šim#GUR₂.GUR₂ ina A GAZIsar SILA₁₁-aš LAL \t2\t18021\tsign\tana# \tana\n", - "3\tP365742\treverse\t1:3\t86700\tline\tana# [KI MIN ... ZI₃.] KUM# HI.HI ina A GAZIsar SILA₁₁-aš LAL \t3\t18039\tsign\tana# \tana\n", - "4\tP365744\tobverse\t2:2\t86935\tline\tana ZI SAG.KI nu-uh₂#-hi DUH.ŠE.GIŠ.I₃ SUMUN-MEŠ šimGUR₂.GUR₂ šimHAB šimBULUH GAZIsar ta-pa-aṣ \t2\t24356\tsign\tana \tana\n", - "5\tP394422\treverse\t2:3\t87249\tline\tana KIMIN MUN SUD₂ sig₂AKA₃ NIGIN I₃+GIŠ ŠUR.MIN₃ SUD ana ŠA₃ GEŠTU.MIN-šu₂ GAR-an I₃+GIŠ ŠUR.MIN₃ ana SAG.KI#[.MEŠ-šu₂ ŠUB] \t3\t32855\tsign\tana \tana\n", - "6\tP432416\tobverse\t1:3\t87501\tline\tana# TI#-šu₂ na₄KA.GI.NA.DAB.BA na₄AN.NA na₄AN.ZAH#[.GE₆ ...] \t3\t37384\tsign\tana# \tana\n" + "1\tP365742\treverse\t1:1\t60040\tline\tana# [KI MIN ...] DE₃ ṣar-ba-te ina A GAZI{sar} SILA₁₁-aš LAL\n", + "\t1\t12034\tsign\tana# \tana\n", + "2\tP365742\treverse\t1:2\t60041\tline\t[ana KI MIN ... {šim]}GUR₂.GUR₂ ina A GAZI{sar} SILA₁₁-aš LAL\n", + "\t2\t12049\tsign\t[ana \tana\n", + "3\tP365742\treverse\t1:3\t60042\tline\t[ana KI MIN ... ZI₃.KUM] HI.HI ina A GAZI{sar} SILA₁₁-aš LAL\n", + "\t3\t12063\tsign\t[ana \tana\n", + "4\tP365744\tobverse\t2:2\t60277\tline\tana ZI SAG.KI nu-uh₂#-hi DUH.ŠE.GIŠ.I₃ SUMUN-MEŠ {šim}GUR₂.GUR₂ {šim}HAB {šim}BULUH GAZI{sar} ta-pa-aṣ\n", + "\t2\t16324\tsign\tana \tana\n", + "5\tP394422\treverse\t1:3\t60517\tline\t[ana ŠA₃ GEŠTU.MIN-šu₂ BI].IZ kam-ka-ma# ša₂ kim-ṣi# [ANŠE x x] x ša₂# GU₂#.MURGU₂ ANŠE ina I₃ {giš}EREN HI.HI\n" ] } ], @@ -2832,12 +2965,14 @@ "output_type": "stream", "text": [ "R\tS1\tS2\tS3\tNODE1\tTYPE1\tln1\tNODE2\tTYPE2\tTEXT2\treading2\n", - "1\tP365742\treverse\t1:1\t86698\tline\t1\t18001\tsign\tana# \tana\n", - "2\tP365742\treverse\t1:2\t86699\tline\t2\t18021\tsign\tana# \tana\n", - "3\tP365742\treverse\t1:3\t86700\tline\t3\t18039\tsign\tana# \tana\n", - "4\tP365744\tobverse\t2:2\t86935\tline\t2\t24356\tsign\tana \tana\n", - "5\tP394422\treverse\t2:3\t87249\tline\t3\t32855\tsign\tana \tana\n", - "6\tP432416\tobverse\t1:3\t87501\tline\t3\t37384\tsign\tana# \tana\n" + "1\tP365742\treverse\t1:1\t60040\tline\t1\t12034\tsign\tana# \tana\n", + "2\tP365742\treverse\t1:2\t60041\tline\t2\t12049\tsign\t[ana \tana\n", + "3\tP365742\treverse\t1:3\t60042\tline\t3\t12063\tsign\t[ana \tana\n", + "4\tP365744\tobverse\t2:2\t60277\tline\t2\t16324\tsign\tana \tana\n", + "5\tP394422\treverse\t1:3\t60517\tline\t3\t20586\tsign\t[ana \tana\n", + "6\tP394422\treverse\t2:3\t60591\tline\t3\t21888\tsign\tana \tana\n", + "7\tP432416\tobverse\t1:3\t60843\tline\t3\t24726\tsign\tana# \tana\n", + "8\tP393743\treverse\t2:3\t62187\tline\t3\t49036\tsign\t[ana \tana\n" ] } ], @@ -2865,12 +3000,14 @@ "output_type": "stream", "text": [ "R\tS1\tS2\tS3\tNODE1\tTYPE1\tln1\tNODE2\tTYPE2\tTEXT2\treading2\n", - "1\tP365742\treverse\t1:1\t86698\tline\t1\t18001\tsign\tana \tana\n", - "2\tP365742\treverse\t1:2\t86699\tline\t2\t18021\tsign\tana \tana\n", - "3\tP365742\treverse\t1:3\t86700\tline\t3\t18039\tsign\tana \tana\n", - "4\tP365744\tobverse\t2:2\t86935\tline\t2\t24356\tsign\tana \tana\n", - "5\tP394422\treverse\t2:3\t87249\tline\t3\t32855\tsign\tana \tana\n", - "6\tP432416\tobverse\t1:3\t87501\tline\t3\t37384\tsign\tana \tana\n" + "1\tP365742\treverse\t1:1\t60040\tline\t1\t12034\tsign\tana \tana\n", + "2\tP365742\treverse\t1:2\t60041\tline\t2\t12049\tsign\tana \tana\n", + "3\tP365742\treverse\t1:3\t60042\tline\t3\t12063\tsign\tana \tana\n", + "4\tP365744\tobverse\t2:2\t60277\tline\t2\t16324\tsign\tana \tana\n", + "5\tP394422\treverse\t1:3\t60517\tline\t3\t20586\tsign\tana \tana\n", + "6\tP394422\treverse\t2:3\t60591\tline\t3\t21888\tsign\tana \tana\n", + "7\tP432416\tobverse\t1:3\t60843\tline\t3\t24726\tsign\tana \tana\n", + "8\tP393743\treverse\t2:3\t62187\tline\t3\t49036\tsign\tana \tana\n" ] } ], @@ -2907,7 +3044,7 @@ "name": "stdout", "output_type": "stream", "text": [ - " 0.11s 6 results\n" + " 0.08s 8 results\n" ] } ], @@ -2938,12 +3075,14 @@ "output_type": "stream", "text": [ "R\tS1\tS2\tS3\tNODE1\tTYPE1\tln1\tNODE2\tTYPE2\tTEXT2\tflags2\treading2\n", - "1\tP365742\treverse\t1:1\t86698\tline\t1\t18001\tsign\tana# \t#\tana\n", - "2\tP365742\treverse\t1:2\t86699\tline\t2\t18021\tsign\tana# \t#\tana\n", - "3\tP365742\treverse\t1:3\t86700\tline\t3\t18039\tsign\tana# \t#\tana\n", - "4\tP365744\tobverse\t2:2\t86935\tline\t2\t24356\tsign\tana \t\tana\n", - "5\tP394422\treverse\t2:3\t87249\tline\t3\t32855\tsign\tana \t\tana\n", - "6\tP432416\tobverse\t1:3\t87501\tline\t3\t37384\tsign\tana# \t#\tana\n" + "1\tP365742\treverse\t1:1\t60040\tline\t1\t12034\tsign\tana# \t#\tana\n", + "2\tP365742\treverse\t1:2\t60041\tline\t2\t12049\tsign\t[ana \t\tana\n", + "3\tP365742\treverse\t1:3\t60042\tline\t3\t12063\tsign\t[ana \t\tana\n", + "4\tP365744\tobverse\t2:2\t60277\tline\t2\t16324\tsign\tana \t\tana\n", + "5\tP394422\treverse\t1:3\t60517\tline\t3\t20586\tsign\t[ana \t\tana\n", + "6\tP394422\treverse\t2:3\t60591\tline\t3\t21888\tsign\tana \t\tana\n", + "7\tP432416\tobverse\t1:3\t60843\tline\t3\t24726\tsign\tana# \t#\tana\n", + "8\tP393743\treverse\t2:3\t62187\tline\t3\t49036\tsign\t[ana \t\tana\n" ] } ], @@ -2978,16 +3117,16 @@ { "data": { "text/plain": [ - "[(89154, 1001, 10001),\n", - " (89155, 1002, 10002),\n", - " (89156, 1003, 10003),\n", - " (89157, 1004, 10004),\n", - " (89158, 1005, 10005),\n", - " (89159, 1006, 10006),\n", - " (89160, 1007, 10007),\n", - " (89161, 1008, 10008),\n", - " (89162, 1009, 10009),\n", - " (89163, 1010, 10010)]" + "[(62496, 1001, 10001),\n", + " (62497, 1002, 10002),\n", + " (62498, 1003, 10003),\n", + " (62499, 1004, 10004),\n", + " (62500, 1005, 10005),\n", + " (62501, 1006, 10006),\n", + " (62502, 1007, 10007),\n", + " (62503, 1008, 10008),\n", + " (62504, 1009, 10009),\n", + " (62505, 1010, 10010)]" ] }, "execution_count": 12, @@ -3025,15 +3164,15 @@ "output_type": "stream", "text": [ "R\tS1\tS2\tS3\tNODE1\tTYPE1\tTEXT1\tln1\tNODE2\tTYPE2\tTEXT2\tflags2\treading2\tNODE3\tTYPE3\tTEXT3\n", - "1\tP285136\tobverse\t9'\t89154\tword\tMAR \t\t1001\tsign\t-\t\t\t10001\tsign\tgi#\n", - "2\tP285136\tobverse\t9'\t89155\tword\tTI \t\t1002\tsign\tbi?# \t?#\tbi\t10002\tsign\t-\n", - "3\tP285136\tobverse\t9'\t89156\tword\tGUD \t\t1003\tsign\t[\t\t\t10003\tsign\tna\n", - "4\tP285136\tobverse\t9'\t89157\tword\tID₂ \t\t1004\tsign\tx \t\t\t10004\tsign\t-\n", - "5\tP285136\tobverse\t9'\t89158\tword\tina \t\t1005\tsign\tx \t\t\t10005\tsign\ta \n", - "6\tP285136\tobverse\t9'\t89159\tword\tIZI \t\t1006\tsign\tx \t\t\t10006\tsign\tLAL \n", - "7\tP285136\tobverse\t9'\t89160\tword\ttur-ar₂ \t\t1007\tsign\tx \t\t\t10007\tsign\tI₃\n", - "8\tP285136\tobverse\t9'\t89161\tword\tIGI \t\t1008\tsign\tx \t\t\t10008\tsign\t.\n", - "9\tP285136\tobverse\t9'\t89162\tword\tGIG# [\t\t1009\tsign\tx \t\t\t10009\tsign\tNUN\n" + "1\tP285136\tobverse\t9'\t62496\tword\tMAR \t\t1001\tsign\tx \t\t\t10001\tsign\tGAZI\n", + "2\tP285136\tobverse\t9'\t62497\tword\tTI \t\t1002\tsign\tŠU₂?] \t?\t\t10002\tsign\t{sar}] \n", + "3\tP285136\tobverse\t9'\t62498\tword\tGUD \t\t1003\tsign\t[LUGAL? \t?\t\t10003\tsign\tSILA₁₁#-\n", + "4\tP285136\tobverse\t9'\t62499\tword\tID₂ \t\t1004\tsign\tx \t\t\t10004\tsign\taš \n", + "5\tP285136\tobverse\t9'\t62500\tword\tina \t\t1005\tsign\tx \t\t\t10005\tsign\tSAR-\n", + "6\tP285136\tobverse\t9'\t62501\tword\tIZI \t\t1006\tsign\tx \t\t\t10006\tsign\tab \n", + "7\tP285136\tobverse\t9'\t62502\tword\ttur-ar₂ \t\t1007\tsign\tx]\n", + "\t\t\t10007\tsign\tLAL-\n", + "8\tP285136\tobverse\t9'\t62503\tword\tIGI \t\t1008\tsign\t\t\t\t10008\tsign\tma \n" ] } ], @@ -3079,15 +3218,15 @@ "output_type": "stream", "text": [ "R\tS1\tS2\tS3\tNODE1\tTYPE1\tTEXT1\tNODE2\tTYPE2\tTEXT2\tNODE3\tTYPE3\tTEXT3\n", - "1\tP285136\tobverse\t9'\t89154\tword\tMAR \t1001\tsign\t-\t10001\tsign\tgi#\n", - "2\tP285136\tobverse\t9'\t89155\tword\tTI \t1002\tsign\tbi?# \t10002\tsign\t-\n", - "3\tP285136\tobverse\t9'\t89156\tword\tGUD \t1003\tsign\t[\t10003\tsign\tna\n", - "4\tP285136\tobverse\t9'\t89157\tword\tID₂ \t1004\tsign\tx \t10004\tsign\t-\n", - "5\tP285136\tobverse\t9'\t89158\tword\tina \t1005\tsign\tx \t10005\tsign\ta \n", - "6\tP285136\tobverse\t9'\t89159\tword\tIZI \t1006\tsign\tx \t10006\tsign\tLAL \n", - "7\tP285136\tobverse\t9'\t89160\tword\ttur-ar₂ \t1007\tsign\tx \t10007\tsign\tI₃\n", - "8\tP285136\tobverse\t9'\t89161\tword\tIGI \t1008\tsign\tx \t10008\tsign\t.\n", - "9\tP285136\tobverse\t9'\t89162\tword\tGIG# [\t1009\tsign\tx \t10009\tsign\tNUN\n" + "1\tP285136\tobverse\t9'\t62496\tword\tMAR \t1001\tsign\tx \t10001\tsign\tGAZI\n", + "2\tP285136\tobverse\t9'\t62497\tword\tTI \t1002\tsign\tŠU₂?] \t10002\tsign\t{sar}] \n", + "3\tP285136\tobverse\t9'\t62498\tword\tGUD \t1003\tsign\t[LUGAL? \t10003\tsign\tSILA₁₁#-\n", + "4\tP285136\tobverse\t9'\t62499\tword\tID₂ \t1004\tsign\tx \t10004\tsign\taš \n", + "5\tP285136\tobverse\t9'\t62500\tword\tina \t1005\tsign\tx \t10005\tsign\tSAR-\n", + "6\tP285136\tobverse\t9'\t62501\tword\tIZI \t1006\tsign\tx \t10006\tsign\tab \n", + "7\tP285136\tobverse\t9'\t62502\tword\ttur-ar₂ \t1007\tsign\tx]\n", + "\t10007\tsign\tLAL-\n", + "8\tP285136\tobverse\t9'\t62503\tword\tIGI \t1008\tsign\t\t10008\tsign\tma \n" ] } ], @@ -3146,15 +3285,15 @@ "output_type": "stream", "text": [ "R\tS1\tS2\tS3\tNODE1\tTYPE1\tTEXT1\tatf1\tafter1\tNODE2\tTYPE2\tTEXT2\tatf2\tafter2\tNODE3\tTYPE3\tTEXT3\tsym3\tafter3\n", - "1\tP285136\tobverse\t9'\t89154\tword\tMAR \tMAR\t \t1001\tsign\t-\t-\t\t10001\tsign\tgi#\tgi\t\n", - "2\tP285136\tobverse\t9'\t89155\tword\tTI \tTI\t \t1002\tsign\tbi?# \tbi?#\t \t10002\tsign\t-\t-\t\n", - "3\tP285136\tobverse\t9'\t89156\tword\tGUD \tGUD\t \t1003\tsign\t[\t[\t\t10003\tsign\tna\tna\t\n", - "4\tP285136\tobverse\t9'\t89157\tword\tID₂ \tID₂\t \t1004\tsign\tx \tx\t \t10004\tsign\t-\t-\t\n", - "5\tP285136\tobverse\t9'\t89158\tword\tina \tina\t \t1005\tsign\tx \tx\t \t10005\tsign\ta \ta\t \n", - "6\tP285136\tobverse\t9'\t89159\tword\tIZI \tIZI\t \t1006\tsign\tx \tx\t \t10006\tsign\tLAL \tLAL\t \n", - "7\tP285136\tobverse\t9'\t89160\tword\ttur-ar₂ \ttur-ar₂\t \t1007\tsign\tx \tx\t \t10007\tsign\tI₃\tI₃\t\n", - "8\tP285136\tobverse\t9'\t89161\tword\tIGI \tIGI\t \t1008\tsign\tx \tx\t \t10008\tsign\t.\t.\t\n", - "9\tP285136\tobverse\t9'\t89162\tword\tGIG# [\tGI[G\t \t1009\tsign\tx \tx\t \t10009\tsign\tNUN\tNUN\t\n" + "1\tP285136\tobverse\t9'\t62496\tword\tMAR \tMAR\t \t1001\tsign\tx \tx\t \t10001\tsign\tGAZI\tGAZI\t\n", + "2\tP285136\tobverse\t9'\t62497\tword\tTI \tTI\t \t1002\tsign\tŠU₂?] \tŠU₂?\t \t10002\tsign\t{sar}] \tsar\t \n", + "3\tP285136\tobverse\t9'\t62498\tword\tGUD \tGUD\t \t1003\tsign\t[LUGAL? \tLUGAL?\t \t10003\tsign\tSILA₁₁#-\tSILA₁₁\t-\n", + "4\tP285136\tobverse\t9'\t62499\tword\tID₂ \tID₂\t \t1004\tsign\tx \tx\t \t10004\tsign\taš \taš\t \n", + "5\tP285136\tobverse\t9'\t62500\tword\tina \tina\t \t1005\tsign\tx \tx\t \t10005\tsign\tSAR-\tSAR\t-\n", + "6\tP285136\tobverse\t9'\t62501\tword\tIZI \tIZI\t \t1006\tsign\tx \tx\t \t10006\tsign\tab \tab\t \n", + "7\tP285136\tobverse\t9'\t62502\tword\ttur-ar₂ \ttur-ar₂\t \t1007\tsign\tx]\n", + "\tx\t\n", + "\t10007\tsign\tLAL-\tLAL\t-\n" ] } ], diff --git a/tutorial/search.ipynb b/tutorial/search.ipynb index fa42e73..70ad51c 100644 --- a/tutorial/search.ipynb +++ b/tutorial/search.ipynb @@ -51,6 +51,33 @@ "[search template docs](https://annotation.github.io/text-fabric/tf/about/searchusage.html)." ] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Before you compute\n", + "\n", + "You can open the corpus in the Text-Fabric browser and\n", + "explore the contents in a browser window which is served\n", + "from your computer:" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "!!text-fabric Nino-cunei/ninmed:clone --checkout=clone" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Prepare to compute" + ] + }, { "cell_type": "code", "execution_count": 1, @@ -77,13 +104,13 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 3, "metadata": {}, "outputs": [ { "data": { "text/html": [ - "TF-app: ~/text-fabric-data/Nino-cunei/ninmed/app" + "TF-app: ~/github/Nino-cunei/ninmed/app" ], "text/plain": [ "" @@ -95,7 +122,7 @@ { "data": { "text/html": [ - "data: ~/text-fabric-data/Nino-cunei/ninmed/tf/0.2" + "data: ~/github/Nino-cunei/ninmed/tf/0.3" ], "text/plain": [ "" @@ -111,7 +138,7 @@ "This is Text-Fabric 9.2.5\n", "Api reference : https://annotation.github.io/text-fabric/tf/cheatsheet.html\n", "\n", - "45 features found and 0 ignored\n" + "48 features found and 0 ignored\n" ] }, { @@ -123,7 +150,7 @@ "\n", "
\n", "
\n", - "after\n", + "after\n", "
\n", "
str
\n", "
\n", @@ -137,7 +164,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:36Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -166,7 +193,7 @@ "\n", "
\n", "
\n", - "atf\n", + "atf\n", "
\n", "
str
\n", "
\n", @@ -180,7 +207,93 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", + "
\n", + "\n", + "
\n", + "
editor:
\n", + "
Cale Johnson et al.
\n", + "
\n", + "\n", + "
\n", + "
name:
\n", + "
NinMed Medical Texts from Nineveh
\n", + "
\n", + "\n", + "
\n", + "
project:
\n", + "
BabMed
\n", + "
\n", + "\n", + "
\n", + "
writtenBy:
\n", + "
Text-Fabric
\n", + "
\n", + "\n", + "
\n", + "
\n", + "
\n", + "\n", + "
\n", + "
\n", + "atfpost\n", + "
\n", + "
str
\n", + "
\n", + " cluster characters that follow a sign or word\n", + "
\n", + "\n", + "
\n", + "
converters:
\n", + "
Cale Johnson, Dirk Roorda
\n", + "
\n", + "\n", + "
\n", + "
dateWritten:
\n", + "
2022-02-10T07:10:40Z
\n", + "
\n", + "\n", + "
\n", + "
editor:
\n", + "
Cale Johnson et al.
\n", + "
\n", + "\n", + "
\n", + "
name:
\n", + "
NinMed Medical Texts from Nineveh
\n", + "
\n", + "\n", + "
\n", + "
project:
\n", + "
BabMed
\n", + "
\n", + "\n", + "
\n", + "
writtenBy:
\n", + "
Text-Fabric
\n", + "
\n", + "\n", + "
\n", + "
\n", + "
\n", + "\n", + "
\n", + "
\n", + "atfpre\n", + "
\n", + "
str
\n", + "
\n", + " cluster characters that precede a sign or word\n", + "
\n", + "\n", + "
\n", + "
converters:
\n", + "
Cale Johnson, Dirk Roorda
\n", + "
\n", + "\n", + "
\n", + "
dateWritten:
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -209,7 +322,7 @@ "\n", "
\n", "
\n", - "col\n", + "col\n", "
\n", "
int
\n", "
\n", @@ -223,7 +336,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -252,7 +365,7 @@ "\n", "
\n", "
\n", - "collated\n", + "collated\n", "
\n", "
int
\n", "
\n", @@ -266,7 +379,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -295,7 +408,7 @@ "\n", "
\n", "
\n", - "collection\n", + "collection\n", "
\n", "
str
\n", "
\n", @@ -309,7 +422,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -338,7 +451,7 @@ "\n", "
\n", "
\n", - "colofon\n", + "colofon\n", "
\n", "
str
\n", "
\n", @@ -352,7 +465,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -381,7 +494,7 @@ "\n", "
\n", "
\n", - "comment\n", + "comment\n", "
\n", "
str
\n", "
\n", @@ -395,7 +508,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -424,7 +537,7 @@ "\n", "
\n", "
\n", - "damage\n", + "damage\n", "
\n", "
int
\n", "
\n", @@ -438,7 +551,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -467,7 +580,7 @@ "\n", "
\n", "
\n", - "description\n", + "description\n", "
\n", "
str
\n", "
\n", @@ -481,7 +594,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -510,7 +623,7 @@ "\n", "
\n", "
\n", - "det\n", + "det\n", "
\n", "
int
\n", "
\n", @@ -524,7 +637,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -553,7 +666,7 @@ "\n", "
\n", "
\n", - "docnumber\n", + "docnumber\n", "
\n", "
str
\n", "
\n", @@ -567,7 +680,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -596,7 +709,50 @@ "\n", "
\n", "
\n", - "excised\n", + "erasure\n", + "
\n", + "
int
\n", + "
\n", + " whether a sign is in an erasure - between ° / °: 1: between ° and /; 2: between / and °\n", + "
\n", + "\n", + "
\n", + "
converters:
\n", + "
Cale Johnson, Dirk Roorda
\n", + "
\n", + "\n", + "
\n", + "
dateWritten:
\n", + "
2022-02-10T07:10:40Z
\n", + "
\n", + "\n", + "
\n", + "
editor:
\n", + "
Cale Johnson et al.
\n", + "
\n", + "\n", + "
\n", + "
name:
\n", + "
NinMed Medical Texts from Nineveh
\n", + "
\n", + "\n", + "
\n", + "
project:
\n", + "
BabMed
\n", + "
\n", + "\n", + "
\n", + "
writtenBy:
\n", + "
Text-Fabric
\n", + "
\n", + "\n", + "
\n", + "
\n", + "
\n", + "\n", + "
\n", + "
\n", + "excised\n", "
\n", "
int
\n", "
\n", @@ -610,7 +766,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -639,7 +795,7 @@ "\n", "
\n", "
\n", - "face\n", + "face\n", "
\n", "
str
\n", "
\n", @@ -653,7 +809,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -682,7 +838,7 @@ "\n", "
\n", "
\n", - "flags\n", + "flags\n", "
\n", "
str
\n", "
\n", @@ -696,7 +852,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -725,7 +881,7 @@ "\n", "
\n", "
\n", - "gloss\n", + "gloss\n", "
\n", "
int
\n", "
\n", @@ -739,7 +895,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -768,7 +924,7 @@ "\n", "
\n", "
\n", - "grapheme\n", + "grapheme\n", "
\n", "
str
\n", "
\n", @@ -782,7 +938,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -811,7 +967,7 @@ "\n", "
\n", "
\n", - "lang\n", + "lang\n", "
\n", "
str
\n", "
\n", @@ -825,7 +981,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -854,7 +1010,7 @@ "\n", "
\n", "
\n", - "lemma\n", + "lemma\n", "
\n", "
str
\n", "
\n", @@ -868,7 +1024,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -897,7 +1053,7 @@ "\n", "
\n", "
\n", - "lln\n", + "lln\n", "
\n", "
int
\n", "
\n", @@ -911,7 +1067,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -940,7 +1096,7 @@ "\n", "
\n", "
\n", - "ln\n", + "ln\n", "
\n", "
int
\n", "
\n", @@ -954,7 +1110,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -983,7 +1139,7 @@ "\n", "
\n", "
\n", - "lnno\n", + "lnno\n", "
\n", "
str
\n", "
\n", @@ -997,7 +1153,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1026,7 +1182,7 @@ "\n", "
\n", "
\n", - "missing\n", + "missing\n", "
\n", "
int
\n", "
\n", @@ -1040,7 +1196,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1069,7 +1225,7 @@ "\n", "
\n", "
\n", - "modifiers\n", + "modifiers\n", "
\n", "
str
\n", "
\n", @@ -1083,7 +1239,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1112,7 +1268,7 @@ "\n", "
\n", "
\n", - "museum\n", + "museum\n", "
\n", "
str
\n", "
\n", @@ -1126,7 +1282,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1155,7 +1311,7 @@ "\n", "
\n", "
\n", - "note\n", + "note\n", "
\n", "
str
\n", "
\n", @@ -1169,7 +1325,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1198,7 +1354,7 @@ "\n", "
\n", "
\n", - "number\n", + "number\n", "
\n", "
int
\n", "
\n", @@ -1212,7 +1368,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1241,7 +1397,7 @@ "\n", "
\n", "
\n", - "otype\n", + "otype\n", "
\n", "
str
\n", "
\n", @@ -1255,7 +1411,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1284,7 +1440,7 @@ "\n", "
\n", "
\n", - "pnumber\n", + "pnumber\n", "
\n", "
str
\n", "
\n", @@ -1298,7 +1454,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1327,7 +1483,7 @@ "\n", "
\n", "
\n", - "primecol\n", + "primecol\n", "
\n", "
int
\n", "
\n", @@ -1341,7 +1497,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1370,7 +1526,7 @@ "\n", "
\n", "
\n", - "primeln\n", + "primeln\n", "
\n", "
int
\n", "
\n", @@ -1384,7 +1540,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1413,7 +1569,7 @@ "\n", "
\n", "
\n", - "publication\n", + "publication\n", "
\n", "
str
\n", "
\n", @@ -1427,7 +1583,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1456,7 +1612,7 @@ "\n", "
\n", "
\n", - "question\n", + "question\n", "
\n", "
int
\n", "
\n", @@ -1470,7 +1626,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1499,7 +1655,7 @@ "\n", "
\n", "
\n", - "reading\n", + "reading\n", "
\n", "
str
\n", "
\n", @@ -1513,7 +1669,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1542,7 +1698,7 @@ "\n", "
\n", "
\n", - "remarkable\n", + "remarkable\n", "
\n", "
int
\n", "
\n", @@ -1556,7 +1712,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1585,7 +1741,7 @@ "\n", "
\n", "
\n", - "ruling\n", + "ruling\n", "
\n", "
str
\n", "
\n", @@ -1599,7 +1755,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1628,7 +1784,7 @@ "\n", "
\n", "
\n", - "seal\n", + "seal\n", "
\n", "
str
\n", "
\n", @@ -1642,7 +1798,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1671,7 +1827,7 @@ "\n", "
\n", "
\n", - "supplied\n", + "supplied\n", "
\n", "
int
\n", "
\n", @@ -1685,7 +1841,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1714,7 +1870,7 @@ "\n", "
\n", "
\n", - "sym\n", + "sym\n", "
\n", "
str
\n", "
\n", @@ -1728,7 +1884,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1757,7 +1913,7 @@ "\n", "
\n", "
\n", - "tr@ll\n", + "tr@ll\n", "
\n", "
str
\n", "
\n", @@ -1771,7 +1927,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1800,7 +1956,7 @@ "\n", "
\n", "
\n", - "trans\n", + "trans\n", "
\n", "
int
\n", "
\n", @@ -1814,7 +1970,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1843,7 +1999,7 @@ "\n", "
\n", "
\n", - "type\n", + "type\n", "
\n", "
str
\n", "
\n", @@ -1857,7 +2013,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1886,7 +2042,7 @@ "\n", "
\n", "
\n", - "uncertain\n", + "uncertain\n", "
\n", "
int
\n", "
\n", @@ -1900,7 +2056,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1929,7 +2085,7 @@ "\n", "
\n", "
\n", - "variant\n", + "variant\n", "
\n", "
int
\n", "
\n", @@ -1943,7 +2099,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1972,7 +2128,7 @@ "\n", "
\n", "
\n", - "oslots\n", + "oslots\n", "
\n", "
none
\n", "
\n", @@ -1986,7 +2142,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -2681,7 +2837,8 @@ } ], "source": [ - "A = use(\"Nino-cunei/ninmed\", hoist=globals())" + "A = use(\"Nino-cunei/ninmed:clone\", checkout=\"clone\", hoist=globals())\n", + "# A = use(\"Nino-cunei/ninmed\", hoist=globals())" ] }, { @@ -2699,7 +2856,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 4, "metadata": { "ExecuteTime": { "end_time": "2018-05-24T07:46:55.998382Z", @@ -2711,7 +2868,7 @@ "name": "stdout", "output_type": "stream", "text": [ - " 0.08s 958 results\n" + " 0.05s 962 results\n" ] } ], @@ -2725,7 +2882,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 5, "metadata": { "ExecuteTime": { "end_time": "2018-05-24T07:46:55.998382Z", @@ -2740,12 +2897,13 @@ "1P285136 obverse:2'5 5 \n", "2P285136 obverse:11'2 2 \n", "3P479250 reverse:167 7 \n", - "4P479250 reverse:167-šu₂ 7\n", - "5P479250 reverse:167-šu₂ 7\n", - "6P285109 obverse:1:5'13 1\n", - "7P285109 obverse:1:5'13 3 \n", + "4P479250 reverse:167-šu₂ 7-\n", + "5P479250 reverse:167-šu₂\n", + "7-\n", + "6P285109 obverse:1:5'1/3 1/\n", + "7P285109 obverse:1:5'1/3 3 \n", "8P285109 obverse:1:5'10 10 \n", - "9P285109 obverse:1:6'UD.3.KAM₂# [3\n", + "9P285109 obverse:1:6'UD.3.[KAM₂ 3.\n", "10P285109 obverse:1:7'10 10 " ], "text/plain": [ @@ -2771,7 +2929,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 6, "metadata": { "ExecuteTime": { "end_time": "2018-05-24T07:47:03.299872Z", @@ -2783,10 +2941,10 @@ "data": { "text/html": [ "\n", - "\n", + "\n", "\n", - "\n", - "
npwordsign
500P394520 reverse:2:17 7
500P394520 reverse:2:11#-[niš 1#-
501P394520 reverse:2:17 7
502P394523 obverse:1:3'10 10
503P394523 obverse:1:4'UD.3.KAM@v 3
" + "502P394520 reverse:2:17 7 \n", + "503P394523 obverse:1:3'10 10 " ], "text/plain": [ "" @@ -2811,7 +2969,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 7, "metadata": { "ExecuteTime": { "end_time": "2018-05-24T07:47:06.875859Z", @@ -2834,7 +2992,8 @@ { "data": { "text/html": [ - "
P285136 obverse:2'
line
word 5
type=word
word KA#.INIM.MA
type=word
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
" + "
P285136 obverse:2'
line
word 5
type=word
word KA#.INIM.MA
type=word
cluster
type=missing
word [x
type=word
word x
type=word
word x
type=word
word x]\n", + "
type=word
" ], "text/plain": [ "" @@ -2858,7 +3017,8 @@ { "data": { "text/html": [ - "
P285136 obverse:11'
line
word 2
type=word
word KA.INIM.MA
type=word
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
" + "
P285136 obverse:11'
line
word 2
type=word
word KA.INIM.MA
type=word
cluster
type=missing
word [x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]\n", + "
type=word
" ], "text/plain": [ "" @@ -2882,7 +3042,8 @@ { "data": { "text/html": [ - "
P479250 reverse:16
line
word [
type=word
cluster
type=missing
word ...
type=word
word ap-]
type=word
word pi?#
type=word
word šil-ta-hi
type=word
word ša₂
type=word
word 7
type=word
word KA.KEŠDA-MEŠ-šu₂
type=word
word 7-šu₂
type=word
word u
type=word
word 7-šu₂
type=word
" + "
P479250 reverse:16
line
cluster
type=missing
word [...
type=word
word ap-pi?]
type=word
word šil-ta-hi
type=word
word ša₂
type=word
word 7
type=word
word KA.KEŠDA-MEŠ-šu₂
type=word
word 7-šu₂
type=word
word u
type=word
word 7-šu₂\n", + "
type=word
" ], "text/plain": [ "" @@ -2919,7 +3080,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 8, "metadata": { "ExecuteTime": { "end_time": "2018-05-24T07:47:14.547656Z", @@ -2944,7 +3105,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 9, "metadata": { "ExecuteTime": { "end_time": "2018-05-24T07:47:18.913432Z", @@ -2956,22 +3117,22 @@ "name": "stdout", "output_type": "stream", "text": [ - " 0.07s 9 results\n" + " 0.05s 9 results\n" ] }, { "data": { "text/html": [ "\n", - "\n", + "\n", "\n", "\n", - "\n", + "\n", "\n", "\n", - "\n", + "\n", "\n", - "
npdocumentsign
1P285109 obverse:1:5'P2851091
1P285109 obverse:1:5'P2851091/
2P285109 obverse:1:5'P2851093
3P285109 obverse:1:5'P28510910
4P285109 obverse:1:6'P2851093
4P285109 obverse:1:6'P2851093.
5P285109 obverse:1:7'P28510910
6P285109 obverse:1:9'P2851095
7P285109 obverse:1:11'P2851091
7P285109 obverse:1:11'P2851091/
8P285109 obverse:1:11'P2851093
9P285109 obverse:1:12'P2851093
" + "9P285109 obverse:1:12'P2851093." ], "text/plain": [ "" @@ -2995,7 +3156,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 10, "metadata": { "ExecuteTime": { "end_time": "2018-05-24T07:47:21.573937Z", @@ -3018,7 +3179,8 @@ { "data": { "text/html": [ - "
P285109 obverse:1:5'
line
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word ZA₃.HI]
type=word
word .LI
type=word
word 13
type=word
word SILA₃
type=word
word ŠIKA
type=word
word IM.ŠU.RIN.NA
type=word
word 10
type=word
word GIN₂# [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
" + "
P285109 obverse:1:5'
line
cluster
type=missing
word [x
type=word
word x
type=word
word ZA₃.HI].
type=word
word LI
type=word
word 1/3
type=word
word SILA₃
type=word
word ŠIKA
type=word
word IM.ŠU.RIN.NA
type=word
word 10
type=word
cluster
type=missing
word [GIN₂
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]\n", + "
type=word
" ], "text/plain": [ "" @@ -3042,7 +3204,8 @@ { "data": { "text/html": [ - "
P285109 obverse:1:5'
line
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word ZA₃.HI]
type=word
word .LI
type=word
word 13
type=word
word SILA₃
type=word
word ŠIKA
type=word
word IM.ŠU.RIN.NA
type=word
word 10
type=word
word GIN₂# [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
" + "
P285109 obverse:1:5'
line
cluster
type=missing
word [x
type=word
word x
type=word
word ZA₃.HI].
type=word
word LI
type=word
word 1/3
type=word
word SILA₃
type=word
word ŠIKA
type=word
word IM.ŠU.RIN.NA
type=word
word 10
type=word
cluster
type=missing
word [GIN₂
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]\n", + "
type=word
" ], "text/plain": [ "" @@ -3091,7 +3254,8 @@ { "data": { "text/html": [ - "
P285109 obverse:1:5'
line:86024
word:89666 [
type=word
cluster:79558
type=missing
word:89666 x
type=word
word:89667 x
type=word
word:89668 ZA₃.HI]
type=word
word:89668 .LI
type=word
word:89669 1125111263
type=word
word:89670 SILA₃
type=word
word:89671 ŠIKA
type=word
word:89672 IM.ŠU.RIN.NA
type=word
word:89673 113610
type=word
word:89674 GIN₂# [
type=word
cluster:79559
type=missing
word:89675 x
type=word
word:89676 x
type=word
word:89677 x
type=word
word:89678 x
type=word
word:89679 x
type=word
word:89680 x]
type=word
" + "
P285109 obverse:1:5'
line
cluster
type=missing
word [x
type=word
word x
type=word
word ZA₃.HI].
type=word
word LI
type=word
word 1/3
type=word
word SILA₃
type=word
word ŠIKA
type=word
word IM.ŠU.RIN.NA
type=word
word 10
type=word
cluster
type=missing
word [GIN₂
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]\n", + "
type=word
" ], "text/plain": [ "" @@ -3115,7 +3279,8 @@ { "data": { "text/html": [ - "
P285109 obverse:1:6'
line:86025
word:89681 [
type=word
cluster:79560
type=missing
word:89681 x
type=word
word:89682 x
type=word
word:89683 GAZI
type=word
cluster:79561
type=det
word:89683 ]
type=word
cluster:79561
type=det
word:89683 sar#
type=word
word:89684 SILA₁₁-aš
type=word
word:89685 LAL-ma
type=word
word:89686 UD.11603.KAM₂# [
type=word
cluster:79562
type=missing
word:89687 NU
type=word
word:89688 DU₈]
type=word
" + "
P285109 obverse:1:6'
line
cluster
type=missing
word [x
type=word
word x
type=word
word GAZI
type=word
cluster
type=det
word {sar]}
type=word
word SILA₁₁-aš
type=word
word LAL-ma
type=word
word UD.3.
type=word
cluster
type=missing
word [KAM₂
type=word
word NU
type=word
word DU₈]\n", + "
type=word
" ], "text/plain": [ "" @@ -3139,7 +3304,8 @@ { "data": { "text/html": [ - "
P285109 obverse:1:7'
line:86026
word:89689 [
type=word
cluster:79563
type=missing
word:89689 EGIR
type=word
word:89690 na]
type=word
word:89690 -aṣ-ma-da-te
type=word
word:89691 an-na-ti
type=word
word:89692 118410
type=word
word:89693 GIN₂
type=word
word:89694 ZA₃.HI.LI
type=word
word:89695 ša₂
type=word
word:89696 KA#
type=word
word:89697 [
type=word
cluster:79564
type=missing
word:89697 x
type=word
word:89698 x]
type=word
" + "
P285109 obverse:1:7'
line
cluster
type=missing
word [EGIR
type=word
word na]-
type=word
word aṣ-ma-da-te
type=word
word an-na-ti
type=word
word 10
type=word
word GIN₂
type=word
word ZA₃.HI.LI
type=word
word ša₂
type=word
word KA#
type=word
cluster
type=missing
word [x
type=word
word x]\n", + "
type=word
" ], "text/plain": [ "" @@ -3163,7 +3329,8 @@ { "data": { "text/html": [ - "
P285109 obverse:1:9'
line:86028
word:89712 [
type=word
cluster:79567
type=missing
word:89712 x
type=word
word:89713 x
type=word
word:89714 x
type=word
word:89715 ]
type=word
word:89715 GU₇#
type=word
word:89716 12285
type=word
word:89717 GIN₂
type=word
word:89718 ZA₃.HI.LI
type=word
word:89719 ARA₃-ti₃
type=word
word:89720 ina
type=word
word:89721 KAŠ
type=word
word:89722 SIG₃-aṣ-ma
type=word
word:89723 NAG#-šu₂#
type=word
word:89724 u₂#-[
type=word
cluster:79568
type=missing
word:89724 za-ka-ma
type=word
word:89725 x
type=word
word:89726 x
type=word
word:89727 x]
type=word
" + "
P285109 obverse:1:9'
line
cluster
type=missing
word [x
type=word
word x
type=word
word x
type=word
word GU₇]
type=word
word 5
type=word
word GIN₂
type=word
word ZA₃.HI.LI
type=word
word ARA₃-ti₃
type=word
word ina
type=word
word KAŠ
type=word
word SIG₃-aṣ-ma
type=word
word NAG#-šu₂#
type=word
word u₂#-
type=word
cluster
type=missing
word [za-ka-ma
type=word
word x
type=word
word x
type=word
word x]\n", + "
type=word
" ], "text/plain": [ "" @@ -3187,7 +3354,8 @@ { "data": { "text/html": [ - "
P285109 obverse:1:11'
line:86030
word:89739 [
type=word
cluster:79571
type=missing
word:89739 x
type=word
word:89740 x
type=word
word:89741 x
type=word
word:89742 x
type=word
word:89743 x
type=word
word:89744 x]
type=word
word:89745 ZA?#.BA?#.LAM?#
type=word
word:89746 1290112913
type=word
word:89747 SILA₃
type=word
cluster:79572
type=det
word:89748 u₂
type=word
word:89748 [
type=word
cluster:79573
type=missing
word:89748 x
type=word
word:89749 x
type=word
word:89750 x]
type=word
" + "
P285109 obverse:1:11'
line
cluster
type=missing
word [x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
word ZA?#.BA?#.LAM?#
type=word
word 1/3
type=word
word SILA₃
type=word
cluster
type=det
word {u₂}
type=word
cluster
type=missing
word [x
type=word
word x
type=word
word x]\n", + "
type=word
" ], "text/plain": [ "" @@ -3211,7 +3379,8 @@ { "data": { "text/html": [ - "
P285109 obverse:1:12'
line:86031
word:89751 [
type=word
cluster:79574
type=missing
word:89751 x
type=word
word:89752 x
type=word
word:89753 x
type=word
word:89754 x
type=word
word:89755 x
type=word
word:89756 x
type=word
word:89757 x
type=word
word:89758 x
type=word
word:89759 x
type=word
word:89760 x
type=word
word:89761 LAL]
type=word
word:89761 -ma
type=word
word:89762 UD.13163.[
type=word
cluster:79575
type=missing
word:89762 KAM₂
type=word
word:89763 NU
type=word
word:89764 DU₈]
type=word
" + "
P285109 obverse:1:12'
line
cluster
type=missing
word [x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word LAL]-
type=word
word ma
type=word
word UD.3.
type=word
cluster
type=missing
word [KAM₂
type=word
word NU
type=word
word DU₈]\n", + "
type=word
" ], "text/plain": [ "" @@ -3222,7 +3391,7 @@ } ], "source": [ - "A.show(results, condensed=True, withNodes=True)" + "A.show(results, condensed=True)" ] }, { @@ -3261,7 +3430,20 @@ { "data": { "text/html": [ - "
P285109 obverse
face P285109 obverse
line
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word ]
type=word
word TI#-qe₂# [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
line
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word ZI₃
type=word
word ŠE.SA]
type=word
word .A
type=word
word ina
type=word
word A
type=word
word GAZI
type=word
cluster
type=det
word sar# [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
line
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word ARA₃-]
type=word
word ti₃#
type=word
cluster
type=det
word šim
type=word
word GUR₂.GUR₂
type=word
word NAGA#[
type=word
cluster
type=missing
word .SI
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
line
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word MUN
type=word
word ]
type=word
word eme#-sal-li₃
type=word
word mal₂-ma-liš
type=word
word HI.HI
type=word
word ina#
type=word
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
line
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word ZA₃.HI]
type=word
word .LI
type=word
word 13
type=word
word SILA₃
type=word
word ŠIKA
type=word
word IM.ŠU.RIN.NA
type=word
word 10
type=word
word GIN₂# [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
line
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word GAZI
type=word
cluster
type=det
word ]
type=word
cluster
type=det
word sar#
type=word
word SILA₁₁-aš
type=word
word LAL-ma
type=word
word UD.3.KAM₂# [
type=word
cluster
type=missing
word NU
type=word
word DU₈]
type=word
line
word [
type=word
cluster
type=missing
word EGIR
type=word
word na]
type=word
word -aṣ-ma-da-te
type=word
word an-na-ti
type=word
word 10
type=word
word GIN₂
type=word
word ZA₃.HI.LI
type=word
word ša₂
type=word
word KA#
type=word
word [
type=word
cluster
type=missing
word x
type=word
word x]
type=word
line
word [
type=word
cluster
type=missing
word ša₂
type=word
word hul]
type=word
word -qu
type=word
word ana
type=word
word ŠA₃
type=word
word NU
type=word
word ŠUB-u₂
type=word
word MUN
type=word
word A.GEŠTIN.NA
type=word
word NU#
type=word
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
line
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word ]
type=word
word GU₇#
type=word
word 5
type=word
word GIN₂
type=word
word ZA₃.HI.LI
type=word
word ARA₃-ti₃
type=word
word ina
type=word
word KAŠ
type=word
word SIG₃-aṣ-ma
type=word
word NAG#-šu₂#
type=word
word u₂#-[
type=word
cluster
type=missing
word za-ka-ma
type=word
word x
type=word
word x
type=word
word x]
type=word
line
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x]
type=word
word AN#.ZAH#
type=word
word SUD₂
type=word
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
line
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
word ZA?#.BA?#.LAM?#
type=word
word 13
type=word
word SILA₃
type=word
cluster
type=det
word u₂
type=word
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x]
type=word
line
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word LAL]
type=word
word -ma
type=word
word UD.3.[
type=word
cluster
type=missing
word KAM₂
type=word
word NU
type=word
word DU₈]
type=word
line
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
word x
type=word
word x
type=word
word [
type=word
cluster
type=missing
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
" + "
P285109 obverse
face P285109 obverse
line
cluster
type=missing
word [x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word TI]-
type=word
cluster
type=missing
word [qe₂
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]\n", + "
type=word
line
cluster
type=missing
word [x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word ZI₃
type=word
word ŠE.SA].
type=word
word A
type=word
word ina
type=word
word A
type=word
word GAZI
type=word
cluster
type=missing
cluster
type=det
word {[sar}
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]\n", + "
type=word
line
cluster
type=missing
word [x
type=word
word x
type=word
word x
type=word
word ARA₃-ti₃]
type=word
cluster
type=det
word {šim}
type=word
word GUR₂.GUR₂
type=word
cluster
type=missing
word [NAGA.SI
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]\n", + "
type=word
line
cluster
type=missing
word [x
type=word
word x
type=word
word MUN
type=word
word eme]-
type=word
word sal-li₃
type=word
word mal₂-ma-liš
type=word
word HI.HI
type=word
word ina#
type=word
cluster
type=missing
word [x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]\n", + "
type=word
line
cluster
type=missing
word [x
type=word
word x
type=word
word ZA₃.HI].
type=word
word LI
type=word
word 1/3
type=word
word SILA₃
type=word
word ŠIKA
type=word
word IM.ŠU.RIN.NA
type=word
word 10
type=word
cluster
type=missing
word [GIN₂
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]\n", + "
type=word
line
cluster
type=missing
word [x
type=word
word x
type=word
word GAZI
type=word
cluster
type=det
word {sar]}
type=word
word SILA₁₁-aš
type=word
word LAL-ma
type=word
word UD.3.
type=word
cluster
type=missing
word [KAM₂
type=word
word NU
type=word
word DU₈]\n", + "
type=word
line
cluster
type=missing
word [EGIR
type=word
word na]-
type=word
word aṣ-ma-da-te
type=word
word an-na-ti
type=word
word 10
type=word
word GIN₂
type=word
word ZA₃.HI.LI
type=word
word ša₂
type=word
word KA#
type=word
cluster
type=missing
word [x
type=word
word x]\n", + "
type=word
line
cluster
type=missing
word [ša₂
type=word
word hul]-
type=word
word qu
type=word
word ana
type=word
word ŠA₃
type=word
word NU
type=word
word ŠUB-u₂
type=word
word MUN
type=word
word A.GEŠTIN.NA
type=word
word NU#
type=word
cluster
type=missing
word [x
type=word
word x
type=word
word x
type=word
word x]\n", + "
type=word
line
cluster
type=missing
word [x
type=word
word x
type=word
word x
type=word
word GU₇]
type=word
word 5
type=word
word GIN₂
type=word
word ZA₃.HI.LI
type=word
word ARA₃-ti₃
type=word
word ina
type=word
word KAŠ
type=word
word SIG₃-aṣ-ma
type=word
word NAG#-šu₂#
type=word
word u₂#-
type=word
cluster
type=missing
word [za-ka-ma
type=word
word x
type=word
word x
type=word
word x]\n", + "
type=word
line
cluster
type=missing
word [x
type=word
word x
type=word
word x]
type=word
word AN#.ZAH#
type=word
word SUD₂
type=word
cluster
type=missing
word [x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]\n", + "
type=word
line
cluster
type=missing
word [x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
word ZA?#.BA?#.LAM?#
type=word
word 1/3
type=word
word SILA₃
type=word
cluster
type=det
word {u₂}
type=word
cluster
type=missing
word [x
type=word
word x
type=word
word x]\n", + "
type=word
line
cluster
type=missing
word [x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word LAL]-
type=word
word ma
type=word
word UD.3.
type=word
cluster
type=missing
word [KAM₂
type=word
word NU
type=word
word DU₈]\n", + "
type=word
line
cluster
type=missing
word [x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x
type=word
word x]
type=word
word x
type=word
word x
type=word
cluster
type=missing
word [x
type=word
word x
type=word
word x
type=word
word x]\n", + "
type=word
" ], "text/plain": [ "" @@ -3332,23 +3514,34 @@ "name": "stdout", "output_type": "stream", "text": [ - " 0.24s 21274 results\n" + " 0.15s 8298 results\n" ] }, { "data": { "text/html": [ "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "
nplinesignsignsign
1P479250 obverse:13'[... ] ŠA₃?# GIG ... ŠA₃?# ŠA₃?#
2P479250 obverse:13'[... ] ŠA₃?# GIG ] ŠA₃?# ŠA₃?#
3P479250 reverse:16[... ap-] pi?# šil-ta-hi ša₂ 7 KA.KEŠDA-MEŠ-šu₂ 7-šu₂ u 7-šu₂ ... pi?# pi?#
4P479250 reverse:16[... ap-] pi?# šil-ta-hi ša₂ 7 KA.KEŠDA-MEŠ-šu₂ 7-šu₂ u 7-šu₂ appi?# pi?#
5P479250 reverse:16[... ap-] pi?# šil-ta-hi ša₂ 7 KA.KEŠDA-MEŠ-šu₂ 7-šu₂ u 7-šu₂ -pi?# pi?#
6P479250 reverse:16[... ap-] pi?# šil-ta-hi ša₂ 7 KA.KEŠDA-MEŠ-šu₂ 7-šu₂ u 7-šu₂ ] pi?# pi?#
7P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# ... SAHAR?# SAHAR?#
8P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# ... SAHAR?# TA#
9P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# ... SAHAR?# urudu#
10P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# ... SAHAR?# na#
" + "1P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... SAHAR?] TA# \n", + "2P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... SAHAR?] {urudu#}\n", + "3P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... SAHAR?] na#-\n", + "4P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... SAHAR?] ah#-\n", + "5P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... SAHAR?] bi?# \n", + "6P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... SAHAR?] na#-\n", + "7P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... SAHAR?] ah#-\n", + "8P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... SAHAR?] bi?#\n", + "\n", + "9P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... bi?# TA# \n", + "10P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... bi?# {urudu#}" ], "text/plain": [ "" @@ -3372,16 +3565,27 @@ "data": { "text/html": [ "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "
nplinesignsignsign
1P479250 obverse:13'[... ] ŠA₃?# GIG ... ŠA₃?# ŠA₃?#
2P479250 obverse:13'[... ] ŠA₃?# GIG ] ŠA₃?# ŠA₃?#
3P479250 reverse:16[... ap-] pi?# šil-ta-hi ša₂ 7 KA.KEŠDA-MEŠ-šu₂ 7-šu₂ u 7-šu₂ ... pi?# pi?#
4P479250 reverse:16[... ap-] pi?# šil-ta-hi ša₂ 7 KA.KEŠDA-MEŠ-šu₂ 7-šu₂ u 7-šu₂ appi?# pi?#
5P479250 reverse:16[... ap-] pi?# šil-ta-hi ša₂ 7 KA.KEŠDA-MEŠ-šu₂ 7-šu₂ u 7-šu₂ -pi?# pi?#
6P479250 reverse:16[... ap-] pi?# šil-ta-hi ša₂ 7 KA.KEŠDA-MEŠ-šu₂ 7-šu₂ u 7-šu₂ ] pi?# pi?#
7P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# ... SAHAR?# SAHAR?#
8P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# ... SAHAR?# TA#
9P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# ... SAHAR?# urudu#
10P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# ... SAHAR?# na#
" + "1P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... SAHAR?] TA# \n", + "2P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... SAHAR?] {urudu#}\n", + "3P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... SAHAR?] na#-\n", + "4P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... SAHAR?] ah#-\n", + "5P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... SAHAR?] bi?# \n", + "6P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... SAHAR?] na#-\n", + "7P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... SAHAR?] ah#-\n", + "8P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... SAHAR?] bi?#\n", + "\n", + "9P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... bi?# TA# \n", + "10P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "[... bi?# {urudu#}" ], "text/plain": [ "" @@ -3425,7 +3629,8 @@ { "data": { "text/html": [ - "
P479250 obverse:13'
line
word [
cluster
word ...
word ]
word ŠA₃?#
word GIG
" + "
P479250 reverse:17
line
cluster
word [...
word SAHAR?]
word TA#
cluster
word {urudu#}
word na#-ah#-bi?#
cluster
word [ana?
cluster
word {urudu]}
word na#-ah#-bi?#\n", + "
" ], "text/plain": [ "" @@ -3449,7 +3654,8 @@ { "data": { "text/html": [ - "
P479250 obverse:13'
line
word [
cluster
word ...
word ]
word ŠA₃?#
word GIG
" + "
P479250 reverse:17
line
cluster
word [...
word SAHAR?]
word TA#
cluster
word {urudu#}
word na#-ah#-bi?#
cluster
word [ana?
cluster
word {urudu]}
word na#-ah#-bi?#\n", + "
" ], "text/plain": [ "" @@ -3473,7 +3679,8 @@ { "data": { "text/html": [ - "
P479250 reverse:16
line
word [
cluster
word ...
word ap-]
word pi?#
word šil-ta-hi
word ša₂
word 7
word KA.KEŠDA-MEŠ-šu₂
word 7-šu₂
word u
word 7-šu₂
" + "
P479250 reverse:17
line
cluster
word [...
word SAHAR?]
word TA#
cluster
word {urudu#}
word na#-ah#-bi?#
cluster
word [ana?
cluster
word {urudu]}
word na#-ah#-bi?#\n", + "
" ], "text/plain": [ "" @@ -3497,7 +3704,8 @@ { "data": { "text/html": [ - "
P479250 reverse:16
line
word [
cluster
word ...
word ap-]
word pi?#
word šil-ta-hi
word ša₂
word 7
word KA.KEŠDA-MEŠ-šu₂
word 7-šu₂
word u
word 7-šu₂
" + "
P479250 reverse:17
line
cluster
word [...
word SAHAR?]
word TA#
cluster
word {urudu#}
word na#-ah#-bi?#
cluster
word [ana?
cluster
word {urudu]}
word na#-ah#-bi?#\n", + "
" ], "text/plain": [ "" @@ -3521,7 +3729,8 @@ { "data": { "text/html": [ - "
P479250 reverse:16
line
word [
cluster
word ...
word ap-]
word pi?#
word šil-ta-hi
word ša₂
word 7
word KA.KEŠDA-MEŠ-šu₂
word 7-šu₂
word u
word 7-šu₂
" + "
P479250 reverse:17
line
cluster
word [...
word SAHAR?]
word TA#
cluster
word {urudu#}
word na#-ah#-bi?#
cluster
word [ana?
cluster
word {urudu]}
word na#-ah#-bi?#\n", + "
" ], "text/plain": [ "" @@ -3569,7 +3778,8 @@ { "data": { "text/html": [ - "
P479250 obverse:13'
line
word [
cluster
word ...
word ]
word ŠA₃?#
word GIG
" + "
P479250 reverse:17
line
cluster
word [...
word SAHAR?]
word TA#
cluster
word {urudu#}
word na#-ah#-bi?#
cluster
word [ana?
cluster
word {urudu]}
word na#-ah#-bi?#\n", + "
" ], "text/plain": [ "" @@ -3593,7 +3803,8 @@ { "data": { "text/html": [ - "
P479250 reverse:16
line
word [
cluster
word ...
word ap-]
word pi?#
word šil-ta-hi
word ša₂
word 7
word KA.KEŠDA-MEŠ-šu₂
word 7-šu₂
word u
word 7-šu₂
" + "
P285109 obverse:1:11'
line
cluster
word [x
word x
word x
word x
word x
word x]
word ZA?#.BA?#.LAM?#
word 1/3
word SILA₃
cluster
word {u₂}
cluster
word [x
word x
word x]\n", + "
" ], "text/plain": [ "" @@ -3617,7 +3828,8 @@ { "data": { "text/html": [ - "
P479250 reverse:17
line
word [
cluster
word ...
word ]
word SAHAR?#
word TA#
cluster
word urudu#
word na#-ah#-bi?#
word [
cluster
word ana?
cluster
word ]
cluster
word urudu#
word na#-ah#-bi?#
" + "
P399223 obverse:1:10
line
cluster
word [x
word x
word x
word x
word x
word x
word x
word x
word x]
word i#-na!?#-qu₂
word tu-ṣar-raš!(BI)-ma
cluster
word [TI]\n", + "
" ], "text/plain": [ "" @@ -3641,7 +3853,8 @@ { "data": { "text/html": [ - "
P285109 obverse:1:11'
line
word [
cluster
word x
word x
word x
word x
word x
word x]
word ZA?#.BA?#.LAM?#
word 13
word SILA₃
cluster
word u₂
word [
cluster
word x
word x
word x]
" + "
P399223 obverse:2:1
line
word DIŠ
word NA
word NINDA
word GU₇
word KAŠ
word NAG-ma
word ŠA₃-
cluster
word <MEŠ?>-
word šu₂
word in-nem-me-ru
word in-ne₂?#-
cluster
word [bi-ṭu₂
word x
word x
word x
word x
word x
word x]\n", + "
" ], "text/plain": [ "" @@ -3665,7 +3878,8 @@ { "data": { "text/html": [ - "
P285109 reverse:2:4'
line
word [
cluster
word x
word x
word x
word x
word x
word x
word x
word x
word ]
word ŠU₂?#
word LUGAL?# [
cluster
word x
word x
word x
word x]
" + "
P401255 obverse:3'
line
cluster
word [...
word NA
word BI
word aš-rat
cluster
word {d}
word nin]-
word urta
word KIN-ma
word DUG₄.GA?#
word x
word x-šu₂\n", + "
" ], "text/plain": [ "" @@ -3714,7 +3928,8 @@ { "data": { "text/html": [ - "
P285109 obverse:1:11'
line
word [
cluster
word x
word x
word x
word x
word x
word x]
word ZA?#.BA?#.LAM?#
word 13
word SILA₃
cluster
word u₂
word [
cluster
word x
word x
word x]
" + "
P399223 obverse:2:1
line
word DIŠ
word NA
word NINDA
word GU₇
word KAŠ
word NAG-ma
word ŠA₃-
cluster
word <MEŠ?>-
word šu₂
word in-nem-me-ru
word in-ne₂?#-
cluster
word [bi-ṭu₂
word x
word x
word x
word x
word x
word x]\n", + "
" ], "text/plain": [ "" @@ -3738,7 +3953,8 @@ { "data": { "text/html": [ - "
P285109 reverse:2:4'
line
word [
cluster
word x
word x
word x
word x
word x
word x
word x
word x
word ]
word ŠU₂?#
word LUGAL?# [
cluster
word x
word x
word x
word x]
" + "
P401255 obverse:3'
line
cluster
word [...
word NA
word BI
word aš-rat
cluster
word {d}
word nin]-
word urta
word KIN-ma
word DUG₄.GA?#
word x
word x-šu₂\n", + "
" ], "text/plain": [ "" @@ -3762,7 +3978,8 @@ { "data": { "text/html": [ - "
P399223 obverse:1:10
line
word [
cluster
word x
word x
word x
word x
word x
word x
word x
word x
word x]
word i#-na!?#-qu₂
word tu-ṣar-raš!(BI)-ma
word [
cluster
word TI]
" + "
P401255 obverse:8'
line
cluster
word [...]
word x
word NIGIN#-mi#
word ana#
word ŠA₃?#
word GEŠTU?#-
cluster
word [MIN?]-
word šu₂?#
word GAR?#-
cluster
cluster
word [(an)]\n", + "
" ], "text/plain": [ "" @@ -3826,23 +4043,34 @@ "name": "stdout", "output_type": "stream", "text": [ - " 0.22s 11608 results\n" + " 0.15s 4469 results\n" ] }, { "data": { "text/html": [ "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "
nplinesignsignsign
1P479250 obverse:13'[... ] ŠA₃?# GIG ŠA₃?# ... ŠA₃?#
2P479250 obverse:13'[... ] ŠA₃?# GIG ŠA₃?# ] ŠA₃?#
3P479250 reverse:16[... ap-] pi?# šil-ta-hi ša₂ 7 KA.KEŠDA-MEŠ-šu₂ 7-šu₂ u 7-šu₂ pi?# ... pi?#
4P479250 reverse:16[... ap-] pi?# šil-ta-hi ša₂ 7 KA.KEŠDA-MEŠ-šu₂ 7-šu₂ u 7-šu₂ pi?# appi?#
5P479250 reverse:16[... ap-] pi?# šil-ta-hi ša₂ 7 KA.KEŠDA-MEŠ-šu₂ 7-šu₂ u 7-šu₂ pi?# -pi?#
6P479250 reverse:16[... ap-] pi?# šil-ta-hi ša₂ 7 KA.KEŠDA-MEŠ-šu₂ 7-šu₂ u 7-šu₂ pi?# ] pi?#
7P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# SAHAR?# ... SAHAR?#
8P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# SAHAR?# ... TA#
9P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# SAHAR?# ... urudu#
10P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# SAHAR?# ... na#
" + "1P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "SAHAR?] [... TA# \n", + "2P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "SAHAR?] [... {urudu#}\n", + "3P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "SAHAR?] [... na#-\n", + "4P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "SAHAR?] [... ah#-\n", + "5P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "SAHAR?] [... bi?# \n", + "6P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "SAHAR?] [... na#-\n", + "7P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "SAHAR?] [... ah#-\n", + "8P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "SAHAR?] [... bi?#\n", + "\n", + "9P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "SAHAR?] [ana? na#-\n", + "10P479250 reverse:17[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", + "SAHAR?] [ana? ah#-" ], "text/plain": [ "" @@ -3897,23 +4125,33 @@ "name": "stdout", "output_type": "stream", "text": [ - " 0.19s 575 results\n" + " 0.13s 146 results\n" ] }, { "data": { "text/html": [ "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "
nplinesignsignsign
1P479250 obverse:13'[... ] ŠA₃?# GIG ŠA₃?# ] ŠA₃?#
2P479250 reverse:16[... ap-] pi?# šil-ta-hi ša₂ 7 KA.KEŠDA-MEŠ-šu₂ 7-šu₂ u 7-šu₂ pi?# ] pi?#
3P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# SAHAR?# ] SAHAR?#
4P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# SAHAR?# ] urudu#
5P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# bi?# ] SAHAR?#
6P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# bi?# ] urudu#
7P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# ana? ] SAHAR?#
8P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# ana? ] urudu#
9P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# bi?# ] SAHAR?#
10P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# bi?# ] urudu#
" + "1P285109 obverse:1:11'[x x x x x x] ZA?#.BA?#.LAM?# 1/3 SILA₃ {u₂}[x x x]\n", + "ZA?#.x] ZA?#.\n", + "2P285109 obverse:1:11'[x x x x x x] ZA?#.BA?#.LAM?# 1/3 SILA₃ {u₂}[x x x]\n", + "BA?#.x] ZA?#.\n", + "3P285109 obverse:1:11'[x x x x x x] ZA?#.BA?#.LAM?# 1/3 SILA₃ {u₂}[x x x]\n", + "LAM?# x] ZA?#.\n", + "4P399223 obverse:1:10[x x x x x x x x x] i#-na!?#-qu₂ tu-ṣar-raš!(BI)-ma [TI]\n", + "na!?#-x] i#-\n", + "5P401255 obverse:8'[...] x NIGIN#-mi# ana# ŠA₃?# GEŠTU?#-[MIN?]-šu₂?# GAR?#-[(an)]\n", + "ŠA₃?# [MIN?]-šu₂?# \n", + "6P401255 obverse:8'[...] x NIGIN#-mi# ana# ŠA₃?# GEŠTU?#-[MIN?]-šu₂?# GAR?#-[(an)]\n", + "GEŠTU?#-[MIN?]-šu₂?# \n", + "7P401255 obverse:8'[...] x NIGIN#-mi# ana# ŠA₃?# GEŠTU?#-[MIN?]-šu₂?# GAR?#-[(an)]\n", + "[MIN?]-[MIN?]-šu₂?# \n", + "8P401255 obverse:8'[...] x NIGIN#-mi# ana# ŠA₃?# GEŠTU?#-[MIN?]-šu₂?# GAR?#-[(an)]\n", + "šu₂?# [MIN?]-šu₂?# \n", + "9P401255 obverse:8'[...] x NIGIN#-mi# ana# ŠA₃?# GEŠTU?#-[MIN?]-šu₂?# GAR?#-[(an)]\n", + "GAR?#-[MIN?]-šu₂?# \n", + "10P403291 obverse:5'[...] ŠEŠ₂?#-su?# [ŠE₁₀? x x x x]\n", + "ŠEŠ₂?#-[...] ŠEŠ₂?#-" ], "text/plain": [ "" @@ -3937,7 +4175,9 @@ { "data": { "text/html": [ - "
P479250 obverse:13'
line
word [...
[
cluster
word [...
...
missing=1
word ] ŠA₃?#
]
missing=1
word ] ŠA₃?#
ŠA₃?#
damage=1question=1
word GIG
GIG
" + "
P285109 obverse:1:11'
line
cluster
word [x
[x
missing=1
word x
x
missing=1
word x
x
missing=1
word x
x
missing=1
word x
x
missing=1
word x]
x]
missing=1
word ZA?#.BA?#.LAM?#
ZA?#.
damage=1question=1
BA?#.
damage=1question=1
LAM?#
damage=1question=1
word 1/3
1/
3
word SILA₃
SILA₃
cluster
word {u₂}[x
{u₂}
cluster
word {u₂}[x
[x
missing=1
word x
x
missing=1
word x]\n", + "
x]\n", + "
missing=1
" ], "text/plain": [ "" @@ -3961,7 +4201,9 @@ { "data": { "text/html": [ - "
P479250 reverse:16
line
word [...
[
cluster
word [...
...
missing=1
word ap-] pi?#
ap
missing=1
-
missing=1
]
missing=1
word ap-] pi?#
pi?#
damage=1question=1
word šil-ta-hi
šil
-
ta
-
hi
word ša₂
ša₂
word 7
7
word KA.KEŠDA-MEŠ-šu₂
KA
.
KEŠDA
-
MEŠ
-
šu₂
word 7-šu₂
7
-
šu₂
word u
u
word 7-šu₂
7
-
šu₂
" + "
P285109 obverse:1:11'
line
cluster
word [x
[x
missing=1
word x
x
missing=1
word x
x
missing=1
word x
x
missing=1
word x
x
missing=1
word x]
x]
missing=1
word ZA?#.BA?#.LAM?#
ZA?#.
damage=1question=1
BA?#.
damage=1question=1
LAM?#
damage=1question=1
word 1/3
1/
3
word SILA₃
SILA₃
cluster
word {u₂}[x
{u₂}
cluster
word {u₂}[x
[x
missing=1
word x
x
missing=1
word x]\n", + "
x]\n", + "
missing=1
" ], "text/plain": [ "" @@ -4022,23 +4264,34 @@ "name": "stdout", "output_type": "stream", "text": [ - " 0.17s 31 results\n" + " 0.12s 12 results\n" ] }, { "data": { "text/html": [ "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "
nplinesignsignsign
1P479250 reverse:17[... ] SAHAR?# TA# urudu#na#-ah#-bi?# [ana? ] urudu#na#-ah#-bi?# ana? ] urudu#
2P394104 obverse:2:28[... A?] u₂#IN₆.UŠ₂ A u₂EME.UR.GI₇ A u₂GEŠTIN.KA₅.A A?] u₂#
3P394104 obverse:2:37[tu?-gal?-lab?] u₂#BAL# NUMUN# U₂# [da-] aq#-qi₂-qi₂ ŠE₁₀ up-pu-te gu-ra ša₂ GI NUMUN u₂ta-lu-pa-di lab?] u₂#
4P393782 obverse:1:22u₂IGI-NIŠ SUHUŠ gišNAM.TAR NITA₂ a-he-en#-[na-a GAZ? SIM? ina ] ŠA₃?# mal#-ma#-liš# TI#-qe₂# ina# KAŠ?# [NAG? ina A? ] ŠED₇?# A? ] ŠED₇?#
5P393782 obverse:1:34[NAG-MEŠ 2?] UD#-me# ina A-MEŠ NU pa-tan NAG-MEŠ A-MEŠ SAG ŠA₃-šu₂ tu#-sa#[-lah₂-ma TI] 2?] UD#
6P393782 obverse:2:10DIŠ NA ŠA₃-šu₂ ka-si-šu₂ SUMsar SIG₇-su šimGUR₂#[.GUR₂? ] TEŠ₂#.BI SUD₂ ina# A SIG₃-aṣ NU pa-tan NAG-šu₂ GUR₂? ] TEŠ₂#
7P393782 obverse:2:21[EN₂ ŠA₃-MEŠ? ] it#-ta#-nap-ša₂-ru ze-er kar-šu₂# ŠA₃.NIGIN ku-uṣ-ṣu#-ru#-u₂?# x x x [x] MEŠ? ] it#
8P393782 obverse:2:441# GIN₂ MUN eme-sal-li₃ šim#[GUR₂.GUR₂?] šim#LI DIŠ-niš GAZ [SIM?] GUR₂?] šim#
9P393782 reverse:1:10a#-[na NENNI? A? NENNI? ] DU₁₁#.GA#-ma iṣ-ṣa-bat ŠA₃-bi NENNI?# [A? NENNI? x x x x x x x x x x x x x x x x] NENNI? ] DU₁₁#
10P365742 obverse:1:5413 SILA₃ PA gišMA₂#.[ERIŠ₄?] iš#.MA₂.RA GAZ SIM ina A GAZIsar SILA₁₁-aš SAR#-ab# LAL#-[ma] UD.3.KAM₂ NU DU₈ ERIŠ₄?] iš#
" + "1P401255 obverse:8'[...] x NIGIN#-mi# ana# ŠA₃?# GEŠTU?#-[MIN?]-šu₂?# GAR?#-[(an)]\n", + "GEŠTU?#-[MIN?]-šu₂?# \n", + "2P394104 obverse:2:37[tu?-gal?-lab?] {u₂#}BAL# NUMUN# U₂# [da-aq]-qi₂-qi₂ ŠE₁₀ up-pu-te gu-ra ša₂ GI NUMUN {u₂}ta-lu-pa-di\n", + "gal?-lab?] {u₂#}\n", + "3P365742 obverse:2:171/3 SILA₃ {u₂}ṣa-da-[na? ...] ina# GA# SILA₁₁-aš SAR-ab KI MIN\n", + "[na? ...] ina# \n", + "4P365742 reverse:1:91 [GIN₂? ...] SAG#.DU-su SAR-ab tu-kaṣ₃-ṣa LAL-ma UD.3.KAM₂ NU DU₈\n", + "[GIN₂? ...] SAG#.\n", + "5P365742 reverse:2:15[ana KI MIN bu?-ṭu?]-ut?#-tu₄ {šim}BULUH {u₂}kur-ka-nu-u qu#-ta#-ru ša₂ SAG.DU\n", + "bu?-ṭu?]-ut?#-\n", + "6P365744 obverse:1:56'PA {u₂}UR₂.TAL₂.TAL₂ {giš.d}MAŠ KA A.AB.BA# {u₂}HAR.HAR {u₂}KUR.KUR [ZI₃? GIG?] gu#-ur# GI#\n", + "[ZI₃? GIG?] gu#-\n", + "7P365744 reverse:2:50'an-nu-[tu₄ x x x] x SAG.KI.DAB.BA.KAM₂ EN SA#.GU₂?# [AL?].TIL?#\n", + "GU₂?# [AL?].TIL?#\n", + "\n", + "8P394422 obverse:1:38'DIŠ NA GEŠTU.MIN-šu₂ i-šag-gu-ma [MUD₂ {giš?}EREN?] a#-ra-an-di {šim}GUR₂.GUR₂ ina {sig₂}AKA₃ NIGIN-mi\n", + "{giš?}EREN?] a#-\n", + "9P394422 obverse:2:17[su?-ma?-aš₂? pa?#]-at#-[ri pa?-ku?-un?-di] ra-[ta-aš₂? ik?]-ki#-ri-ri ša-ra-aš tu₆-en₂\n", + "ma?-aš₂? pa?#]-\n", + "10P394520 reverse:1:10EN₂ {d}nin-[girima₃ be-let šip-te] {d#}gu#-la# TI#.[LA-ma NIG₂.BA-ki?] [TI]-i# TU₆#.EN₂#\n", + "ki?] [TI]-i# " ], "text/plain": [ "" @@ -4062,7 +4315,8 @@ { "data": { "text/html": [ - "
P479250 reverse:17
line
word [
cluster
word ...
word ]
word SAHAR?#
word TA#
cluster
word urudu#
word na#-ah#-bi?#
word [
cluster
word ana?
cluster
word ]
cluster
word urudu#
word na#-ah#-bi?#
" + "
P401255 obverse:8'
line
cluster
word [...]
word x
word NIGIN#-mi#
word ana#
word ŠA₃?#
word GEŠTU?#-
cluster
word [MIN?]-
word šu₂?#
word GAR?#-
cluster
cluster
word [(an)]\n", + "
" ], "text/plain": [ "" @@ -4086,7 +4340,8 @@ { "data": { "text/html": [ - "
P394104 obverse:2:28
line
word [
cluster
word ...
word A?]
cluster
word u₂#
word IN₆.UŠ₂
word A
cluster
word u₂
word EME.UR.GI₇
word A
cluster
word u₂
word GEŠTIN.KA₅.A
" + "
P394104 obverse:2:37
line
cluster
word [tu?-gal?-lab?]
cluster
word {u₂#}
word BAL#
word NUMUN#
word U₂#
cluster
word [da-aq]-
word qi₂-qi₂
word ŠE₁₀
word up-pu-te
word gu-ra
word ša₂
word GI
word NUMUN
cluster
word {u₂}
word ta-lu-pa-di\n", + "
" ], "text/plain": [ "" @@ -4110,7 +4365,8 @@ { "data": { "text/html": [ - "
P394104 obverse:2:37
line
word [
cluster
word tu?-gal?-lab?]
cluster
word u₂#
word BAL#
word NUMUN#
word U₂#
word [
cluster
word da-]
word aq#-qi₂-qi₂
word ŠE₁₀
word up-pu-te
word gu-ra
word ša₂
word GI
word NUMUN
cluster
word u₂
word ta-lu-pa-di
" + "
P365742 obverse:2:17
line
word 1/3
word SILA₃
cluster
word {u₂}
word ṣa-da-
cluster
word [na?
word ...]
word ina#
word GA#
word SILA₁₁-aš
word SAR-ab
word KI
word MIN\n", + "
" ], "text/plain": [ "" @@ -4134,7 +4390,8 @@ { "data": { "text/html": [ - "
P393782 obverse:1:22
line
cluster
word u₂
word IGI-NIŠ
word SUHUŠ
cluster
word giš
word NAM.TAR
word NITA₂
word a-he-en#-[
cluster
word na-a
word GAZ?
word SIM?
word ina
word ]
word ŠA₃?#
word mal#-ma#-liš#
word TI#-qe₂#
word ina#
word KAŠ?# [
cluster
word NAG?
word ina
word A?
word ]
word ŠED₇?#
" + "
P365742 reverse:1:9
line
word 1
cluster
word [GIN₂?
word ...]
word SAG#.DU-su
word SAR-ab
word tu-kaṣ₃-ṣa
word LAL-ma
word UD.3.KAM₂
word NU
word DU₈\n", + "
" ], "text/plain": [ "" @@ -4201,7 +4458,9 @@ { "data": { "text/html": [ - "
P394104 obverse:2:37
line
atf=37. [tu?-gal?-lab?] {u₂#}BAL# NUMUN# U₂# [da-a]q-qi₂-qi₂ ŠE₁₀ up-pu-te gu-ra ša₂ GI NUMUN {u₂}ta-lu-pa-di
word [tu?-gal?-lab?]
atf=[tu?-gal?-lab?]
[
atf=[
cluster
word [tu?-gal?-lab?]
atf=[tu?-gal?-lab?]
tu?
atf=tu?flags=?missing=1question=1
-
atf=-missing=1
gal?
atf=gal?flags=?missing=1question=1
-
atf=-missing=1
lab?
atf=lab?flags=?missing=1question=1
]
atf=]missing=1
cluster
word u₂#BAL#
atf={u₂#}BAL#
u₂#
atf=u₂#damage=1flags=#
word u₂#BAL#
atf={u₂#}BAL#
BAL#
atf=BAL#damage=1flags=#
word NUMUN#
atf=NUMUN#
NUMUN#
atf=NUMUN#damage=1flags=#
word U₂#
atf=U₂#
U₂#
atf=U₂#damage=1flags=#
word [da-] aq#-qi₂-qi₂
atf=[da-a]q-qi₂-qi₂
[
atf=[
cluster
word [da-] aq#-qi₂-qi₂
atf=[da-a]q-qi₂-qi₂
da
atf=damissing=1
-
atf=-missing=1
]
atf=]missing=1
word [da-] aq#-qi₂-qi₂
atf=[da-a]q-qi₂-qi₂
aq#
atf=aq#damage=1flags=#
-
atf=-
qi₂
atf=qi₂
-
atf=-
qi₂
atf=qi₂
word ŠE₁₀
atf=ŠE₁₀
ŠE₁₀
atf=ŠE₁₀
word up-pu-te
atf=up-pu-te
up
atf=up
-
atf=-
pu
atf=pu
-
atf=-
te
atf=te
word gu-ra
atf=gu-ra
gu
atf=gu
-
atf=-
ra
atf=ra
word ša₂
atf=ša₂
ša₂
atf=ša₂
word GI
atf=GI
GI
atf=GI
word NUMUN
atf=NUMUN
NUMUN
atf=NUMUN
cluster
word u₂ta-lu-pa-di
atf={u₂}ta-lu-pa-di
u₂
atf=u₂
word u₂ta-lu-pa-di
atf={u₂}ta-lu-pa-di
ta
atf=ta
-
atf=-
lu
atf=lu
-
atf=-
pa
atf=pa
-
atf=-
di
atf=di
" + "
P365742 obverse:2:17
line
atf=17. 1/3 SILA₃ {u₂}ṣa-da-n[a? ...] ina# GA# SILA₁₁-aš SAR-ab KI MIN
word 1/3
atf=1/3
1/
atf=1
3
atf=3
word SILA₃
atf=SILA₃
SILA₃
atf=SILA₃
cluster
word {u₂}ṣa-da-[na?
atf={u₂}ṣa-da-n[a?
{u₂}
atf=u₂
word {u₂}ṣa-da-[na?
atf={u₂}ṣa-da-n[a?
ṣa-
atf=ṣa
da-
atf=da
cluster
word {u₂}ṣa-da-[na?
atf={u₂}ṣa-da-n[a?
[na?
atf=na?flags=?missing=1question=1
word ...]
atf=...]
...]
atf=...missing=1
word ina#
atf=ina#
ina#
atf=ina#damage=1flags=#
word GA#
atf=GA#
GA#
atf=GA#damage=1flags=#
word SILA₁₁-aš
atf=SILA₁₁-aš
SILA₁₁-
atf=SILA₁₁
aš
atf=aš
word SAR-ab
atf=SAR-ab
SAR-
atf=SAR
ab
atf=ab
word KI
atf=KI
KI
atf=KI
word MIN\n", + "
atf=MIN
MIN\n", + "
atf=MIN
" ], "text/plain": [ "" @@ -4258,7 +4517,9 @@ { "data": { "text/html": [ - "
P394104 obverse:2:37
line
atf=37. [tu?-gal?-lab?] {u₂#}BAL# NUMUN# U₂# [da-a]q-qi₂-qi₂ ŠE₁₀ up-pu-te gu-ra ša₂ GI NUMUN {u₂}ta-lu-pa-didamage=flags=missing=question=
word [tu?-gal?-lab?]
atf=[tu?-gal?-lab?]damage=flags=missing=question=
[
atf=[damage=flags=missing=question=
cluster
atf=damage=flags=missing=question=
word [tu?-gal?-lab?]
atf=[tu?-gal?-lab?]damage=flags=missing=question=
tu?
atf=tu?damage=flags=?missing=1question=1
-
atf=-damage=flags=missing=1question=
gal?
atf=gal?damage=flags=?missing=1question=1
-
atf=-damage=flags=missing=1question=
lab?
atf=lab?damage=flags=?missing=1question=1
]
atf=]damage=flags=missing=1question=
cluster
atf=damage=flags=missing=question=
word u₂#BAL#
atf={u₂#}BAL#damage=flags=missing=question=
u₂#
atf=u₂#damage=1flags=#missing=question=
word u₂#BAL#
atf={u₂#}BAL#damage=flags=missing=question=
BAL#
atf=BAL#damage=1flags=#missing=question=
word NUMUN#
atf=NUMUN#damage=flags=missing=question=
NUMUN#
atf=NUMUN#damage=1flags=#missing=question=
word U₂#
atf=U₂#damage=flags=missing=question=
U₂#
atf=U₂#damage=1flags=#missing=question=
word [da-] aq#-qi₂-qi₂
atf=[da-a]q-qi₂-qi₂damage=flags=missing=question=
[
atf=[damage=flags=missing=question=
cluster
atf=damage=flags=missing=question=
word [da-] aq#-qi₂-qi₂
atf=[da-a]q-qi₂-qi₂damage=flags=missing=question=
da
atf=dadamage=flags=missing=1question=
-
atf=-damage=flags=missing=1question=
]
atf=]damage=flags=missing=1question=
word [da-] aq#-qi₂-qi₂
atf=[da-a]q-qi₂-qi₂damage=flags=missing=question=
aq#
atf=aq#damage=1flags=#missing=question=
-
atf=-damage=flags=missing=question=
qi₂
atf=qi₂damage=flags=missing=question=
-
atf=-damage=flags=missing=question=
qi₂
atf=qi₂damage=flags=missing=question=
word ŠE₁₀
atf=ŠE₁₀damage=flags=missing=question=
ŠE₁₀
atf=ŠE₁₀damage=flags=missing=question=
word up-pu-te
atf=up-pu-tedamage=flags=missing=question=
up
atf=updamage=flags=missing=question=
-
atf=-damage=flags=missing=question=
pu
atf=pudamage=flags=missing=question=
-
atf=-damage=flags=missing=question=
te
atf=tedamage=flags=missing=question=
word gu-ra
atf=gu-radamage=flags=missing=question=
gu
atf=gudamage=flags=missing=question=
-
atf=-damage=flags=missing=question=
ra
atf=radamage=flags=missing=question=
word ša₂
atf=ša₂damage=flags=missing=question=
ša₂
atf=ša₂damage=flags=missing=question=
word GI
atf=GIdamage=flags=missing=question=
GI
atf=GIdamage=flags=missing=question=
word NUMUN
atf=NUMUNdamage=flags=missing=question=
NUMUN
atf=NUMUNdamage=flags=missing=question=
cluster
atf=damage=flags=missing=question=
word u₂ta-lu-pa-di
atf={u₂}ta-lu-pa-didamage=flags=missing=question=
u₂
atf=u₂damage=flags=missing=question=
word u₂ta-lu-pa-di
atf={u₂}ta-lu-pa-didamage=flags=missing=question=
ta
atf=tadamage=flags=missing=question=
-
atf=-damage=flags=missing=question=
lu
atf=ludamage=flags=missing=question=
-
atf=-damage=flags=missing=question=
pa
atf=padamage=flags=missing=question=
-
atf=-damage=flags=missing=question=
di
atf=didamage=flags=missing=question=
" + "
P365742 obverse:2:17
line
atf=17. 1/3 SILA₃ {u₂}ṣa-da-n[a? ...] ina# GA# SILA₁₁-aš SAR-ab KI MINdamage=flags=missing=question=
word 1/3
atf=1/3damage=flags=missing=question=
1/
atf=1damage=flags=missing=question=
3
atf=3damage=flags=missing=question=
word SILA₃
atf=SILA₃damage=flags=missing=question=
SILA₃
atf=SILA₃damage=flags=missing=question=
cluster
atf=damage=flags=missing=question=
word {u₂}ṣa-da-[na?
atf={u₂}ṣa-da-n[a?damage=flags=missing=question=
{u₂}
atf=u₂damage=flags=missing=question=
word {u₂}ṣa-da-[na?
atf={u₂}ṣa-da-n[a?damage=flags=missing=question=
ṣa-
atf=ṣadamage=flags=missing=question=
da-
atf=dadamage=flags=missing=question=
cluster
atf=damage=flags=missing=question=
word {u₂}ṣa-da-[na?
atf={u₂}ṣa-da-n[a?damage=flags=missing=question=
[na?
atf=na?damage=flags=?missing=1question=1
word ...]
atf=...]damage=flags=missing=question=
...]
atf=...damage=flags=missing=1question=
word ina#
atf=ina#damage=flags=missing=question=
ina#
atf=ina#damage=1flags=#missing=question=
word GA#
atf=GA#damage=flags=missing=question=
GA#
atf=GA#damage=1flags=#missing=question=
word SILA₁₁-aš
atf=SILA₁₁-ašdamage=flags=missing=question=
SILA₁₁-
atf=SILA₁₁damage=flags=missing=question=
aš
atf=ašdamage=flags=missing=question=
word SAR-ab
atf=SAR-abdamage=flags=missing=question=
SAR-
atf=SARdamage=flags=missing=question=
ab
atf=abdamage=flags=missing=question=
word KI
atf=KIdamage=flags=missing=question=
KI
atf=KIdamage=flags=missing=question=
word MIN\n", + "
atf=MINdamage=flags=missing=question=
MIN\n", + "
atf=MINdamage=flags=missing=question=
" ], "text/plain": [ "" @@ -4311,7 +4572,9 @@ { "data": { "text/html": [ - "
P394104 obverse:2:37
line
atf=37. [tu?-gal?-lab?] {u₂#}BAL# NUMUN# U₂# [da-a]q-qi₂-qi₂ ŠE₁₀ up-pu-te gu-ra ša₂ GI NUMUN {u₂}ta-lu-pa-di
word [tu?-gal?-lab?]
atf=[tu?-gal?-lab?]
[
atf=[
cluster
word [tu?-gal?-lab?]
atf=[tu?-gal?-lab?]
tu?
atf=tu?flags=?missing=1question=1
-
atf=-missing=1
gal?
atf=gal?flags=?missing=1question=1
-
atf=-missing=1
lab?
atf=lab?flags=?missing=1question=1
]
atf=]missing=1
cluster
word u₂#BAL#
atf={u₂#}BAL#
u₂#
atf=u₂#damage=1flags=#
word u₂#BAL#
atf={u₂#}BAL#
BAL#
atf=BAL#damage=1flags=#
word NUMUN#
atf=NUMUN#
NUMUN#
atf=NUMUN#damage=1flags=#
word U₂#
atf=U₂#
U₂#
atf=U₂#damage=1flags=#
word [da-] aq#-qi₂-qi₂
atf=[da-a]q-qi₂-qi₂
[
atf=[
cluster
word [da-] aq#-qi₂-qi₂
atf=[da-a]q-qi₂-qi₂
da
atf=damissing=1
-
atf=-missing=1
]
atf=]missing=1
word [da-] aq#-qi₂-qi₂
atf=[da-a]q-qi₂-qi₂
aq#
atf=aq#damage=1flags=#
-
atf=-
qi₂
atf=qi₂
-
atf=-
qi₂
atf=qi₂
word ŠE₁₀
atf=ŠE₁₀
ŠE₁₀
atf=ŠE₁₀
word up-pu-te
atf=up-pu-te
up
atf=up
-
atf=-
pu
atf=pu
-
atf=-
te
atf=te
word gu-ra
atf=gu-ra
gu
atf=gu
-
atf=-
ra
atf=ra
word ša₂
atf=ša₂
ša₂
atf=ša₂
word GI
atf=GI
GI
atf=GI
word NUMUN
atf=NUMUN
NUMUN
atf=NUMUN
cluster
word u₂ta-lu-pa-di
atf={u₂}ta-lu-pa-di
u₂
atf=u₂
word u₂ta-lu-pa-di
atf={u₂}ta-lu-pa-di
ta
atf=ta
-
atf=-
lu
atf=lu
-
atf=-
pa
atf=pa
-
atf=-
di
atf=di
" + "
P365742 obverse:2:17
line
atf=17. 1/3 SILA₃ {u₂}ṣa-da-n[a? ...] ina# GA# SILA₁₁-aš SAR-ab KI MIN
word 1/3
atf=1/3
1/
atf=1
3
atf=3
word SILA₃
atf=SILA₃
SILA₃
atf=SILA₃
cluster
word {u₂}ṣa-da-[na?
atf={u₂}ṣa-da-n[a?
{u₂}
atf=u₂
word {u₂}ṣa-da-[na?
atf={u₂}ṣa-da-n[a?
ṣa-
atf=ṣa
da-
atf=da
cluster
word {u₂}ṣa-da-[na?
atf={u₂}ṣa-da-n[a?
[na?
atf=na?flags=?missing=1question=1
word ...]
atf=...]
...]
atf=...missing=1
word ina#
atf=ina#
ina#
atf=ina#damage=1flags=#
word GA#
atf=GA#
GA#
atf=GA#damage=1flags=#
word SILA₁₁-aš
atf=SILA₁₁-aš
SILA₁₁-
atf=SILA₁₁
aš
atf=aš
word SAR-ab
atf=SAR-ab
SAR-
atf=SAR
ab
atf=ab
word KI
atf=KI
KI
atf=KI
word MIN\n", + "
atf=MIN
MIN\n", + "
atf=MIN
" ], "text/plain": [ "" @@ -4366,7 +4629,9 @@ { "data": { "text/html": [ - "
P394104 obverse:2:37
line
atf=37. [tu?-gal?-lab?] {u₂#}BAL# NUMUN# U₂# [da-a]q-qi₂-qi₂ ŠE₁₀ up-pu-te gu-ra ša₂ GI NUMUN {u₂}ta-lu-pa-di
word [tu?-gal?-lab?]
atf=[tu?-gal?-lab?]
[
atf=[
cluster
word [tu?-gal?-lab?]
atf=[tu?-gal?-lab?]
tu?
atf=tu?flags=?
-
atf=-
gal?
atf=gal?flags=?
-
atf=-
lab?
atf=lab?flags=?
]
atf=]
cluster
word u₂#BAL#
atf={u₂#}BAL#
u₂#
atf=u₂#flags=#
word u₂#BAL#
atf={u₂#}BAL#
BAL#
atf=BAL#flags=#
word NUMUN#
atf=NUMUN#
NUMUN#
atf=NUMUN#flags=#
word U₂#
atf=U₂#
U₂#
atf=U₂#flags=#
word [da-] aq#-qi₂-qi₂
atf=[da-a]q-qi₂-qi₂
[
atf=[
cluster
word [da-] aq#-qi₂-qi₂
atf=[da-a]q-qi₂-qi₂
da
atf=da
-
atf=-
]
atf=]
word [da-] aq#-qi₂-qi₂
atf=[da-a]q-qi₂-qi₂
aq#
atf=aq#flags=#
-
atf=-
qi₂
atf=qi₂
-
atf=-
qi₂
atf=qi₂
word ŠE₁₀
atf=ŠE₁₀
ŠE₁₀
atf=ŠE₁₀
word up-pu-te
atf=up-pu-te
up
atf=up
-
atf=-
pu
atf=pu
-
atf=-
te
atf=te
word gu-ra
atf=gu-ra
gu
atf=gu
-
atf=-
ra
atf=ra
word ša₂
atf=ša₂
ša₂
atf=ša₂
word GI
atf=GI
GI
atf=GI
word NUMUN
atf=NUMUN
NUMUN
atf=NUMUN
cluster
word u₂ta-lu-pa-di
atf={u₂}ta-lu-pa-di
u₂
atf=u₂
word u₂ta-lu-pa-di
atf={u₂}ta-lu-pa-di
ta
atf=ta
-
atf=-
lu
atf=lu
-
atf=-
pa
atf=pa
-
atf=-
di
atf=di
" + "
P365742 obverse:2:17
line
atf=17. 1/3 SILA₃ {u₂}ṣa-da-n[a? ...] ina# GA# SILA₁₁-aš SAR-ab KI MIN
word 1/3
atf=1/3
1/
atf=1
3
atf=3
word SILA₃
atf=SILA₃
SILA₃
atf=SILA₃
cluster
word {u₂}ṣa-da-[na?
atf={u₂}ṣa-da-n[a?
{u₂}
atf=u₂
word {u₂}ṣa-da-[na?
atf={u₂}ṣa-da-n[a?
ṣa-
atf=ṣa
da-
atf=da
cluster
word {u₂}ṣa-da-[na?
atf={u₂}ṣa-da-n[a?
[na?
atf=na?flags=?
word ...]
atf=...]
...]
atf=...
word ina#
atf=ina#
ina#
atf=ina#flags=#
word GA#
atf=GA#
GA#
atf=GA#flags=#
word SILA₁₁-aš
atf=SILA₁₁-aš
SILA₁₁-
atf=SILA₁₁
aš
atf=aš
word SAR-ab
atf=SAR-ab
SAR-
atf=SAR
ab
atf=ab
word KI
atf=KI
KI
atf=KI
word MIN\n", + "
atf=MIN
MIN\n", + "
atf=MIN
" ], "text/plain": [ "" @@ -4419,7 +4684,9 @@ { "data": { "text/html": [ - "
P394104 obverse:2:37
line
word [tu?-gal?-lab?]
[
cluster
word [tu?-gal?-lab?]
tu?
-
gal?
-
lab?
]
cluster
word u₂#BAL#
u₂#
word u₂#BAL#
BAL#
word NUMUN#
NUMUN#
word U₂#
U₂#
word [da-] aq#-qi₂-qi₂
[
cluster
word [da-] aq#-qi₂-qi₂
da
-
]
word [da-] aq#-qi₂-qi₂
aq#
-
qi₂
-
qi₂
word ŠE₁₀
ŠE₁₀
word up-pu-te
up
-
pu
-
te
word gu-ra
gu
-
ra
word ša₂
ša₂
word GI
GI
word NUMUN
NUMUN
cluster
word u₂ta-lu-pa-di
u₂
word u₂ta-lu-pa-di
ta
-
lu
-
pa
-
di
" + "
P365742 obverse:2:17
line
word 1/3
1/
3
word SILA₃
SILA₃
cluster
word {u₂}ṣa-da-[na?
{u₂}
word {u₂}ṣa-da-[na?
ṣa-
da-
cluster
word {u₂}ṣa-da-[na?
[na?
word ...]
...]
word ina#
ina#
word GA#
GA#
word SILA₁₁-aš
SILA₁₁-
aš
word SAR-ab
SAR-
ab
word KI
KI
word MIN\n", + "
MIN\n", + "
" ], "text/plain": [ "" @@ -4486,7 +4753,7 @@ "name": "stdout", "output_type": "stream", "text": [ - " 0.18s 31 results\n" + " 0.12s 12 results\n" ] }, { @@ -4504,7 +4771,8 @@ { "data": { "text/html": [ - "
P394104 obverse:2:37
line
word [
type=word
cluster
type=missing
word tu?-gal?-lab?]
type=word
cluster
type=det
word u₂#
type=word
word BAL#
type=word
word NUMUN#
type=word
word U₂#
type=word
word [
type=word
cluster
type=missing
word da-]
type=word
word aq#-qi₂-qi₂
type=word
word ŠE₁₀
type=word
word up-pu-te
type=word
word gu-ra
type=word
word ša₂
type=word
word GI
type=word
word NUMUN
type=word
cluster
type=det
word u₂
type=word
word ta-lu-pa-di
type=word
" + "
P365742 obverse:2:17
line
word 1/3
type=word
word SILA₃
type=word
cluster
type=det
word {u₂}
type=word
word ṣa-da-
type=word
cluster
type=missing
word [na?
type=word
word ...]
type=word
word ina#
type=word
word GA#
type=word
word SILA₁₁-aš
type=word
word SAR-ab
type=word
word KI
type=word
word MIN\n", + "
type=word
" ], "text/plain": [ "" @@ -4549,7 +4817,9 @@ { "data": { "text/html": [ - "
P394104 obverse:2:37
line
word [tu?-gal?-lab?]
type=word
[
type=mark
cluster
type=missing
word [tu?-gal?-lab?]
type=word
tu?
missing=1question=1type=reading
-
missing=1type=joiner
gal?
missing=1question=1type=reading
-
missing=1type=joiner
lab?
missing=1question=1type=reading
]
missing=1type=mark
cluster
type=det
word u₂#BAL#
type=word
u₂#
damage=1type=mark
word u₂#BAL#
type=word
BAL#
damage=1type=grapheme
word NUMUN#
type=word
NUMUN#
damage=1type=grapheme
word U₂#
type=word
U₂#
damage=1type=grapheme
word [da-] aq#-qi₂-qi₂
type=word
[
type=mark
cluster
type=missing
word [da-] aq#-qi₂-qi₂
type=word
da
missing=1type=reading
-
missing=1type=joiner
]
missing=1type=mark
word [da-] aq#-qi₂-qi₂
type=word
aq#
damage=1type=reading
-
type=joiner
qi₂
type=reading
-
type=joiner
qi₂
type=reading
word ŠE₁₀
type=word
ŠE₁₀
type=grapheme
word up-pu-te
type=word
up
type=reading
-
type=joiner
pu
type=reading
-
type=joiner
te
type=reading
word gu-ra
type=word
gu
type=reading
-
type=joiner
ra
type=reading
word ša₂
type=word
ša₂
type=reading
word GI
type=word
GI
type=grapheme
word NUMUN
type=word
NUMUN
type=mark
cluster
type=det
word u₂ta-lu-pa-di
type=word
u₂
type=mark
word u₂ta-lu-pa-di
type=word
ta
type=reading
-
type=joiner
lu
type=reading
-
type=joiner
pa
type=reading
-
type=joiner
di
type=reading
" + "
P365742 obverse:2:17
line
word 1/3
type=word
1/
type=numeral
3
type=numeral
word SILA₃
type=word
SILA₃
type=grapheme
cluster
type=det
word {u₂}ṣa-da-[na?
type=word
{u₂}
type=reading
word {u₂}ṣa-da-[na?
type=word
ṣa-
type=reading
da-
type=reading
cluster
type=missing
word {u₂}ṣa-da-[na?
type=word
[na?
missing=1question=1type=reading
word ...]
type=word
...]
missing=1type=ellipsis
word ina#
type=word
ina#
damage=1type=reading
word GA#
type=word
GA#
damage=1type=grapheme
word SILA₁₁-aš
type=word
SILA₁₁-
type=grapheme
aš
type=reading
word SAR-ab
type=word
SAR-
type=grapheme
ab
type=reading
word KI
type=word
KI
type=grapheme
word MIN\n", + "
type=word
MIN\n", + "
type=grapheme
" ], "text/plain": [ "" @@ -4608,7 +4878,7 @@ "name": "stdout", "output_type": "stream", "text": [ - " 0.21s 47648 results\n" + " 0.12s 18517 results\n" ] } ], @@ -4642,7 +4912,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "2182 lines\n" + "1411 lines\n" ] } ], @@ -4675,7 +4945,7 @@ { "data": { "text/plain": [ - "1676" + "870" ] }, "execution_count": 37, @@ -4704,7 +4974,7 @@ { "data": { "text/plain": [ - "(85972, 3, 4, 5, 6, 7, 8, 1)" + "(59315, 9, 10, 11, 12, 6)" ] }, "execution_count": 38, @@ -4753,12 +5023,22 @@ { "data": { "text/html": [ - "\n", - "\n", - "\n", - "\n", - "\n", - "
nplinesignsignsignsignsignsignsign
1P285136 obverse:1'DU₃#[.DU₃.BI ...] .DU₃.BI ...] DU₃#
2P285136 obverse:2'5 KA#.INIM.MA [x x x x] x x x x] KA#
3P285136 obverse:3'EN₂ su.ub hur.ri.im# su#.[ub ...] ub ...] im# su#
4P285136 obverse:4'ša₂ sa.ku.tu₂ hi.si a.pi.il.lat aš kur#[.ba.an.ni ...] .ba.an.ni ...] kur#
5P285136 obverse:6'EN₂ ma-mit GIM šar-ra-<qi₂> ina KA₂ pil-ši un gi ha ba# [x x x x x x x x x x x x] x x x x x x x x x x x x] ba#
" + "\n", + "\n", + "\n", + "\n", + "\n", + "
nplinesignsignsignsignsign
1P285136 obverse:2'5 KA#.INIM.MA [x x x x]\n", + "[x x x x]\n", + "KA#.
2P285136 obverse:6'EN₂ ma-mit GIM šar-ra-<qi₂> ina KA₂ pil-ši un gi ha ba# [x x x x x x x x x x x x]\n", + "[x x x x x x x x x x x x]\n", + "ba#
3P285136 obverse:12'DIŠ# NA SAG.DU-su gur-ru-ud sah-le₂-e si-ki-[tu₂ x x x x x x x x x x x x x x x x x x]\n", + "[tu₂ x x x x x x x x x x x x x x x x x x]\n", + "DIŠ#
4P285136 obverse:13'ina# A NAGA SAG.DU-su LUH-si I₃.GIŠ EŠ.MEŠ# [x x x x x x x x x x x x x x x x x x x x x]\n", + "[x x x x x x x x x x x x x x x x x x x x x]\n", + "MEŠ# ina#
5P285136 obverse:15'[{u₂}]HAB# [SUD₂ MAR {u₂}]ZA#.[BA.LAM ...]\n", + "[{u₂}][SUD₂ MAR {u₂}][BA.LAM ...]\n", + "HAB# ZA#.
" ], "text/plain": [ "" diff --git a/tutorial/similarLines.ipynb b/tutorial/similarLines.ipynb index 6f9eeda..5512083 100644 --- a/tutorial/similarLines.ipynb +++ b/tutorial/similarLines.ipynb @@ -55,13 +55,13 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 3, "metadata": {}, "outputs": [ { "data": { "text/html": [ - "TF-app: ~/text-fabric-data/Nino-cunei/ninmed/app" + "TF-app: ~/github/Nino-cunei/ninmed/app" ], "text/plain": [ "" @@ -73,7 +73,7 @@ { "data": { "text/html": [ - "data: ~/text-fabric-data/Nino-cunei/ninmed/tf/0.2" + "data: ~/github/Nino-cunei/ninmed/tf/0.3" ], "text/plain": [ "" @@ -85,7 +85,7 @@ { "data": { "text/html": [ - "data: ~/text-fabric-data/Nino-cunei/ninmed/parallels/tf/0.2" + "data: ~/github/Nino-cunei/ninmed/parallels/tf/0.3" ], "text/plain": [ "" @@ -101,7 +101,8 @@ "This is Text-Fabric 9.2.5\n", "Api reference : https://annotation.github.io/text-fabric/tf/cheatsheet.html\n", "\n", - "46 features found and 0 ignored\n" + "49 features found and 0 ignored\n", + " | 0.01s T sim from ~/github/Nino-cunei/ninmed/parallels/tf/0.3\n" ] }, { @@ -113,7 +114,7 @@ "\n", "
\n", "
\n", - "sim\n", + "sim\n", "
\n", "
int
\n", "
\n", @@ -127,7 +128,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:02:58Z
\n", + "
2022-02-10T07:40:36Z
\n", "
\n", "\n", "
\n", @@ -162,7 +163,7 @@ "\n", "
\n", "
\n", - "after\n", + "after\n", "
\n", "
str
\n", "
\n", @@ -176,7 +177,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:36Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -205,7 +206,7 @@ "\n", "
\n", "
\n", - "atf\n", + "atf\n", "
\n", "
str
\n", "
\n", @@ -219,7 +220,93 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", + "
\n", + "\n", + "
\n", + "
editor:
\n", + "
Cale Johnson et al.
\n", + "
\n", + "\n", + "
\n", + "
name:
\n", + "
NinMed Medical Texts from Nineveh
\n", + "
\n", + "\n", + "
\n", + "
project:
\n", + "
BabMed
\n", + "
\n", + "\n", + "
\n", + "
writtenBy:
\n", + "
Text-Fabric
\n", + "
\n", + "\n", + "
\n", + "
\n", + "
\n", + "\n", + "
\n", + "
\n", + "atfpost\n", + "
\n", + "
str
\n", + "
\n", + " cluster characters that follow a sign or word\n", + "
\n", + "\n", + "
\n", + "
converters:
\n", + "
Cale Johnson, Dirk Roorda
\n", + "
\n", + "\n", + "
\n", + "
dateWritten:
\n", + "
2022-02-10T07:10:40Z
\n", + "
\n", + "\n", + "
\n", + "
editor:
\n", + "
Cale Johnson et al.
\n", + "
\n", + "\n", + "
\n", + "
name:
\n", + "
NinMed Medical Texts from Nineveh
\n", + "
\n", + "\n", + "
\n", + "
project:
\n", + "
BabMed
\n", + "
\n", + "\n", + "
\n", + "
writtenBy:
\n", + "
Text-Fabric
\n", + "
\n", + "\n", + "
\n", + "
\n", + "
\n", + "\n", + "
\n", + "
\n", + "atfpre\n", + "
\n", + "
str
\n", + "
\n", + " cluster characters that precede a sign or word\n", + "
\n", + "\n", + "
\n", + "
converters:
\n", + "
Cale Johnson, Dirk Roorda
\n", + "
\n", + "\n", + "
\n", + "
dateWritten:
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -248,7 +335,7 @@ "\n", "
\n", "
\n", - "col\n", + "col\n", "
\n", "
int
\n", "
\n", @@ -262,7 +349,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -291,7 +378,7 @@ "\n", "
\n", "
\n", - "collated\n", + "collated\n", "
\n", "
int
\n", "
\n", @@ -305,7 +392,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -334,7 +421,7 @@ "\n", "
\n", "
\n", - "collection\n", + "collection\n", "
\n", "
str
\n", "
\n", @@ -348,7 +435,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -377,7 +464,7 @@ "\n", "
\n", "
\n", - "colofon\n", + "colofon\n", "
\n", "
str
\n", "
\n", @@ -391,7 +478,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -420,7 +507,7 @@ "\n", "
\n", "
\n", - "comment\n", + "comment\n", "
\n", "
str
\n", "
\n", @@ -434,7 +521,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -463,7 +550,7 @@ "\n", "
\n", "
\n", - "damage\n", + "damage\n", "
\n", "
int
\n", "
\n", @@ -477,7 +564,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -506,7 +593,7 @@ "\n", "
\n", "
\n", - "description\n", + "description\n", "
\n", "
str
\n", "
\n", @@ -520,7 +607,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -549,7 +636,7 @@ "\n", "
\n", "
\n", - "det\n", + "det\n", "
\n", "
int
\n", "
\n", @@ -563,7 +650,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -592,7 +679,7 @@ "\n", "
\n", "
\n", - "docnumber\n", + "docnumber\n", "
\n", "
str
\n", "
\n", @@ -606,7 +693,50 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", + "
\n", + "\n", + "
\n", + "
editor:
\n", + "
Cale Johnson et al.
\n", + "
\n", + "\n", + "
\n", + "
name:
\n", + "
NinMed Medical Texts from Nineveh
\n", + "
\n", + "\n", + "
\n", + "
project:
\n", + "
BabMed
\n", + "
\n", + "\n", + "
\n", + "
writtenBy:
\n", + "
Text-Fabric
\n", + "
\n", + "\n", + "
\n", + "
\n", + "
\n", + "\n", + "
\n", + "
\n", + "erasure\n", + "
\n", + "
int
\n", + "
\n", + " whether a sign is in an erasure - between ° / °: 1: between ° and /; 2: between / and °\n", + "
\n", + "\n", + "
\n", + "
converters:
\n", + "
Cale Johnson, Dirk Roorda
\n", + "
\n", + "\n", + "
\n", + "
dateWritten:
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -635,7 +765,7 @@ "\n", "
\n", "
\n", - "excised\n", + "excised\n", "
\n", "
int
\n", "
\n", @@ -649,7 +779,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -678,7 +808,7 @@ "\n", "
\n", "
\n", - "face\n", + "face\n", "
\n", "
str
\n", "
\n", @@ -692,7 +822,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -721,7 +851,7 @@ "\n", "
\n", "
\n", - "flags\n", + "flags\n", "
\n", "
str
\n", "
\n", @@ -735,7 +865,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -764,7 +894,7 @@ "\n", "
\n", "
\n", - "gloss\n", + "gloss\n", "
\n", "
int
\n", "
\n", @@ -778,7 +908,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -807,7 +937,7 @@ "\n", "
\n", "
\n", - "grapheme\n", + "grapheme\n", "
\n", "
str
\n", "
\n", @@ -821,7 +951,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -850,7 +980,7 @@ "\n", "
\n", "
\n", - "lang\n", + "lang\n", "
\n", "
str
\n", "
\n", @@ -864,7 +994,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -893,7 +1023,7 @@ "\n", "
\n", "
\n", - "lemma\n", + "lemma\n", "
\n", "
str
\n", "
\n", @@ -907,7 +1037,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -936,7 +1066,7 @@ "\n", "
\n", "
\n", - "lln\n", + "lln\n", "
\n", "
int
\n", "
\n", @@ -950,7 +1080,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -979,7 +1109,7 @@ "\n", "
\n", "
\n", - "ln\n", + "ln\n", "
\n", "
int
\n", "
\n", @@ -993,7 +1123,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1022,7 +1152,7 @@ "\n", "
\n", "
\n", - "lnno\n", + "lnno\n", "
\n", "
str
\n", "
\n", @@ -1036,7 +1166,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1065,7 +1195,7 @@ "\n", "
\n", "
\n", - "missing\n", + "missing\n", "
\n", "
int
\n", "
\n", @@ -1079,7 +1209,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1108,7 +1238,7 @@ "\n", "
\n", "
\n", - "modifiers\n", + "modifiers\n", "
\n", "
str
\n", "
\n", @@ -1122,7 +1252,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1151,7 +1281,7 @@ "\n", "
\n", "
\n", - "museum\n", + "museum\n", "
\n", "
str
\n", "
\n", @@ -1165,7 +1295,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1194,7 +1324,7 @@ "\n", "
\n", "
\n", - "note\n", + "note\n", "
\n", "
str
\n", "
\n", @@ -1208,7 +1338,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1237,7 +1367,7 @@ "\n", "
\n", "
\n", - "number\n", + "number\n", "
\n", "
int
\n", "
\n", @@ -1251,7 +1381,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1280,7 +1410,7 @@ "\n", "
\n", "
\n", - "otype\n", + "otype\n", "
\n", "
str
\n", "
\n", @@ -1294,7 +1424,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1323,7 +1453,7 @@ "\n", "
\n", "
\n", - "pnumber\n", + "pnumber\n", "
\n", "
str
\n", "
\n", @@ -1337,7 +1467,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1366,7 +1496,7 @@ "\n", "
\n", "
\n", - "primecol\n", + "primecol\n", "
\n", "
int
\n", "
\n", @@ -1380,7 +1510,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1409,7 +1539,7 @@ "\n", "
\n", "
\n", - "primeln\n", + "primeln\n", "
\n", "
int
\n", "
\n", @@ -1423,7 +1553,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1452,7 +1582,7 @@ "\n", "
\n", "
\n", - "publication\n", + "publication\n", "
\n", "
str
\n", "
\n", @@ -1466,7 +1596,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1495,7 +1625,7 @@ "\n", "
\n", "
\n", - "question\n", + "question\n", "
\n", "
int
\n", "
\n", @@ -1509,7 +1639,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1538,7 +1668,7 @@ "\n", "
\n", "
\n", - "reading\n", + "reading\n", "
\n", "
str
\n", "
\n", @@ -1552,7 +1682,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1581,7 +1711,7 @@ "\n", "
\n", "
\n", - "remarkable\n", + "remarkable\n", "
\n", "
int
\n", "
\n", @@ -1595,7 +1725,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1624,7 +1754,7 @@ "\n", "
\n", "
\n", - "ruling\n", + "ruling\n", "
\n", "
str
\n", "
\n", @@ -1638,7 +1768,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1667,7 +1797,7 @@ "\n", "
\n", "
\n", - "seal\n", + "seal\n", "
\n", "
str
\n", "
\n", @@ -1681,7 +1811,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1710,7 +1840,7 @@ "\n", "
\n", "
\n", - "supplied\n", + "supplied\n", "
\n", "
int
\n", "
\n", @@ -1724,7 +1854,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1753,7 +1883,7 @@ "\n", "
\n", "
\n", - "sym\n", + "sym\n", "
\n", "
str
\n", "
\n", @@ -1767,7 +1897,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1796,7 +1926,7 @@ "\n", "
\n", "
\n", - "tr@ll\n", + "tr@ll\n", "
\n", "
str
\n", "
\n", @@ -1810,7 +1940,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1839,7 +1969,7 @@ "\n", "
\n", "
\n", - "trans\n", + "trans\n", "
\n", "
int
\n", "
\n", @@ -1853,7 +1983,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1882,7 +2012,7 @@ "\n", "
\n", "
\n", - "type\n", + "type\n", "
\n", "
str
\n", "
\n", @@ -1896,7 +2026,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1925,7 +2055,7 @@ "\n", "
\n", "
\n", - "uncertain\n", + "uncertain\n", "
\n", "
int
\n", "
\n", @@ -1939,7 +2069,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1968,7 +2098,7 @@ "\n", "
\n", "
\n", - "variant\n", + "variant\n", "
\n", "
int
\n", "
\n", @@ -1982,7 +2112,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -2011,7 +2141,7 @@ "\n", "
\n", "
\n", - "oslots\n", + "oslots\n", "
\n", "
none
\n", "
\n", @@ -2025,7 +2155,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -2720,7 +2850,8 @@ } ], "source": [ - "A = use(\"Nino-cunei/ninmed\", mod=\"Nino-cunei/ninmed/parallels/tf\", hoist=globals())" + "A = use(\"Nino-cunei/ninmed:clone\", mod=\"Nino-cunei/ninmed/parallels/tf:clone\", checkout=\"clone\", hoist=globals())\n", + "# A = use(\"Nino-cunei/ninmed\", mod=\"Nino-cunei/ninmed/parallels/tf\", hoist=globals())" ] }, { @@ -2737,7 +2868,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 4, "metadata": {}, "outputs": [ { @@ -2745,18 +2876,21 @@ "output_type": "stream", "text": [ "3 similar lines\n", - "85982 with similarity 100\n", - "86445 with similarity 100\n", - "88305 with similarity 100\n" + "59324 with similarity 100\n", + "59787 with similarity 100\n", + "61647 with similarity 100\n" ] }, { "data": { "text/html": [ "\n", - "\n", - "\n", - "
npline
1P285136 obverse:11'2 KA.INIM.MA [x x x x x x]
2P393782 reverse:1:15KA.INIM#.[MA ...]
3P393735 obverse:2:28[KA.INIM.] MA?# [...]
" + "1P285136 obverse:11'2 KA.INIM.MA [x x x x x x]\n", + "\n", + "2P393782 reverse:1:15KA.INIM#.[MA ...]\n", + "\n", + "3P393735 obverse:2:28[KA.INIM.MA?] [...]\n", + "" ], "text/plain": [ "" @@ -2785,7 +2919,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 5, "metadata": {}, "outputs": [ { @@ -2833,7 +2967,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 6, "metadata": {}, "outputs": [], "source": [ @@ -2852,14 +2986,14 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 7, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - " 0.01s 21 results\n" + " 0.01s 25 results\n" ] } ], @@ -2876,23 +3010,43 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 8, "metadata": {}, "outputs": [ { "data": { "text/html": [ "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "
nplineline
1P285136 obverse:6'EN₂ ma-mit GIM šar-ra-<qi₂> ina KA₂ pil-ši un gi ha ba# [x x x x x x x x x x x x] [EN₂ ma]-mit GIM šar-ra-qi₂ ina KA₂ pil-ši# un?# [...]
2P285109 obverse:1:6'[x x GAZI] sar# SILA₁₁-aš LAL-ma UD.3.KAM₂# [NU DU₈] [... ] SILA₁₁#-aš# SAR#-ab# LAL-ma UD.3.KAM₂ NU DU₈
3P394104 obverse:1:28[ina ] TUG₂# te-sip 7 UD-me ina KUN₄ te-te-mer# [E₁₁-ma ...] 7 UD-me ina KUN₄# [te-te-mer E₁₁-ma ...] x [...]
4P394104 obverse:2:17[...] x-ta ana ŠA₃ IGI.MIN-šu₂ tu-na-tak [... ] SUD₂?# ana ŠA₃ IGI.MIN-šu₂ tu#[-na-tak₂]
5P394104 obverse:2:55x x [... ] SUD₂# IGI.MIN-šu₂ MAR [... IGI.MIN-šu₂] MAR?
6P393782 reverse:1:12ŠA₃-bi# [AN u] KI# lip-pa-šir ŠA₃#[-bi x x x x x x] ŠA₃-bi# [AN u KI lip-pa-] šir₃# ki-ma ŠA₃-bi AN u KI [...] x x x
7P404547 obverse:5'[DUH.] ŠE#.GIŠ.I₃# ša₂-bu-lu-te GAZ# SIM# [x x x x x x x x x] DUH.ŠE.GIŠ.I₃ ša₂-bu-lu#[-te x x x x x x x x x x x (x)]
8P365742 obverse:1:9ina A GAZIsar SILA₁₁-aš SAR-ab LAL-ma UD#.3#.KAM# [NU DU₈] GAZ SIM ina A GAZI#[sar SILA₁₁-aš ] SAR#-ab# LAL-ma UD.3#.[KAM NU DU₈]
9P365742 obverse:1:41[... SILA₁₁-] aš# SAR-ab LAL-ma KI [MIN] [... ina] GA# [SILA₁₁-aš ] SAR#-ab LAL-ma KI MIN
10P365742 obverse:1:45[... ] SILA₁₁#-aš# SAR#-ab# LAL-ma UD.3.KAM₂ NU DU₈ [... SAR]-ab# [LAL]-ma# UD.3.KAM₂ NU [DU₈]
" + "1P285136 obverse:6'EN₂ ma-mit GIM šar-ra-<qi₂> ina KA₂ pil-ši un gi ha ba# [x x x x x x x x x x x x]\n", + "[EN₂ ma]-mit GIM šar-ra-qi₂ ina KA₂ pil-ši# [un? ...]\n", + "\n", + "2P399223 obverse:1:5[x x x x x x x x x x x TI-šu₂] I₃.GIŠ {šim}GUR₂.GUR₂ ŠEŠ₂-su\n", + "[x x x x x x x x x x ana TI]-šu₂ I₃.GIŠ {šim}GUR₂.GUR₂ I₃.GIŠ {šim}LI ŠEŠ₂-[su]\n", + "\n", + "3P394104 obverse:1:28[ina TUG₂] te-sip 7 UD-me ina KUN₄ te-te-[mer E₁₁-ma ...]\n", + "7 UD-me ina [KUN₄ te-te-mer E₁₁-ma ...] x [...]\n", + "\n", + "4P394104 obverse:2:17[...] x-ta ana ŠA₃ IGI.MIN-šu₂ tu-na-tak\n", + "[... SUD₂?] ana ŠA₃ IGI.MIN-šu₂ [tu-na-tak₂]\n", + "\n", + "5P394104 obverse:2:55x x [... SUD₂] IGI.MIN-šu₂ MAR\n", + "[... IGI.MIN-šu₂] MAR?\n", + "\n", + "6P394104 reverse:4:47'[E₂.GAL {m}aš-šur-DU₃.A LUGAL ŠU₂ 20 KUR AN.ŠAR₂{ki} ša {d}AG u {d}taš-me-tu₄ GEŠTU.MIN ra-pa-aš₂-tu₄ iš-ru-ku-šu₂]\n", + "E₂.GAL {diš}AN.ŠAR₂-DU₃.A 20 ŠU₂# 20# KUR AN.ŠAR₂{ki} ša {d}AG# [u] {d#}taš-me-tu₄ GEŠTU.MIN ra-pa-aš₂-tu₄ iš-ru-ku-uš\n", + "\n", + "7P393782 reverse:1:12ŠA₃-[bi AN u] KI# lip-pa-šir [ŠA₃-bi x x x x x x]\n", + "ŠA₃-[bi AN u KI lip-pa-šir₃] ki-ma ŠA₃-bi AN u KI [...] x x x\n", + "\n", + "8P404547 obverse:5'[DUH.ŠE].GIŠ.I₃# ša₂-bu-lu-te GAZ# [SIM x x x x x x x x x]\n", + "DUH.ŠE.GIŠ.I₃ ša₂-bu-[lu-te x x x x x x x x x x x (x)]\n", + "\n", + "9P365742 obverse:1:231 GIN₂ U₅ ARGAB{mušen} 1/2 [GIN₂ ...]\n", + "1 GIN₂ U₅-ARGAB{mušen} [SA₉ ...]\n", + "\n", + "10P365742 obverse:1:41[... SILA₁₁-aš] SAR-ab LAL-ma KI [MIN]\n", + "[... ina] GA# [SILA₁₁-aš SAR]-ab LAL-ma KI MIN\n", + "" ], "text/plain": [ "" @@ -2915,23 +3069,43 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 9, "metadata": {}, "outputs": [ { "data": { "text/html": [ "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "\n", - "
nplineline
1P285136 obverse:6'EN₂ ma-mit GIM šar-ra-qi ina KA₂ pil-ši un gi ha ba x x x x x x x x x x x x EN₂ ma-mit GIM šar-ra-qi ina KA₂ pil-ši un None...
2P285109 obverse:1:6'x x GAZI sar SILA₁₁-aš LAL-ma UD.3.KAM₂ NoneNU DU₈ ... SILA₁₁-aš SAR-ab LAL-ma UD.3.KAM₂ NU DU₈
3P394104 obverse:1:28ina TUG₂ te-sip 7 UD-me ina KUN₄ te-te-mer NoneE₁₁-ma ... 7 UD-me ina KUN₄ Nonete-te-mer E₁₁-ma ... x ...
4P394104 obverse:2:17... x-ta ana ŠA₃ IGI.MIN-šu tu-na-tak ... SUD₂ ana ŠA₃ IGI.MIN-šu tuNone-na-tak
5P394104 obverse:2:55x x ... SUD₂ IGI.MIN-šu MAR ... IGI.MIN-šu MAR
6P393782 reverse:1:12ŠA₃-bi NoneAN u KI lip-pa-šir ŠA₃None-bi x x x x x x ŠA₃-bi NoneAN u KI lip-pa- šir ki-ma ŠA₃-bi AN u KI ... x x x
7P404547 obverse:5'DUH. ŠE.GIŠ.I₃ ša-bu-lu-te GAZ SIM Nonex x x x x x x x x DUH.ŠE.GIŠ.I₃ ša-bu-luNone-te x x x x x x x x x x x x
8P365742 obverse:1:9ina A GAZIsar SILA₁₁-aš SAR-ab LAL-ma UD.3.KAM NoneNU DU₈ GAZ SIM ina A GAZIsar SILA₁₁-aš SAR-ab LAL-ma UD.3.KAM NU DU₈
9P365742 obverse:1:41... SILA₁₁- aš SAR-ab LAL-ma KI MIN ... ina GA SILA₁₁-aš SAR-ab LAL-ma KI MIN
10P365742 obverse:1:45... SILA₁₁-aš SAR-ab LAL-ma UD.3.KAM₂ NU DU₈ ... SAR-ab LAL-ma UD.3.KAM₂ NU DU₈
" + "1P285136 obverse:6'EN₂ ma-mit GIM šar-ra-qi ina KA₂ pil-ši un gi ha ba x x x x x x x x x x x x\n", + "EN₂ ma-mit GIM šar-ra-qi ina KA₂ pil-ši un ...\n", + "\n", + "2P399223 obverse:1:5x x x x x x x x x x x TI-šu I₃.GIŠ šimGUR₂.GUR₂ ŠEŠ₂-su\n", + "x x x x x x x x x x ana TI-šu I₃.GIŠ šimGUR₂.GUR₂ I₃.GIŠ šimLI ŠEŠ₂-su\n", + "\n", + "3P394104 obverse:1:28ina TUG₂ te-sip 7 UD-me ina KUN₄ te-te-mer E₁₁-ma ...\n", + "7 UD-me ina KUN₄ te-te-mer E₁₁-ma ... x ...\n", + "\n", + "4P394104 obverse:2:17... x-ta ana ŠA₃ IGI.MIN-šu tu-na-tak\n", + "... SUD₂ ana ŠA₃ IGI.MIN-šu tu-na-tak\n", + "\n", + "5P394104 obverse:2:55x x ... SUD₂ IGI.MIN-šu MAR\n", + "... IGI.MIN-šu MAR\n", + "\n", + "6P394104 reverse:4:47'E₂.GAL maš-šur-DU₃.A LUGAL ŠU₂ 20 KUR AN.ŠAR₂ki ša dAG u dtaš-me-tu GEŠTU.MIN ra-pa-aš-tu iš-ru-ku-šu\n", + "E₂.GAL dišAN.ŠAR₂-DU₃.A 20 ŠU₂ 20 KUR AN.ŠAR₂ki ša dAG u dtaš-me-tu GEŠTU.MIN ra-pa-aš-tu iš-ru-ku-uš\n", + "\n", + "7P393782 reverse:1:12ŠA₃-bi AN u KI lip-pa-šir ŠA₃-bi x x x x x x\n", + "ŠA₃-bi AN u KI lip-pa-šir ki-ma ŠA₃-bi AN u KI ... x x x\n", + "\n", + "8P404547 obverse:5'DUH.ŠE.GIŠ.I₃ ša-bu-lu-te GAZ SIM x x x x x x x x x\n", + "DUH.ŠE.GIŠ.I₃ ša-bu-lu-te x x x x x x x x x x x x\n", + "\n", + "9P365742 obverse:1:231 GIN₂ U₅ ARGABmušen 12 GIN₂ ...\n", + "1 GIN₂ U₅-ARGABmušen SA₉ ...\n", + "\n", + "10P365742 obverse:1:41... SILA₁₁-aš SAR-ab LAL-ma KI MIN\n", + "... ina GA SILA₁₁-aš SAR-ab LAL-ma KI MIN\n", + "" ], "text/plain": [ "" @@ -2964,7 +3138,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 10, "metadata": {}, "outputs": [], "source": [ @@ -2998,17 +3172,17 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 11, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - " 0.09s 1000 lines and 950 clusters\n", - " 0.31s 2000 lines and 1795 clusters\n", - " 0.66s 3000 lines and 2710 clusters\n", - " 0.69s 3082 lines and 2783 clusters\n" + " 0.09s 1000 lines and 944 clusters\n", + " 0.31s 2000 lines and 1787 clusters\n", + " 0.65s 3000 lines and 2702 clusters\n", + " 0.69s 3082 lines and 2776 clusters\n" ] } ], @@ -3026,7 +3200,7 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 12, "metadata": {}, "outputs": [ { @@ -3038,12 +3212,12 @@ "clusters of size 9: 1\n", "clusters of size 8: 1\n", "clusters of size 7: 1\n", - "clusters of size 6: 7\n", + "clusters of size 6: 8\n", "clusters of size 5: 3\n", - "clusters of size 4: 8\n", + "clusters of size 4: 7\n", "clusters of size 3: 16\n", - "clusters of size 2: 147\n", - "clusters of size 1: 2596\n" + "clusters of size 2: 152\n", + "clusters of size 1: 2584\n" ] } ], diff --git a/tutorial/start.ipynb b/tutorial/start.ipynb index 91cc6bb..205cb73 100644 --- a/tutorial/start.ipynb +++ b/tutorial/start.ipynb @@ -76,6 +76,33 @@ "We call those columns **features**." ] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Before you compute\n", + "\n", + "You can open the corpus in the Text-Fabric browser and\n", + "explore the contents in a browser window which is served\n", + "from your computer:" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "!!text-fabric Nino-cunei/ninmed:clone --checkout=clone" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "# Prepare to compute" + ] + }, { "cell_type": "code", "execution_count": 1, @@ -157,7 +184,7 @@ { "data": { "text/html": [ - "data: ~/github/Nino-cunei/ninmed/tf/0.2" + "data: ~/github/Nino-cunei/ninmed/tf/0.3" ], "text/plain": [ "" @@ -173,7 +200,7 @@ "This is Text-Fabric 9.2.5\n", "Api reference : https://annotation.github.io/text-fabric/tf/cheatsheet.html\n", "\n", - "45 features found and 0 ignored\n" + "48 features found and 0 ignored\n" ] }, { @@ -185,7 +212,7 @@ "\n", "
\n", "
\n", - "after\n", + "after\n", "
\n", "
str
\n", "
\n", @@ -199,7 +226,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:36Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -228,7 +255,7 @@ "\n", "
\n", "
\n", - "atf\n", + "atf\n", "
\n", "
str
\n", "
\n", @@ -242,7 +269,93 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", + "
\n", + "\n", + "
\n", + "
editor:
\n", + "
Cale Johnson et al.
\n", + "
\n", + "\n", + "
\n", + "
name:
\n", + "
NinMed Medical Texts from Nineveh
\n", + "
\n", + "\n", + "
\n", + "
project:
\n", + "
BabMed
\n", + "
\n", + "\n", + "
\n", + "
writtenBy:
\n", + "
Text-Fabric
\n", + "
\n", + "\n", + "
\n", + "
\n", + "
\n", + "\n", + "
\n", + "
\n", + "atfpost\n", + "
\n", + "
str
\n", + "
\n", + " cluster characters that follow a sign or word\n", + "
\n", + "\n", + "
\n", + "
converters:
\n", + "
Cale Johnson, Dirk Roorda
\n", + "
\n", + "\n", + "
\n", + "
dateWritten:
\n", + "
2022-02-10T07:10:40Z
\n", + "
\n", + "\n", + "
\n", + "
editor:
\n", + "
Cale Johnson et al.
\n", + "
\n", + "\n", + "
\n", + "
name:
\n", + "
NinMed Medical Texts from Nineveh
\n", + "
\n", + "\n", + "
\n", + "
project:
\n", + "
BabMed
\n", + "
\n", + "\n", + "
\n", + "
writtenBy:
\n", + "
Text-Fabric
\n", + "
\n", + "\n", + "
\n", + "
\n", + "
\n", + "\n", + "
\n", + "
\n", + "atfpre\n", + "
\n", + "
str
\n", + "
\n", + " cluster characters that precede a sign or word\n", + "
\n", + "\n", + "
\n", + "
converters:
\n", + "
Cale Johnson, Dirk Roorda
\n", + "
\n", + "\n", + "
\n", + "
dateWritten:
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -271,7 +384,7 @@ "\n", "
\n", "
\n", - "col\n", + "col\n", "
\n", "
int
\n", "
\n", @@ -285,7 +398,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -314,7 +427,7 @@ "\n", "
\n", "
\n", - "collated\n", + "collated\n", "
\n", "
int
\n", "
\n", @@ -328,7 +441,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -357,7 +470,7 @@ "\n", "
\n", "
\n", - "collection\n", + "collection\n", "
\n", "
str
\n", "
\n", @@ -371,7 +484,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -400,7 +513,7 @@ "\n", "
\n", "
\n", - "colofon\n", + "colofon\n", "
\n", "
str
\n", "
\n", @@ -414,7 +527,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -443,7 +556,7 @@ "\n", "
\n", "
\n", - "comment\n", + "comment\n", "
\n", "
str
\n", "
\n", @@ -457,7 +570,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -486,7 +599,7 @@ "\n", "
\n", "
\n", - "damage\n", + "damage\n", "
\n", "
int
\n", "
\n", @@ -500,7 +613,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -529,7 +642,7 @@ "\n", "
\n", "
\n", - "description\n", + "description\n", "
\n", "
str
\n", "
\n", @@ -543,7 +656,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -572,7 +685,7 @@ "\n", "
\n", "
\n", - "det\n", + "det\n", "
\n", "
int
\n", "
\n", @@ -586,7 +699,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -615,7 +728,7 @@ "\n", "
\n", "
\n", - "docnumber\n", + "docnumber\n", "
\n", "
str
\n", "
\n", @@ -629,7 +742,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -658,7 +771,50 @@ "\n", "
\n", "
\n", - "excised\n", + "erasure\n", + "
\n", + "
int
\n", + "
\n", + " whether a sign is in an erasure - between ° / °: 1: between ° and /; 2: between / and °\n", + "
\n", + "\n", + "
\n", + "
converters:
\n", + "
Cale Johnson, Dirk Roorda
\n", + "
\n", + "\n", + "
\n", + "
dateWritten:
\n", + "
2022-02-10T07:10:40Z
\n", + "
\n", + "\n", + "
\n", + "
editor:
\n", + "
Cale Johnson et al.
\n", + "
\n", + "\n", + "
\n", + "
name:
\n", + "
NinMed Medical Texts from Nineveh
\n", + "
\n", + "\n", + "
\n", + "
project:
\n", + "
BabMed
\n", + "
\n", + "\n", + "
\n", + "
writtenBy:
\n", + "
Text-Fabric
\n", + "
\n", + "\n", + "
\n", + "
\n", + "
\n", + "\n", + "
\n", + "
\n", + "excised\n", "
\n", "
int
\n", "
\n", @@ -672,7 +828,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -701,7 +857,7 @@ "\n", "
\n", "
\n", - "face\n", + "face\n", "
\n", "
str
\n", "
\n", @@ -715,7 +871,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -744,7 +900,7 @@ "\n", "
\n", "
\n", - "flags\n", + "flags\n", "
\n", "
str
\n", "
\n", @@ -758,7 +914,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -787,7 +943,7 @@ "\n", "
\n", "
\n", - "gloss\n", + "gloss\n", "
\n", "
int
\n", "
\n", @@ -801,7 +957,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -830,7 +986,7 @@ "\n", "
\n", "
\n", - "grapheme\n", + "grapheme\n", "
\n", "
str
\n", "
\n", @@ -844,7 +1000,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -873,7 +1029,7 @@ "\n", "
\n", "
\n", - "lang\n", + "lang\n", "
\n", "
str
\n", "
\n", @@ -887,7 +1043,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -916,7 +1072,7 @@ "\n", "
\n", "
\n", - "lemma\n", + "lemma\n", "
\n", "
str
\n", "
\n", @@ -930,7 +1086,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:40Z
\n", "
\n", "\n", "
\n", @@ -959,7 +1115,7 @@ "\n", "
\n", "
\n", - "lln\n", + "lln\n", "
\n", "
int
\n", "
\n", @@ -973,7 +1129,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1002,7 +1158,7 @@ "\n", "
\n", "
\n", - "ln\n", + "ln\n", "
\n", "
int
\n", "
\n", @@ -1016,7 +1172,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1045,7 +1201,7 @@ "\n", "
\n", "
\n", - "lnno\n", + "lnno\n", "
\n", "
str
\n", "
\n", @@ -1059,7 +1215,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1088,7 +1244,7 @@ "\n", "
\n", "
\n", - "missing\n", + "missing\n", "
\n", "
int
\n", "
\n", @@ -1102,7 +1258,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1131,7 +1287,7 @@ "\n", "
\n", "
\n", - "modifiers\n", + "modifiers\n", "
\n", "
str
\n", "
\n", @@ -1145,7 +1301,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1174,7 +1330,7 @@ "\n", "
\n", "
\n", - "museum\n", + "museum\n", "
\n", "
str
\n", "
\n", @@ -1188,7 +1344,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1217,7 +1373,7 @@ "\n", "
\n", "
\n", - "note\n", + "note\n", "
\n", "
str
\n", "
\n", @@ -1231,7 +1387,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1260,7 +1416,7 @@ "\n", "
\n", "
\n", - "number\n", + "number\n", "
\n", "
int
\n", "
\n", @@ -1274,7 +1430,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1303,7 +1459,7 @@ "\n", "
\n", "
\n", - "otype\n", + "otype\n", "
\n", "
str
\n", "
\n", @@ -1317,7 +1473,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1346,7 +1502,7 @@ "\n", "
\n", "
\n", - "pnumber\n", + "pnumber\n", "
\n", "
str
\n", "
\n", @@ -1360,7 +1516,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1389,7 +1545,7 @@ "\n", "
\n", "
\n", - "primecol\n", + "primecol\n", "
\n", "
int
\n", "
\n", @@ -1403,7 +1559,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1432,7 +1588,7 @@ "\n", "
\n", "
\n", - "primeln\n", + "primeln\n", "
\n", "
int
\n", "
\n", @@ -1446,7 +1602,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1475,7 +1631,7 @@ "\n", "
\n", "
\n", - "publication\n", + "publication\n", "
\n", "
str
\n", "
\n", @@ -1489,7 +1645,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1518,7 +1674,7 @@ "\n", "
\n", "
\n", - "question\n", + "question\n", "
\n", "
int
\n", "
\n", @@ -1532,7 +1688,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1561,7 +1717,7 @@ "\n", "
\n", "
\n", - "reading\n", + "reading\n", "
\n", "
str
\n", "
\n", @@ -1575,7 +1731,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1604,7 +1760,7 @@ "\n", "
\n", "
\n", - "remarkable\n", + "remarkable\n", "
\n", "
int
\n", "
\n", @@ -1618,7 +1774,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1647,7 +1803,7 @@ "\n", "
\n", "
\n", - "ruling\n", + "ruling\n", "
\n", "
str
\n", "
\n", @@ -1661,7 +1817,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1690,7 +1846,7 @@ "\n", "
\n", "
\n", - "seal\n", + "seal\n", "
\n", "
str
\n", "
\n", @@ -1704,7 +1860,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1733,7 +1889,7 @@ "\n", "
\n", "
\n", - "supplied\n", + "supplied\n", "
\n", "
int
\n", "
\n", @@ -1747,7 +1903,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1776,7 +1932,7 @@ "\n", "
\n", "
\n", - "sym\n", + "sym\n", "
\n", "
str
\n", "
\n", @@ -1790,7 +1946,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1819,7 +1975,7 @@ "\n", "
\n", "
\n", - "tr@ll\n", + "tr@ll\n", "
\n", "
str
\n", "
\n", @@ -1833,7 +1989,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1862,7 +2018,7 @@ "\n", "
\n", "
\n", - "trans\n", + "trans\n", "
\n", "
int
\n", "
\n", @@ -1876,7 +2032,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1905,7 +2061,7 @@ "\n", "
\n", "
\n", - "type\n", + "type\n", "
\n", "
str
\n", "
\n", @@ -1919,7 +2075,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1948,7 +2104,7 @@ "\n", "
\n", "
\n", - "uncertain\n", + "uncertain\n", "
\n", "
int
\n", "
\n", @@ -1962,7 +2118,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -1991,7 +2147,7 @@ "\n", "
\n", "
\n", - "variant\n", + "variant\n", "
\n", "
int
\n", "
\n", @@ -2005,7 +2161,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -2034,7 +2190,7 @@ "\n", "
\n", "
\n", - "oslots\n", + "oslots\n", "
\n", "
none
\n", "
\n", @@ -2048,7 +2204,7 @@ "\n", "
\n", "
dateWritten:
\n", - "
2022-02-06T13:00:37Z
\n", + "
2022-02-10T07:10:41Z
\n", "
\n", "\n", "
\n", @@ -2840,7 +2996,7 @@ "output_type": "stream", "text": [ " 0.00s Counting nodes ...\n", - " 0.02s 120237 nodes\n" + " 0.01s 93211 nodes\n" ] } ], @@ -2859,7 +3015,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Here you see it: over 120,000 nodes." + "Here you see it: nearly 100,000 nodes." ] }, { @@ -2914,7 +3070,7 @@ { "data": { "text/plain": [ - "79488" + "52829" ] }, "execution_count": 7, @@ -2939,7 +3095,7 @@ { "data": { "text/plain": [ - "120237" + "93211" ] }, "execution_count": 8, @@ -2989,12 +3145,12 @@ { "data": { "text/plain": [ - "(('document', 2337.8823529411766, 85884, 85917),\n", - " ('face', 1472.0, 85918, 85971),\n", - " ('line', 25.791044776119403, 85972, 89053),\n", - " ('cluster', 3.317591868647381, 79489, 85883),\n", - " ('word', 2.5467868137506415, 89054, 120237),\n", - " ('sign', 1, 1, 79488))" + "(('document', 1553.7941176470588, 59226, 59259),\n", + " ('face', 978.3148148148148, 59260, 59313),\n", + " ('line', 17.14114211550941, 59314, 62395),\n", + " ('cluster', 2.6222639149468416, 52830, 59225),\n", + " ('word', 1.712097611630322, 62396, 93211),\n", + " ('sign', 1, 1, 52829))" ] }, "execution_count": 10, @@ -3042,10 +3198,10 @@ " | 0.00s 34 documents\n", " | 0.00s 54 faces\n", " | 0.00s 3082 lines\n", - " | 0.00s 6395 clusters\n", - " | 0.00s 31184 words\n", - " | 0.01s 79488 signs\n", - " 0.02s Done\n" + " | 0.00s 6396 clusters\n", + " | 0.00s 30816 words\n", + " | 0.01s 52829 signs\n", + " 0.01s Done\n" ] } ], @@ -3163,7 +3319,8 @@ " ('uncertain', 67),\n", " ('gloss', 21),\n", " ('supplied', 16),\n", - " ('excised', 4))" + " ('excised', 4),\n", + " ('erasure', 1))" ] }, "execution_count": 13, @@ -3188,17 +3345,13 @@ { "data": { "text/plain": [ - "(('grapheme', 20433),\n", - " ('reading', 20357),\n", - " ('joiner', 18957),\n", - " ('mark', 12454),\n", - " ('unknown', 4720),\n", - " ('ellipsis', 1236),\n", - " ('numeral', 958),\n", - " ('lang', 186),\n", - " ('wdiv', 92),\n", - " ('empty', 69),\n", - " ('erasure', 26))" + "(('reading', 23570),\n", + " ('grapheme', 22092),\n", + " ('unknown', 4768),\n", + " ('ellipsis', 1266),\n", + " ('numeral', 962),\n", + " ('wdiv', 102),\n", + " ('empty', 69))" ] }, "execution_count": 14, @@ -3230,19 +3383,16 @@ { "data": { "text/plain": [ - "(('#', 6526),\n", - " ('?#', 378),\n", - " ('?', 267),\n", - " ('!', 38),\n", - " ('#?', 18),\n", - " ('!#', 4),\n", - " ('!?#', 3),\n", - " ('!?', 2),\n", - " ('##', 2),\n", - " ('#?#', 1),\n", + "(('#', 4305),\n", + " ('?', 501),\n", + " ('?#', 145),\n", + " ('!', 39),\n", + " ('#?', 20),\n", + " ('!#', 3),\n", + " ('!?', 3),\n", + " ('!?#', 2),\n", " ('*', 1),\n", - " ('?##', 1),\n", - " ('??#', 1))" + " ('??', 1))" ] }, "execution_count": 15, @@ -3370,7 +3520,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "85884\n" + "59226\n" ] } ], @@ -3400,11 +3550,11 @@ "name": "stdout", "output_type": "stream", "text": [ - "sign 3 is contained in document 85884\n", - "sign 3 is contained in face 85918\n", - "sign 3 is contained in line 85972\n", - "sign 3 is contained in cluster 79489\n", - "sign 3 is contained in word 89054\n" + "sign 3 is contained in document 59226\n", + "sign 3 is contained in face 59260\n", + "sign 3 is contained in line 59314\n", + "sign 3 is contained in cluster 52830\n", + "sign 3 is contained in word 62396\n" ] } ], @@ -3440,10 +3590,10 @@ "name": "stdout", "output_type": "stream", "text": [ - " 362: sign first slot=362 , last slot=362 \n", - " 85987: line first slot=362 , last slot=362 \n", - " 85919: face first slot=362 , last slot=612 \n", - " 85885: document first slot=362 , last slot=1002 \n" + " 267: sign first slot=267 , last slot=267 \n", + " 59329: line first slot=267 , last slot=267 \n", + " 59261: face first slot=267 , last slot=446 \n", + " 59227: document first slot=267 , last slot=715 \n" ] } ], @@ -3484,12 +3634,12 @@ "name": "stdout", "output_type": "stream", "text": [ - " 85884: document first slot=1 , last slot=361 \n", - " 85918: face first slot=1 , last slot=361 \n", - " 85986: line first slot=345 , last slot=361 \n", - " 79511: cluster first slot=357 , last slot=361 \n", - " 89258: word first slot=360 , last slot=361 \n", - " 361: sign first slot=361 , last slot=361 \n" + " 59226: document first slot=1 , last slot=266 \n", + " 59260: face first slot=1 , last slot=266 \n", + " 59328: line first slot=258 , last slot=266 \n", + " 52852: cluster first slot=264 , last slot=266 \n", + " 62600: word first slot=266 , last slot=266 \n", + " 266: sign first slot=266 , last slot=266 \n" ] } ], @@ -3565,34 +3715,29 @@ "name": "stdout", "output_type": "stream", "text": [ - "Node 89054\n", + "Node 62396\n", " | UP\n", - " | | 85972 line\n", - " | | 85918 face\n", - " | | 85884 document\n", + " | | 52830 cluster\n", + " | | 59314 line\n", + " | | 59260 face\n", + " | | 59226 document\n", " | DOWN\n", " | | 1 sign\n", " | | 2 sign\n", " | | 3 sign\n", - " | | 4 sign\n", - " | | 5 sign\n", - " | | 6 sign\n", - "Node 85972\n", + "Node 59314\n", " | UP\n", - " | | 85918 face\n", - " | | 85884 document\n", + " | | 52830 cluster\n", + " | | 59260 face\n", + " | | 59226 document\n", " | DOWN\n", - " | | 89054 word\n", + " | | 52830 cluster\n", + " | | 62396 word\n", " | | 1 sign\n", " | | 2 sign\n", - " | | 79489 cluster\n", " | | 3 sign\n", + " | | 62397 word\n", " | | 4 sign\n", - " | | 5 sign\n", - " | | 6 sign\n", - " | | 89055 word\n", - " | | 7 sign\n", - " | | 8 sign\n", "Done\n" ] } @@ -3694,22 +3839,20 @@ }, { "cell_type": "code", - "execution_count": 24, + "execution_count": 25, "metadata": {}, "outputs": [ { - "data": { - "text/plain": [ - "'DU₃.DU₃.BI ... 5 KA.'" - ] - }, - "execution_count": 24, - "metadata": {}, - "output_type": "execute_result" + "name": "stdout", + "output_type": "stream", + "text": [ + "DU₃.DU₃.BI ...\n", + "5 KA.INIM.MA x x x \n" + ] } ], "source": [ - "T.text([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], fmt=\"text-orig-plain\")" + "print(T.text([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], fmt=\"text-orig-plain\"))" ] }, { @@ -3730,70 +3873,114 @@ "\n", "In this way we can sensibly represent a lot of different nodes, such as documents, faces, lines, clusters, words and signs.\n", "\n", - "We compose a set of example nodes and run `T.text` on them:" + "We compose a set of example nodes and run `T.text` on them.\n", + "The example nodes are the second document and the first nodes of the different kinds that it contains." ] }, { "cell_type": "code", - "execution_count": 25, + "execution_count": 33, "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "[1, 89054, 79489, 85972, 85918, 85884]" + "[268, 62601, 52853, 59330, 59261, 59227]" ] }, - "execution_count": 25, + "execution_count": 33, "metadata": {}, "output_type": "execute_result" } ], "source": [ - "exampleNodes = [\n", - " F.otype.s(\"sign\")[0],\n", - " F.otype.s(\"word\")[0],\n", - " F.otype.s(\"cluster\")[0],\n", - " F.otype.s(\"line\")[0],\n", - " F.otype.s(\"face\")[0],\n", - " F.otype.s(\"document\")[0],\n", - "]\n", + "doc = F.otype.s(\"document\")[1]\n", + "face = L.d(doc, otype=\"face\")[0]\n", + "line = L.d(doc, otype=\"line\")[1]\n", + "cluster = L.d(doc, otype=\"cluster\")[0]\n", + "word = L.d(line, otype=\"word\")[0]\n", + "sign = L.d(line, otype=\"sign\")[0]\n", + "exampleNodes = [sign, word, cluster, line, face, doc]\n", "exampleNodes" ] }, { "cell_type": "code", - "execution_count": 26, + "execution_count": 40, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "This is sign 1:\n", - "DU₃#\n", + "P479250 obverse 1', sign node 268:\n", + "[x \n", + "\n", + "P479250 obverse 1', word node 62601:\n", + "[x \n", "\n", - "This is word 89054:\n", - "DU₃#[.DU₃.BI \n", + "P479250 obverse 1', cluster node 52853:\n", + "[x x x x x x x x x x x x a-na]-\n", "\n", - "This is cluster 79489:\n", - ".DU₃.BI ...] \n", + "P479250 obverse 1', line node 59330:\n", + "[x x x x x x x x x x x x a-na]-ku# u₂#-[ša₂-an-ni]\n", "\n", - "This is line 85972:\n", - "DU₃#[.DU₃.BI ...] \n", "\n", - "This is face 85918:\n", - "DU₃#[.DU₃.BI ...] 5 KA#.INIM.MA [x x x x] EN₂ su.ub hur.ri.im# su#.[ub ...] ša₂ sa.ku.tu₂ hi.si a.pi.il.lat aš kur#[.ba.an.ni ...] KA.INIM.MA GIG.GIR ZI-hi DU₃.DU₃.BI SIG₂# SA₅# [...] EN₂ ma-mit GIM šar-ra- ina KA₂ pil-ši un gi ha ba# [x x x x x x x x x x x x] DU₃.DU₃.BI ina ŠIM IGI GIG ta-kar hu-bu₄-uš SUN₂ [x x x x x x x x x x x x x x x x x] IGI GIG MAR šimŠEŠ ina IZI tur-ar₂ IGI GIG [x x x x x x x x x x x x x x] IGI GIG MAR TI GUD ID₂ ina IZI tur-ar₂ IGI GIG# [x x x x x x x x x] SUN₂ lu₂KURUN₂.NA IGI GIG ta-kar [x x x x x x x x x x x] 2 KA.INIM.MA [x x x x x x] DIŠ# NA SAG.DU-su gur-ru-ud sah-le₂-e si-ki-[tu₂ x x x x x x x x x x x x x x x x x x] ina# A NAGA SAG.DU-su LUH-si I₃.GIŠ EŠ.MEŠ# [x x x x x x x x x x x x x x x x x x x x x] [DIŠ KI ] MIN# SAG.DU-su tu-gal-lab# [...] [u₂]HAB# SUD₂# [MAR u₂]ZA#.[BA.LAM ...] \n", + "P479250 obverse, face node 59261:\n", + "[x x x x x x x x x x x x a-na]-ku# u₂#-[ša₂-an-ni]\n", + "[x x x x x x x] TI-e#\n", + "[... LI.DUR] ŠID-nu\n", + "%sux [x x x x {gi}pisan]-gen₇ keš₂-da\n", + "%sux [x x x x x x x x x x x a-ge₆]-a nu-tuku\n", + "%sux [x x x x x x x x x x x x nu]-ku₄-ku₄\n", + "%sux [... nig₂ ge₂₆]-e :gen-na dumu-gu₁₀\n", + "%sux [x x x x x x x x x x x] šu u-me-ti\n", + "%sux [x x x x x x x x x x x x x x x x ka]-bi-ta u-me-ni-gar\n", + "%sux [x x x x x x x x x x x x x he₂]-en-si-il-e\n", + "%sux [x x x x x x x he₂-em-ma-ra]-e₃\n", + "[x x x x x x x x x x x x x x x x x x x ina KAŠ] NAG-ma ina-eš\n", + "[... ŠA₃?] GIG\n", + "\n", + "\n", + "P479250, document node 59227:\n", + "[x x x x x x x x x x x x a-na]-ku# u₂#-[ša₂-an-ni]\n", + "[x x x x x x x] TI-e#\n", + "[... LI.DUR] ŠID-nu\n", + "%sux [x x x x {gi}pisan]-gen₇ keš₂-da\n", + "%sux [x x x x x x x x x x x a-ge₆]-a nu-tuku\n", + "%sux [x x x x x x x x x x x x nu]-ku₄-ku₄\n", + "%sux [... nig₂ ge₂₆]-e :gen-na dumu-gu₁₀\n", + "%sux [x x x x x x x x x x x] šu u-me-ti\n", + "%sux [x x x x x x x x x x x x x x x x ka]-bi-ta u-me-ni-gar\n", + "%sux [x x x x x x x x x x x x x he₂]-en-si-il-e\n", + "%sux [x x x x x x x he₂-em-ma-ra]-e₃\n", + "[x x x x x x x x x x x x x x x x x x x ina KAŠ] NAG-ma ina-eš\n", + "[... ŠA₃?] GIG\n", + "%sux [...] ka#-keš₂#-bi# he₂-du₈-a\n", + "%sux [...] ka-keš₂-bi he₂-du₈-a\n", + "[x x x x x x x x x x x x ina KA-šu₂] u₂-man-zaq-ma ina-eš\n", + "[... SIG₃].SIG₃-ta ma-la-a rit-ta-šu₂\n", + "[... a]-ha-tu mu-še-qa-at re-ši-šu₂\n", + "[... na-ši] pat-ri TU₆ EN₂\n", + "[x x x x x x x x x x x ana UGU] EN₂ ŠUB-di ina KA-šu₂ u₂-man-zaq-ma ina-eš\n", + "[x x x x x x x x x x x x as-suh]-šu₂-ma iṣ-ṣa-bat ŠA₃-bi\n", + "[x x x x x x x x x x x x x x x x x x KI] DU₁₁.GA-ma iṣ-ṣa-bat ŠA₃-bi AN u KI\n", + "[x x x x x x x x x x x x x x x x a-na u₂-ma]-mi# DU₁₁.GA-ma iṣ-ṣa-bat ŠA₃-bi u₂-ma-me\n", + "[x x x x x x x x x x x x x ŠA₃]-bi {d}UTU lip-pa-šir\n", + "[x x x x x x x ŠA₃]-bi# u₂-ma-me lip-pa-šir\n", + "[x x x x x x x x x x x x šam-ma]-ka NAG-šu₂ lib-luṭ\n", + "[...] U₂# KI KI MIN KI MIN\n", + "[...] ŠA₃#-bu i-re-du-šu\n", + "[... ap-pi?] šil-ta-hi ša₂ 7 KA.KEŠDA-MEŠ-šu₂ 7-šu₂ u 7-šu₂\n", + "[... SAHAR?] TA# {urudu#}na#-ah#-bi?# [ana? {urudu]}na#-ah#-bi?#\n", "\n", - "This is document 85884:\n", - "DU₃#[.DU₃.BI ...] 5 KA#.INIM.MA [x x x x] EN₂ su.ub hur.ri.im# su#.[ub ...] ša₂ sa.ku.tu₂ hi.si a.pi.il.lat aš kur#[.ba.an.ni ...] KA.INIM.MA GIG.GIR ZI-hi DU₃.DU₃.BI SIG₂# SA₅# [...] EN₂ ma-mit GIM šar-ra- ina KA₂ pil-ši un gi ha ba# [x x x x x x x x x x x x] DU₃.DU₃.BI ina ŠIM IGI GIG ta-kar hu-bu₄-uš SUN₂ [x x x x x x x x x x x x x x x x x] IGI GIG MAR šimŠEŠ ina IZI tur-ar₂ IGI GIG [x x x x x x x x x x x x x x] IGI GIG MAR TI GUD ID₂ ina IZI tur-ar₂ IGI GIG# [x x x x x x x x x] SUN₂ lu₂KURUN₂.NA IGI GIG ta-kar [x x x x x x x x x x x] 2 KA.INIM.MA [x x x x x x] DIŠ# NA SAG.DU-su gur-ru-ud sah-le₂-e si-ki-[tu₂ x x x x x x x x x x x x x x x x x x] ina# A NAGA SAG.DU-su LUH-si I₃.GIŠ EŠ.MEŠ# [x x x x x x x x x x x x x x x x x x x x x] [DIŠ KI ] MIN# SAG.DU-su tu-gal-lab# [...] [u₂]HAB# SUD₂# [MAR u₂]ZA#.[BA.LAM ...] \n", "\n" ] } ], "source": [ "for n in exampleNodes:\n", - " print(f\"This is {F.otype.v(n)} {n}:\")\n", + " print(\" \".join(T.sectionFromNode(n)) + f\", {F.otype.v(n)} node {n}:\")\n", " print(T.text(n))\n", " print(\"\")" ] @@ -3812,7 +3999,7 @@ }, { "cell_type": "code", - "execution_count": 27, + "execution_count": 43, "metadata": { "ExecuteTime": { "end_time": "2018-05-18T09:19:10.077589Z", @@ -3824,17 +4011,21 @@ "name": "stdout", "output_type": "stream", "text": [ - "text-orig-full:\n", - "\tDU₃#[.DU₃.BI ...] 5 KA#.\n", - "text-orig-plain:\n", - "\tDU₃.DU₃.BI ... 5 KA.\n" + "\ttext-orig-full:\n", + "[DU₃.DU₃.BI ...]\n", + "5 KA#.INIM.MA [x x x \n", + "\n", + "\ttext-orig-plain:\n", + "DU₃.DU₃.BI ...\n", + "5 KA.INIM.MA x x x \n", + "\n" ] } ], "source": [ "for fmt in sorted(T.formats):\n", " if fmt.startswith(\"text-\"):\n", - " print(\"{}:\\n\\t{}\".format(fmt, T.text(range(1, 12), fmt=fmt)))" + " print(\"\\t{}:\\n{}\\n\".format(fmt, T.text(range(1, 12), fmt=fmt)))" ] }, { @@ -3846,7 +4037,7 @@ }, { "cell_type": "code", - "execution_count": 28, + "execution_count": 45, "metadata": { "ExecuteTime": { "end_time": "2018-05-18T09:19:13.490426Z", @@ -3855,59 +4046,53 @@ }, "outputs": [ { - "data": { - "text/plain": [ - "'DU₃#[.DU₃.BI ...] 5 KA#.'" - ] - }, - "execution_count": 28, - "metadata": {}, - "output_type": "execute_result" + "name": "stdout", + "output_type": "stream", + "text": [ + "[DU₃.DU₃.BI ...]\n", + "5 KA#.INIM.MA [x x x \n" + ] } ], "source": [ - "T.text(range(1, 12))" + "print(T.text(range(1, 12)))" ] }, { "cell_type": "code", - "execution_count": 29, + "execution_count": 47, "metadata": {}, "outputs": [ { - "data": { - "text/plain": [ - "'DU₃#[.DU₃.BI ...] '" - ] - }, - "execution_count": 29, - "metadata": {}, - "output_type": "execute_result" + "name": "stdout", + "output_type": "stream", + "text": [ + "[DU₃.DU₃.BI ...]\n", + "\n" + ] } ], "source": [ "firstLine = F.otype.s(\"line\")[0]\n", - "T.text(firstLine)" + "print(T.text(firstLine))" ] }, { "cell_type": "code", - "execution_count": 30, + "execution_count": 48, "metadata": {}, "outputs": [ { - "data": { - "text/plain": [ - "'DU₃.DU₃.BI ... '" - ] - }, - "execution_count": 30, - "metadata": {}, - "output_type": "execute_result" + "name": "stdout", + "output_type": "stream", + "text": [ + "DU₃.DU₃.BI ...\n", + "\n" + ] } ], "source": [ - "T.text(firstLine, fmt=\"text-orig-plain\")" + "print(T.text(firstLine, fmt=\"text-orig-plain\"))" ] }, { @@ -3930,7 +4115,7 @@ }, { "cell_type": "code", - "execution_count": 31, + "execution_count": 52, "metadata": { "ExecuteTime": { "end_time": "2018-05-18T09:19:27.839331Z", @@ -3943,20 +4128,22 @@ "output_type": "stream", "text": [ " 0.00s writing plain text of all letters in all text formats\n", - " 0.21s done 2 formats\n", + " 0.18s done 2 formats\n", "text-orig-full\n", - "DU₃#[.DU₃.BI ...] \n", - "5 KA#.INIM.MA [x x x x] \n", - "EN₂ su.ub hur.ri.im# su#.[ub ...] \n", - "ša₂ sa.ku.tu₂ hi.si a.pi.il.lat aš kur#[.ba.an.ni ...] \n", - "KA.INIM.MA GIG.GIR ZI-hi DU₃.DU₃.BI SIG₂# SA₅# [...] \n", + "1'. [DU₃.DU₃.BI ...]\n", + "2'. 5 KA#.INIM.MA [x x x x]\n", + "3'. EN₂ su.ub hur.ri.im# su#.[ub ...]\n", + "4'. ša₂ sa.ku.tu₂ hi.si a.pi.il.lat aš [kur.ba.an.ni ...]\n", + "5'. KA.INIM.MA GIG.GIR ZI-hi DU₃.DU₃.BI SIG₂# SA₅# [...]\n", + "\n", "\n", "text-orig-plain\n", - "DU₃.DU₃.BI ... \n", - "5 KA.INIM.MA x x x x \n", - "EN₂ su.ub hur.ri.im su.ub ... \n", - "ša sa.ku.tu hi.si a.pi.il.lat aš kur.ba.an.ni ... \n", - "KA.INIM.MA GIG.GIR ZI-hi DU₃.DU₃.BI SIG₂ SA₅ ... \n", + "1'. DU₃.DU₃.BI ...\n", + "2'. 5 KA.INIM.MA x x x x\n", + "3'. EN₂ su.ub hur.ri.im su.ub ...\n", + "4'. ša₂ sa.ku.tu₂ hi.si a.pi.il.lat aš kur.ba.an.ni ...\n", + "5'. KA.INIM.MA GIG.GIR ZI-hi DU₃.DU₃.BI SIG₂ SA₅ ...\n", + "\n", "\n" ] } @@ -3970,12 +4157,12 @@ "for ln in F.otype.s(\"line\"):\n", " for fmt in sorted(T.formats):\n", " if fmt.startswith(\"text-\"):\n", - " text[fmt].append(T.text(ln, fmt=fmt, descend=True))\n", + " text[fmt].append(F.lnno.v(ln) + \". \" + T.text(ln, fmt=fmt, descend=True))\n", "\n", "A.info(\"done {} formats\".format(len(text)))\n", "\n", "for fmt in sorted(text):\n", - " print(\"{}\\n{}\\n\".format(fmt, \"\\n\".join(text[fmt][0:5])))" + " print(\"{}\\n{}\\n\".format(fmt, \"\".join(text[fmt][0:5])))" ] }, { @@ -3988,7 +4175,7 @@ }, { "cell_type": "code", - "execution_count": 32, + "execution_count": 54, "metadata": { "ExecuteTime": { "end_time": "2018-05-18T09:19:34.250294Z", @@ -4000,7 +4187,7 @@ "for fmt in T.formats:\n", " if fmt.startswith(\"text-\"):\n", " with open(os.path.expanduser(f\"~/Downloads/NinMed-{A.version}-{fmt}.txt\"), \"w\") as f:\n", - " f.write(\"\\n\".join(text[fmt]))" + " f.write(\"\".join(text[fmt]))" ] }, { @@ -4035,7 +4222,7 @@ }, { "cell_type": "code", - "execution_count": 33, + "execution_count": 55, "metadata": {}, "outputs": [], "source": [ @@ -4051,7 +4238,7 @@ }, { "cell_type": "code", - "execution_count": 34, + "execution_count": 56, "metadata": { "ExecuteTime": { "end_time": "2018-05-18T09:19:43.056511Z", @@ -4063,12 +4250,12 @@ "name": "stdout", "output_type": "stream", "text": [ - " 10001 sign - P393782 obverse:2:30 P393782 obverse:2:30 ((85894, 85931, 86393), (85894, 85931, 86393))\n", - " 90054 word - P399223 obverse:2:1 P399223 obverse:2:1 ((85887, 85923, 86057), (85887, 85923, 86057))\n", - " 79989 cluster - P394104 obverse:2:67 P394104 obverse:2:67 ((85893, 85929, 86220), (85893, 85929, 86220))\n", - " 87472 line - P394454 obverse:6' P394454 obverse:6' ((85901, 85944, 87472), (85901, 85944, 87472))\n", - " 85928 face - P403381 obverse P403381 obverse:1':6' ((85892, 85928), (85892, 85928, 86100))\n", - " 85889 document - P400909 P400909 obverse:9' ((85889,), (85889, 85925, 86080))\n" + " 10001 sign - P365742 obverse:1:18 P365742 obverse:1:18 ((59238, 59276, 59922), (59238, 59276, 59922))\n", + " 63396 word - P399223 obverse:2:1 P399223 obverse:2:1 ((59229, 59265, 59399), (59229, 59265, 59399))\n", + " 53330 cluster - P394104 obverse:2:67 P394104 obverse:2:67 ((59235, 59271, 59562), (59235, 59271, 59562))\n", + " 60814 line - P394454 obverse:6' P394454 obverse:6' ((59243, 59286, 60814), (59243, 59286, 60814))\n", + " 59270 face - P403381 obverse P403381 obverse:1':6' ((59234, 59270), (59234, 59270, 59442))\n", + " 59231 document - P400909 P400909 obverse:9' ((59231,), (59231, 59267, 59422))\n" ] } ],