Fossil SCM
Add "crnl-glob" (as demonstration for this feature). Also remove some unnecessary spacing.
Commit
7cd98039c4c9061e2e5f97969464f9cd187d8d47
Parent
6ef3a2a42ce6c78…
8 files changed
+1
+1
-1
+3
-3
+74
-74
+1
-2
+39
-39
+104
-104
+1
-1
| --- a/.fossil-settings/crnl-glob | ||
| +++ b/.fossil-settings/crnl-glob | ||
| @@ -0,0 +1 @@ | ||
| 1 | +win/buildmsvc.bat |
| --- a/.fossil-settings/crnl-glob | |
| +++ b/.fossil-settings/crnl-glob | |
| @@ -0,0 +1 @@ | |
| --- a/.fossil-settings/crnl-glob | |
| +++ b/.fossil-settings/crnl-glob | |
| @@ -0,0 +1 @@ | |
| 1 | win/buildmsvc.bat |
+1
-1
| --- art/CollRev3.dia | ||
| +++ art/CollRev3.dia | ||
| @@ -784,11 +784,11 @@ | ||
| 784 | 784 | <dia:rectangle val="6,14.4575;9.245,16.1975"/> |
| 785 | 785 | </dia:attribute> |
| 786 | 786 | <dia:attribute name="text"> |
| 787 | 787 | <dia:composite type="text"> |
| 788 | 788 | <dia:attribute name="string"> |
| 789 | - <dia:string># | |
| 789 | + <dia:string># | |
| 790 | 790 | belongs to#</dia:string> |
| 791 | 791 | </dia:attribute> |
| 792 | 792 | <dia:attribute name="font"> |
| 793 | 793 | <dia:font family="sans" style="0" name="Helvetica"/> |
| 794 | 794 | </dia:attribute> |
| 795 | 795 |
| --- art/CollRev3.dia | |
| +++ art/CollRev3.dia | |
| @@ -784,11 +784,11 @@ | |
| 784 | <dia:rectangle val="6,14.4575;9.245,16.1975"/> |
| 785 | </dia:attribute> |
| 786 | <dia:attribute name="text"> |
| 787 | <dia:composite type="text"> |
| 788 | <dia:attribute name="string"> |
| 789 | <dia:string># |
| 790 | belongs to#</dia:string> |
| 791 | </dia:attribute> |
| 792 | <dia:attribute name="font"> |
| 793 | <dia:font family="sans" style="0" name="Helvetica"/> |
| 794 | </dia:attribute> |
| 795 |
| --- art/CollRev3.dia | |
| +++ art/CollRev3.dia | |
| @@ -784,11 +784,11 @@ | |
| 784 | <dia:rectangle val="6,14.4575;9.245,16.1975"/> |
| 785 | </dia:attribute> |
| 786 | <dia:attribute name="text"> |
| 787 | <dia:composite type="text"> |
| 788 | <dia:attribute name="string"> |
| 789 | <dia:string># |
| 790 | belongs to#</dia:string> |
| 791 | </dia:attribute> |
| 792 | <dia:attribute name="font"> |
| 793 | <dia:font family="sans" style="0" name="Helvetica"/> |
| 794 | </dia:attribute> |
| 795 |
+3
-3
| --- art/CollRev4.dia | ||
| +++ art/CollRev4.dia | ||
| @@ -474,11 +474,11 @@ | ||
| 474 | 474 | <dia:rectangle val="6,2.4575;7.385,4.1975"/> |
| 475 | 475 | </dia:attribute> |
| 476 | 476 | <dia:attribute name="text"> |
| 477 | 477 | <dia:composite type="text"> |
| 478 | 478 | <dia:attribute name="string"> |
| 479 | - <dia:string># | |
| 479 | + <dia:string># | |
| 480 | 480 | child#</dia:string> |
| 481 | 481 | </dia:attribute> |
| 482 | 482 | <dia:attribute name="font"> |
| 483 | 483 | <dia:font family="sans" style="0" name="Helvetica"/> |
| 484 | 484 | </dia:attribute> |
| @@ -508,11 +508,11 @@ | ||
| 508 | 508 | <dia:rectangle val="4,9.4575;5.385,11.1975"/> |
| 509 | 509 | </dia:attribute> |
| 510 | 510 | <dia:attribute name="text"> |
| 511 | 511 | <dia:composite type="text"> |
| 512 | 512 | <dia:attribute name="string"> |
| 513 | - <dia:string># | |
| 513 | + <dia:string># | |
| 514 | 514 | child#</dia:string> |
| 515 | 515 | </dia:attribute> |
| 516 | 516 | <dia:attribute name="font"> |
| 517 | 517 | <dia:font family="sans" style="0" name="Helvetica"/> |
| 518 | 518 | </dia:attribute> |
| @@ -609,11 +609,11 @@ | ||
| 609 | 609 | <dia:rectangle val="8,6.4575;10.2797,8.1975"/> |
| 610 | 610 | </dia:attribute> |
| 611 | 611 | <dia:attribute name="text"> |
| 612 | 612 | <dia:composite type="text"> |
| 613 | 613 | <dia:attribute name="string"> |
| 614 | - <dia:string># | |
| 614 | + <dia:string># | |
| 615 | 615 | parent#</dia:string> |
| 616 | 616 | </dia:attribute> |
| 617 | 617 | <dia:attribute name="font"> |
| 618 | 618 | <dia:font family="sans" style="0" name="Helvetica"/> |
| 619 | 619 | </dia:attribute> |
| 620 | 620 |
| --- art/CollRev4.dia | |
| +++ art/CollRev4.dia | |
| @@ -474,11 +474,11 @@ | |
| 474 | <dia:rectangle val="6,2.4575;7.385,4.1975"/> |
| 475 | </dia:attribute> |
| 476 | <dia:attribute name="text"> |
| 477 | <dia:composite type="text"> |
| 478 | <dia:attribute name="string"> |
| 479 | <dia:string># |
| 480 | child#</dia:string> |
| 481 | </dia:attribute> |
| 482 | <dia:attribute name="font"> |
| 483 | <dia:font family="sans" style="0" name="Helvetica"/> |
| 484 | </dia:attribute> |
| @@ -508,11 +508,11 @@ | |
| 508 | <dia:rectangle val="4,9.4575;5.385,11.1975"/> |
| 509 | </dia:attribute> |
| 510 | <dia:attribute name="text"> |
| 511 | <dia:composite type="text"> |
| 512 | <dia:attribute name="string"> |
| 513 | <dia:string># |
| 514 | child#</dia:string> |
| 515 | </dia:attribute> |
| 516 | <dia:attribute name="font"> |
| 517 | <dia:font family="sans" style="0" name="Helvetica"/> |
| 518 | </dia:attribute> |
| @@ -609,11 +609,11 @@ | |
| 609 | <dia:rectangle val="8,6.4575;10.2797,8.1975"/> |
| 610 | </dia:attribute> |
| 611 | <dia:attribute name="text"> |
| 612 | <dia:composite type="text"> |
| 613 | <dia:attribute name="string"> |
| 614 | <dia:string># |
| 615 | parent#</dia:string> |
| 616 | </dia:attribute> |
| 617 | <dia:attribute name="font"> |
| 618 | <dia:font family="sans" style="0" name="Helvetica"/> |
| 619 | </dia:attribute> |
| 620 |
| --- art/CollRev4.dia | |
| +++ art/CollRev4.dia | |
| @@ -474,11 +474,11 @@ | |
| 474 | <dia:rectangle val="6,2.4575;7.385,4.1975"/> |
| 475 | </dia:attribute> |
| 476 | <dia:attribute name="text"> |
| 477 | <dia:composite type="text"> |
| 478 | <dia:attribute name="string"> |
| 479 | <dia:string># |
| 480 | child#</dia:string> |
| 481 | </dia:attribute> |
| 482 | <dia:attribute name="font"> |
| 483 | <dia:font family="sans" style="0" name="Helvetica"/> |
| 484 | </dia:attribute> |
| @@ -508,11 +508,11 @@ | |
| 508 | <dia:rectangle val="4,9.4575;5.385,11.1975"/> |
| 509 | </dia:attribute> |
| 510 | <dia:attribute name="text"> |
| 511 | <dia:composite type="text"> |
| 512 | <dia:attribute name="string"> |
| 513 | <dia:string># |
| 514 | child#</dia:string> |
| 515 | </dia:attribute> |
| 516 | <dia:attribute name="font"> |
| 517 | <dia:font family="sans" style="0" name="Helvetica"/> |
| 518 | </dia:attribute> |
| @@ -609,11 +609,11 @@ | |
| 609 | <dia:rectangle val="8,6.4575;10.2797,8.1975"/> |
| 610 | </dia:attribute> |
| 611 | <dia:attribute name="text"> |
| 612 | <dia:composite type="text"> |
| 613 | <dia:attribute name="string"> |
| 614 | <dia:string># |
| 615 | parent#</dia:string> |
| 616 | </dia:attribute> |
| 617 | <dia:attribute name="font"> |
| 618 | <dia:font family="sans" style="0" name="Helvetica"/> |
| 619 | </dia:attribute> |
| 620 |
+74
-74
| --- src/cson_amalgamation.h | ||
| +++ src/cson_amalgamation.h | ||
| @@ -59,11 +59,11 @@ | ||
| 59 | 59 | #define CSON_INT_T_PFMT "I64d" |
| 60 | 60 | #elif (__STDC_VERSION__ >= 199901L) || (HAVE_LONG_LONG == 1) |
| 61 | 61 | typedef long long cson_int_t; |
| 62 | 62 | #define CSON_INT_T_SFMT "lld" |
| 63 | 63 | #define CSON_INT_T_PFMT "lld" |
| 64 | -#else | |
| 64 | +#else | |
| 65 | 65 | typedef long cson_int_t; |
| 66 | 66 | #define CSON_INT_T_SFMT "ld" |
| 67 | 67 | #define CSON_INT_T_PFMT "ld" |
| 68 | 68 | #endif |
| 69 | 69 | |
| @@ -215,11 +215,11 @@ | ||
| 215 | 215 | Convenience typedef. |
| 216 | 216 | */ |
| 217 | 217 | typedef struct cson_value cson_value; |
| 218 | 218 | |
| 219 | 219 | /** @struct cson_value |
| 220 | - | |
| 220 | + | |
| 221 | 221 | The core value type of this API. It is opaque to clients, and |
| 222 | 222 | only the cson public API should be used for setting or |
| 223 | 223 | inspecting their values. |
| 224 | 224 | |
| 225 | 225 | This class is opaque because stack-based usage can easily cause |
| @@ -231,11 +231,11 @@ | ||
| 231 | 231 | counting) as long as those insertions do not cause cycles. However, |
| 232 | 232 | be very aware that such value re-use uses a reference to the |
| 233 | 233 | original copy, meaning that if its value is changed once, it is |
| 234 | 234 | changed everywhere. Also beware that multi-threaded write |
| 235 | 235 | operations on such references leads to undefined behaviour. |
| 236 | - | |
| 236 | + | |
| 237 | 237 | PLEASE read the ACHTUNGEN below... |
| 238 | 238 | |
| 239 | 239 | ACHTUNG #1: |
| 240 | 240 | |
| 241 | 241 | cson_values MUST NOT form cycles (e.g. via object or array |
| @@ -244,33 +244,33 @@ | ||
| 244 | 244 | Not abiding th Holy Law Of No Cycles will lead to double-frees and |
| 245 | 245 | the like (i.e. undefined behaviour, likely crashes due to infinite |
| 246 | 246 | recursion or stepping on invalid (freed) pointers). |
| 247 | 247 | |
| 248 | 248 | ACHTUNG #2: |
| 249 | - | |
| 249 | + | |
| 250 | 250 | ALL cson_values returned as non-const cson_value pointers from any |
| 251 | 251 | public functions in the cson API are to be treated as if they are |
| 252 | 252 | heap-allocated, and MUST be freed by client by doing ONE of: |
| 253 | - | |
| 253 | + | |
| 254 | 254 | - Passing it to cson_value_free(). |
| 255 | - | |
| 255 | + | |
| 256 | 256 | - Adding it to an Object or Array, in which case the object/array |
| 257 | 257 | takes over ownership. As of 20110323, a value may be inserted into |
| 258 | 258 | a single container multiple times, or into multiple containers, |
| 259 | 259 | in which case they all share ownership (via reference counting) |
| 260 | 260 | of the original value (meaning any changes to it are visible in |
| 261 | 261 | all references to it). |
| 262 | - | |
| 262 | + | |
| 263 | 263 | Each call to cson_value_new_xxx() MUST eventually be followed up |
| 264 | 264 | by one of those options. |
| 265 | - | |
| 265 | + | |
| 266 | 266 | Some cson_value_new_XXX() implementations do not actually allocate |
| 267 | 267 | memory, but this is an internal implementation detail. Client code |
| 268 | 268 | MUST NOT rely on this behaviour and MUST treat each object |
| 269 | 269 | returned by such a function as if it was a freshly-allocated copy |
| 270 | 270 | (even if their pointer addresses are the same). |
| 271 | - | |
| 271 | + | |
| 272 | 272 | ACHTUNG #3: |
| 273 | 273 | |
| 274 | 274 | Note that ACHTUNG #2 tells us that we must always free (or transfer |
| 275 | 275 | ownership of) all pointers returned bycson_value_new_xxx(), but |
| 276 | 276 | that two calls to (e.g.) cson_value_new_bool(1) will (or might) |
| @@ -315,11 +315,11 @@ | ||
| 315 | 315 | if( 0 == rc ) {...success...} |
| 316 | 316 | else if( cson_rc.ArgError == rc ) { ... some argument was wrong ... } |
| 317 | 317 | else if( cson_rc.AllocError == rc ) { ... allocation error ... } |
| 318 | 318 | ... |
| 319 | 319 | @endcode |
| 320 | - | |
| 320 | + | |
| 321 | 321 | The entries named Parse_XXX are generally only returned by |
| 322 | 322 | cson_parse() and friends. |
| 323 | 323 | */ |
| 324 | 324 | |
| 325 | 325 | /** @struct cson_rc_ |
| @@ -472,11 +472,11 @@ | ||
| 472 | 472 | |
| 473 | 473 | /** |
| 474 | 474 | Length, in bytes. |
| 475 | 475 | */ |
| 476 | 476 | unsigned int length; |
| 477 | - | |
| 477 | + | |
| 478 | 478 | /** |
| 479 | 479 | Error code of the parse run (0 for no error). |
| 480 | 480 | */ |
| 481 | 481 | int errorCode; |
| 482 | 482 | |
| @@ -523,11 +523,11 @@ | ||
| 523 | 523 | /** |
| 524 | 524 | Specifies how to indent (or not) output. The values |
| 525 | 525 | are: |
| 526 | 526 | |
| 527 | 527 | (0) == no extra indentation. |
| 528 | - | |
| 528 | + | |
| 529 | 529 | (1) == 1 TAB character for each level. |
| 530 | 530 | |
| 531 | 531 | (>1) == that number of SPACES for each level. |
| 532 | 532 | */ |
| 533 | 533 | unsigned char indentation; |
| @@ -536,11 +536,11 @@ | ||
| 536 | 536 | Maximum object/array depth to traverse. Traversing deeply can |
| 537 | 537 | be indicative of cycles in the object/array tree, and this |
| 538 | 538 | value is used to figure out when to abort the traversal. |
| 539 | 539 | */ |
| 540 | 540 | unsigned short maxDepth; |
| 541 | - | |
| 541 | + | |
| 542 | 542 | /** |
| 543 | 543 | If true, a newline will be added to generated output, |
| 544 | 544 | else not. |
| 545 | 545 | */ |
| 546 | 546 | char addNewline; |
| @@ -636,11 +636,11 @@ | ||
| 636 | 636 | |
| 637 | 637 | Must return 0 on success, non-0 on error (preferably a value from |
| 638 | 638 | cson_rc). |
| 639 | 639 | |
| 640 | 640 | These functions are called relatively often during the JSON-output |
| 641 | - process, and should try to be fast. | |
| 641 | + process, and should try to be fast. | |
| 642 | 642 | */ |
| 643 | 643 | typedef int (*cson_data_dest_f)( void * state, void const * src, unsigned int n ); |
| 644 | 644 | |
| 645 | 645 | /** |
| 646 | 646 | Reads JSON-formatted string data (in ASCII, UTF8, or UTF16), using the |
| @@ -664,15 +664,15 @@ | ||
| 664 | 664 | used. |
| 665 | 665 | |
| 666 | 666 | The info argument may be NULL. If it is not NULL then the parser |
| 667 | 667 | populates it with information which is useful in error |
| 668 | 668 | reporting. Namely, it contains the line/column of parse errors. |
| 669 | - | |
| 669 | + | |
| 670 | 670 | The srcState argument is ignored by this function but is passed on to src, |
| 671 | 671 | so any output-destination-specific state can be stored there and accessed |
| 672 | 672 | via the src callback. |
| 673 | - | |
| 673 | + | |
| 674 | 674 | Non-parse error conditions include: |
| 675 | 675 | |
| 676 | 676 | - (!tgt) or !src: cson_rc.ArgError |
| 677 | 677 | - cson_rc.AllocError can happen at any time during the input phase |
| 678 | 678 | |
| @@ -725,11 +725,11 @@ | ||
| 725 | 725 | TODOs: |
| 726 | 726 | |
| 727 | 727 | - Buffer the input in larger chunks. We currently read |
| 728 | 728 | byte-by-byte, but i'm too tired to write/test the looping code for |
| 729 | 729 | the buffering. |
| 730 | - | |
| 730 | + | |
| 731 | 731 | @see cson_parse_FILE() |
| 732 | 732 | @see cson_parse_string() |
| 733 | 733 | */ |
| 734 | 734 | int cson_parse( cson_value ** tgt, cson_data_source_f src, void * srcState, |
| 735 | 735 | cson_parse_opt const * opt, cson_parse_info * info ); |
| @@ -786,11 +786,11 @@ | ||
| 786 | 786 | The destState parameter is ignored by this function and is passed |
| 787 | 787 | on to the dest function. |
| 788 | 788 | |
| 789 | 789 | Returns 0 on success. On error, any amount of output might have been |
| 790 | 790 | generated before the error was triggered. |
| 791 | - | |
| 791 | + | |
| 792 | 792 | Example: |
| 793 | 793 | |
| 794 | 794 | @code |
| 795 | 795 | int rc = cson_output( myValue, cson_data_dest_FILE, stdout, NULL ); |
| 796 | 796 | // basically equivalent to: cson_output_FILE( myValue, stdout, NULL ); |
| @@ -925,15 +925,15 @@ | ||
| 925 | 925 | /** |
| 926 | 926 | Converts the given value to a boolean, using JavaScript semantics depending |
| 927 | 927 | on the concrete type of val: |
| 928 | 928 | |
| 929 | 929 | undef or null: false |
| 930 | - | |
| 930 | + | |
| 931 | 931 | boolean: same |
| 932 | - | |
| 932 | + | |
| 933 | 933 | integer, double: 0 or 0.0 == false, else true |
| 934 | - | |
| 934 | + | |
| 935 | 935 | object, array: true |
| 936 | 936 | |
| 937 | 937 | string: length-0 string is false, else true. |
| 938 | 938 | |
| 939 | 939 | Returns 0 on success and assigns *v (if v is not NULL) to either 0 or 1. |
| @@ -945,18 +945,18 @@ | ||
| 945 | 945 | Similar to cson_value_fetch_bool(), but fetches an integer value. |
| 946 | 946 | |
| 947 | 947 | The conversion, if any, depends on the concrete type of val: |
| 948 | 948 | |
| 949 | 949 | NULL, null, undefined: *v is set to 0 and 0 is returned. |
| 950 | - | |
| 950 | + | |
| 951 | 951 | string, object, array: *v is set to 0 and |
| 952 | 952 | cson_rc.TypeError is returned. The error may normally be safely |
| 953 | 953 | ignored, but it is provided for those wanted to know whether a direct |
| 954 | 954 | conversion was possible. |
| 955 | 955 | |
| 956 | 956 | integer: *v is set to the int value and 0 is returned. |
| 957 | - | |
| 957 | + | |
| 958 | 958 | double: *v is set to the value truncated to int and 0 is returned. |
| 959 | 959 | */ |
| 960 | 960 | int cson_value_fetch_integer( cson_value const * val, cson_int_t * v ); |
| 961 | 961 | |
| 962 | 962 | /** |
| @@ -1084,11 +1084,11 @@ | ||
| 1084 | 1084 | |
| 1085 | 1085 | - The maximum number of bytes compared is the lesser of rhsLen and |
| 1086 | 1086 | the length of lhs. If the strings do not match, but compare equal |
| 1087 | 1087 | up to the just-described comparison length, the shorter string is |
| 1088 | 1088 | considered to be less-than the longer one. |
| 1089 | - | |
| 1089 | + | |
| 1090 | 1090 | - If lhs and rhs are both NULL, or both have a length of 0 then they will |
| 1091 | 1091 | compare equal. |
| 1092 | 1092 | |
| 1093 | 1093 | - If lhs is null/length-0 but rhs is not then lhs is considered to be less-than |
| 1094 | 1094 | rhs. |
| @@ -1110,11 +1110,11 @@ | ||
| 1110 | 1110 | Returns the length, in bytes, of str, or 0 if str is NULL. This is |
| 1111 | 1111 | an O(1) operation. |
| 1112 | 1112 | |
| 1113 | 1113 | TODO: add cson_string_length_chars() (is O(N) unless we add another |
| 1114 | 1114 | member to store the char length). |
| 1115 | - | |
| 1115 | + | |
| 1116 | 1116 | @see cson_string_cstr() |
| 1117 | 1117 | */ |
| 1118 | 1118 | unsigned int cson_string_length_bytes( cson_string const * str ); |
| 1119 | 1119 | |
| 1120 | 1120 | /** |
| @@ -1207,11 +1207,11 @@ | ||
| 1207 | 1207 | ar is expanded, if needed, to be able to hold at least (ndx+1) |
| 1208 | 1208 | items, and any new entries created by that expansion are empty |
| 1209 | 1209 | (NULL values). |
| 1210 | 1210 | |
| 1211 | 1211 | On success, 0 is returned and ownership of v is transfered to ar. |
| 1212 | - | |
| 1212 | + | |
| 1213 | 1213 | On error ownership of v is NOT modified, and the caller may still |
| 1214 | 1214 | need to clean it up. For example, the following code will introduce |
| 1215 | 1215 | a leak if this function fails: |
| 1216 | 1216 | |
| 1217 | 1217 | @code |
| @@ -1240,11 +1240,11 @@ | ||
| 1240 | 1240 | |
| 1241 | 1241 | This is functionally equivalent to |
| 1242 | 1242 | cson_array_set(ar,cson_array_length_get(ar),v), but this |
| 1243 | 1243 | implementation has slightly different array-preallocation policy |
| 1244 | 1244 | (it grows more eagerly). |
| 1245 | - | |
| 1245 | + | |
| 1246 | 1246 | Returns 0 on success, non-zero on error. Error cases include: |
| 1247 | 1247 | |
| 1248 | 1248 | - ar or v are NULL: cson_rc.ArgError |
| 1249 | 1249 | |
| 1250 | 1250 | - Array cannot be expanded to hold enough elements: cson_rc.AllocError. |
| @@ -1283,11 +1283,11 @@ | ||
| 1283 | 1283 | cson_value * cson_new_bool(char v); |
| 1284 | 1284 | |
| 1285 | 1285 | /** |
| 1286 | 1286 | Returns the special JSON "null" value. When outputing JSON, |
| 1287 | 1287 | its string representation is "null" (without the quotes). |
| 1288 | - | |
| 1288 | + | |
| 1289 | 1289 | See cson_value_new_bool() for notes regarding the returned |
| 1290 | 1290 | value's memory. |
| 1291 | 1291 | */ |
| 1292 | 1292 | cson_value * cson_value_null(); |
| 1293 | 1293 | |
| @@ -1323,16 +1323,16 @@ | ||
| 1323 | 1323 | |
| 1324 | 1324 | /** |
| 1325 | 1325 | Semantically the same as cson_value_new_bool(), but for strings. |
| 1326 | 1326 | This creates a JSON value which copies the first n bytes of str. |
| 1327 | 1327 | The string will automatically be NUL-terminated. |
| 1328 | - | |
| 1328 | + | |
| 1329 | 1329 | Note that if str is NULL or n is 0, this function still |
| 1330 | 1330 | returns non-NULL value representing that empty string. |
| 1331 | - | |
| 1331 | + | |
| 1332 | 1332 | Returns NULL on allocation error. |
| 1333 | - | |
| 1333 | + | |
| 1334 | 1334 | See cson_value_new_bool() for important information about the |
| 1335 | 1335 | returned memory. |
| 1336 | 1336 | */ |
| 1337 | 1337 | cson_value * cson_value_new_string( char const * str, unsigned int n ); |
| 1338 | 1338 | |
| @@ -1354,11 +1354,11 @@ | ||
| 1354 | 1354 | This works like cson_value_new_object() but returns an Object |
| 1355 | 1355 | handle directly. |
| 1356 | 1356 | |
| 1357 | 1357 | The value handle for the returned object can be fetched with |
| 1358 | 1358 | cson_object_value(theObject). |
| 1359 | - | |
| 1359 | + | |
| 1360 | 1360 | Ownership is transfered to the caller, who must eventually free it |
| 1361 | 1361 | by passing the Value handle (NOT the Object handle) to |
| 1362 | 1362 | cson_value_free() or passing ownership to a parent container. |
| 1363 | 1363 | |
| 1364 | 1364 | Returns NULL on error (out of memory). |
| @@ -1419,11 +1419,11 @@ | ||
| 1419 | 1419 | cson_value_add_reference(). Even if this function does not |
| 1420 | 1420 | immediately destroy the value, the value must be considered, from |
| 1421 | 1421 | the perspective of that client code, to have been |
| 1422 | 1422 | destroyed/invalidated by this call. |
| 1423 | 1423 | |
| 1424 | - | |
| 1424 | + | |
| 1425 | 1425 | @see cson_value_new_object() |
| 1426 | 1426 | @see cson_value_new_array() |
| 1427 | 1427 | @see cson_value_add_reference() |
| 1428 | 1428 | */ |
| 1429 | 1429 | void cson_value_free(cson_value * v); |
| @@ -1445,11 +1445,11 @@ | ||
| 1445 | 1445 | case, the key is set to the special null value. |
| 1446 | 1446 | |
| 1447 | 1447 | The key may be encoded as ASCII or UTF8. Results are undefined |
| 1448 | 1448 | with other encodings, and the errors won't show up here, but may |
| 1449 | 1449 | show up later, e.g. during output. |
| 1450 | - | |
| 1450 | + | |
| 1451 | 1451 | Returns 0 on success, non-0 on error. It has the following error |
| 1452 | 1452 | cases: |
| 1453 | 1453 | |
| 1454 | 1454 | - cson_rc.ArgError: obj or key are NULL or strlen(key) is 0. |
| 1455 | 1455 | |
| @@ -1498,11 +1498,11 @@ | ||
| 1498 | 1498 | */ |
| 1499 | 1499 | int cson_object_set_s( cson_object * obj, cson_string * key, cson_value * v ); |
| 1500 | 1500 | |
| 1501 | 1501 | /** |
| 1502 | 1502 | Removes a property from an object. |
| 1503 | - | |
| 1503 | + | |
| 1504 | 1504 | If obj contains the given key, it is removed and 0 is returned. If |
| 1505 | 1505 | it is not found, cson_rc.NotFoundError is returned (which can |
| 1506 | 1506 | normally be ignored by client code). |
| 1507 | 1507 | |
| 1508 | 1508 | cson_rc.ArgError is returned if obj or key are NULL or key has |
| @@ -1569,33 +1569,33 @@ | ||
| 1569 | 1569 | |
| 1570 | 1570 | If it finds the given path, it returns the value by assiging *tgt |
| 1571 | 1571 | to it. If tgt is NULL then this function has no side-effects but |
| 1572 | 1572 | will return 0 if the given path is found within the object, so it can be used |
| 1573 | 1573 | to test for existence without fetching it. |
| 1574 | - | |
| 1574 | + | |
| 1575 | 1575 | Returns 0 if it finds an entry, cson_rc.NotFoundError if it finds |
| 1576 | 1576 | no item, and any other non-zero error code on a "real" error. Errors include: |
| 1577 | 1577 | |
| 1578 | 1578 | - obj or path are NULL: cson_rc.ArgError |
| 1579 | - | |
| 1579 | + | |
| 1580 | 1580 | - separator is 0, or path is an empty string or contains only |
| 1581 | 1581 | separator characters: cson_rc.RangeError |
| 1582 | 1582 | |
| 1583 | 1583 | - There is an upper limit on how long a single path component may |
| 1584 | 1584 | be (some "reasonable" internal size), and cson_rc.RangeError is |
| 1585 | 1585 | returned if that length is violated. |
| 1586 | 1586 | |
| 1587 | - | |
| 1587 | + | |
| 1588 | 1588 | Limitations: |
| 1589 | 1589 | |
| 1590 | 1590 | - It has no way to fetch data from arrays this way. i could |
| 1591 | 1591 | imagine, e.g., a path of "subobj.subArray.0" for |
| 1592 | 1592 | subobj.subArray[0], or "0.3.1" for [0][3][1]. But i'm too |
| 1593 | 1593 | lazy/tired to add this. |
| 1594 | 1594 | |
| 1595 | 1595 | Example usage: |
| 1596 | - | |
| 1596 | + | |
| 1597 | 1597 | |
| 1598 | 1598 | Assume we have a JSON structure which abstractly looks like: |
| 1599 | 1599 | |
| 1600 | 1600 | @code |
| 1601 | 1601 | {"subobj":{"subsubobj":{"myValue":[1,2,3]}}} |
| @@ -1613,11 +1613,11 @@ | ||
| 1613 | 1613 | "subobj/subsubobj/myValue" with separator='/' is equivalent the |
| 1614 | 1614 | path "subobj.subsubobj.myValue" with separator='.'. The value of 0 |
| 1615 | 1615 | is not legal as a separator character because we cannot |
| 1616 | 1616 | distinguish that use from the real end-of-string without requiring |
| 1617 | 1617 | the caller to also pass in the length of the string. |
| 1618 | - | |
| 1618 | + | |
| 1619 | 1619 | Multiple successive separators in the list are collapsed into a |
| 1620 | 1620 | single separator for parsing purposes. e.g. the path "a...b...c" |
| 1621 | 1621 | (separator='.') is equivalent to "a.b.c". |
| 1622 | 1622 | |
| 1623 | 1623 | @see cson_object_get_sub() |
| @@ -1700,11 +1700,11 @@ | ||
| 1700 | 1700 | @see cson_object_iter_init() |
| 1701 | 1701 | @see cson_object_iter_next() |
| 1702 | 1702 | */ |
| 1703 | 1703 | struct cson_object_iterator |
| 1704 | 1704 | { |
| 1705 | - | |
| 1705 | + | |
| 1706 | 1706 | /** @internal |
| 1707 | 1707 | The underlying object. |
| 1708 | 1708 | */ |
| 1709 | 1709 | cson_object const * obj; |
| 1710 | 1710 | /** @internal |
| @@ -1771,11 +1771,11 @@ | ||
| 1771 | 1771 | ... |
| 1772 | 1772 | } |
| 1773 | 1773 | @endcode |
| 1774 | 1774 | |
| 1775 | 1775 | There is no need to clean up an iterator, as it holds no dynamic resources. |
| 1776 | - | |
| 1776 | + | |
| 1777 | 1777 | @see cson_kvp_key() |
| 1778 | 1778 | @see cson_kvp_value() |
| 1779 | 1779 | */ |
| 1780 | 1780 | cson_kvp * cson_object_iter_next( cson_object_iterator * iter ); |
| 1781 | 1781 | |
| @@ -1863,11 +1863,11 @@ | ||
| 1863 | 1863 | buf = cson_buffer_empty; |
| 1864 | 1864 | @endcode |
| 1865 | 1865 | |
| 1866 | 1866 | (You might also need to store buf.used and buf.capacity, |
| 1867 | 1867 | depending on what you want to do with the memory.) |
| 1868 | - | |
| 1868 | + | |
| 1869 | 1869 | When doing so, the memory must eventually be passed to free() |
| 1870 | 1870 | to deallocate it. |
| 1871 | 1871 | */ |
| 1872 | 1872 | unsigned char * mem; |
| 1873 | 1873 | }; |
| @@ -1894,11 +1894,11 @@ | ||
| 1894 | 1894 | On error non-zero is returned. Errors include: |
| 1895 | 1895 | |
| 1896 | 1896 | - Invalid arguments: cson_rc.ArgError |
| 1897 | 1897 | |
| 1898 | 1898 | - Buffer cannot be expanded (runs out of memory): cson_rc.AllocError |
| 1899 | - | |
| 1899 | + | |
| 1900 | 1900 | Example usage: |
| 1901 | 1901 | |
| 1902 | 1902 | @code |
| 1903 | 1903 | cson_buffer buf = cson_buffer_empty; |
| 1904 | 1904 | // optional: cson_buffer_reserve(&buf, 1024 * 10); |
| @@ -1918,13 +1918,13 @@ | ||
| 1918 | 1918 | buf = cson_buffer_empty; |
| 1919 | 1919 | ... |
| 1920 | 1920 | free(mem); |
| 1921 | 1921 | } |
| 1922 | 1922 | @endcode |
| 1923 | - | |
| 1923 | + | |
| 1924 | 1924 | @see cson_output() |
| 1925 | - | |
| 1925 | + | |
| 1926 | 1926 | */ |
| 1927 | 1927 | int cson_output_buffer( cson_value const * v, cson_buffer * buf, |
| 1928 | 1928 | cson_output_opt const * opt ); |
| 1929 | 1929 | |
| 1930 | 1930 | /** |
| @@ -1993,11 +1993,11 @@ | ||
| 1993 | 1993 | calling cson_buffer_reserve(dest,0). |
| 1994 | 1994 | |
| 1995 | 1995 | dest->mem might (and possibly will) be (re)allocated by this |
| 1996 | 1996 | function, so any pointers to it held from before this call might be |
| 1997 | 1997 | invalidated by this call. |
| 1998 | - | |
| 1998 | + | |
| 1999 | 1999 | On error non-0 is returned and dest has almost certainly been |
| 2000 | 2000 | modified but its state must be considered incomplete. |
| 2001 | 2001 | |
| 2002 | 2002 | Errors include: |
| 2003 | 2003 | |
| @@ -2042,11 +2042,11 @@ | ||
| 2042 | 2042 | void * mem = buf.mem; |
| 2043 | 2043 | buf = cson_buffer_empty; |
| 2044 | 2044 | @endcode |
| 2045 | 2045 | |
| 2046 | 2046 | In which case the memory must eventually be passed to free() to |
| 2047 | - free it. | |
| 2047 | + free it. | |
| 2048 | 2048 | */ |
| 2049 | 2049 | int cson_buffer_fill_from( cson_buffer * dest, cson_data_source_f src, void * state ); |
| 2050 | 2050 | |
| 2051 | 2051 | |
| 2052 | 2052 | /** |
| @@ -2072,11 +2072,11 @@ | ||
| 2072 | 2072 | for other sharing points which added a reference. |
| 2073 | 2073 | |
| 2074 | 2074 | Normally any such value handles would be invalidated when the |
| 2075 | 2075 | parent container(s) is/are cleaned up, but this function can be |
| 2076 | 2076 | used to effectively delay the cleanup. |
| 2077 | - | |
| 2077 | + | |
| 2078 | 2078 | This function, at its lowest level, increments the value's |
| 2079 | 2079 | reference count by 1. |
| 2080 | 2080 | |
| 2081 | 2081 | To decrement the reference count, pass the value to |
| 2082 | 2082 | cson_value_free(), after which the value must be considered, from |
| @@ -2091,11 +2091,11 @@ | ||
| 2091 | 2091 | errors long before the reference count could overflow (assuming |
| 2092 | 2092 | those reference counts come from container insertions, as opposed |
| 2093 | 2093 | to via this function). |
| 2094 | 2094 | |
| 2095 | 2095 | Insider notes which clients really need to know: |
| 2096 | - | |
| 2096 | + | |
| 2097 | 2097 | For shared/constant value instances, such as those returned by |
| 2098 | 2098 | cson_value_true() and cson_value_null(), this function has no side |
| 2099 | 2099 | effects - it does not actually modify the reference count because |
| 2100 | 2100 | (A) those instances are shared across all client code and (B) those |
| 2101 | 2101 | objects are static and never get cleaned up. However, that is an |
| @@ -2173,11 +2173,11 @@ | ||
| 2173 | 2173 | returned object will be of the same logical type as orig. |
| 2174 | 2174 | |
| 2175 | 2175 | ACHTUNG: if orig contains any cyclic references at any depth level |
| 2176 | 2176 | this function will endlessly recurse. (Having _any_ cyclic |
| 2177 | 2177 | references violates this library's requirements.) |
| 2178 | - | |
| 2178 | + | |
| 2179 | 2179 | Returns NULL if orig is NULL or if cloning fails. Assuming that |
| 2180 | 2180 | orig is in a valid state, the only "likely" error case is that an |
| 2181 | 2181 | allocation fails while constructing the clone. In other words, if |
| 2182 | 2182 | cloning fails due to something other than an allocation error then |
| 2183 | 2183 | either orig is in an invalid state or there is a bug. |
| @@ -2278,11 +2278,11 @@ | ||
| 2278 | 2278 | --key=VAL : Treats VAL as either a double, integer, or string. |
| 2279 | 2279 | |
| 2280 | 2280 | --key= : Treats key as a JSON null (not literal NULL) value. |
| 2281 | 2281 | |
| 2282 | 2282 | Arguments not starting with a dash are skipped. |
| 2283 | - | |
| 2283 | + | |
| 2284 | 2284 | Each key/value pair is inserted into an object. If a given key |
| 2285 | 2285 | appears more than once then only the final entry is actually |
| 2286 | 2286 | stored. |
| 2287 | 2287 | |
| 2288 | 2288 | argc and argv are expected to be values from main() (or similar, |
| @@ -2434,22 +2434,22 @@ | ||
| 2434 | 2434 | Integer, double, null, or string (TEXT and BLOB data, though not |
| 2435 | 2435 | all blob data is legal for a JSON string). |
| 2436 | 2436 | |
| 2437 | 2437 | st must be a sqlite3_step()'d row and col must be a 0-based column |
| 2438 | 2438 | index within that result row. |
| 2439 | - */ | |
| 2439 | + */ | |
| 2440 | 2440 | cson_value * cson_sqlite3_column_to_value( sqlite3_stmt * st, int col ); |
| 2441 | 2441 | |
| 2442 | 2442 | /** |
| 2443 | 2443 | Creates a JSON Array object containing the names of all columns |
| 2444 | - of the given prepared statement handle. | |
| 2445 | - | |
| 2444 | + of the given prepared statement handle. | |
| 2445 | + | |
| 2446 | 2446 | Returns a new array value on success, which the caller owns. Its elements |
| 2447 | 2447 | are in the same order as in the underlying query. |
| 2448 | 2448 | |
| 2449 | 2449 | On error NULL is returned. |
| 2450 | - | |
| 2450 | + | |
| 2451 | 2451 | st is not traversed or freed by this function - only the column |
| 2452 | 2452 | count and names are read. |
| 2453 | 2453 | */ |
| 2454 | 2454 | cson_value * cson_sqlite3_column_names( sqlite3_stmt * st ); |
| 2455 | 2455 | |
| @@ -2494,22 +2494,22 @@ | ||
| 2494 | 2494 | */ |
| 2495 | 2495 | cson_value * cson_sqlite3_row_to_array( sqlite3_stmt * st ); |
| 2496 | 2496 | /** |
| 2497 | 2497 | Converts the results of an sqlite3 SELECT statement to JSON, |
| 2498 | 2498 | in the form of a cson_value object tree. |
| 2499 | - | |
| 2499 | + | |
| 2500 | 2500 | st must be a prepared, but not yet traversed, SELECT query. |
| 2501 | 2501 | tgt must be a pointer to NULL (see the example below). If |
| 2502 | 2502 | either of those arguments are NULL, cson_rc.ArgError is returned. |
| 2503 | - | |
| 2503 | + | |
| 2504 | 2504 | This walks the query results and returns a JSON object which |
| 2505 | 2505 | has a different structure depending on the value of the 'fat' |
| 2506 | 2506 | argument. |
| 2507 | - | |
| 2508 | - | |
| 2507 | + | |
| 2508 | + | |
| 2509 | 2509 | If 'fat' is 0 then the structure is: |
| 2510 | - | |
| 2510 | + | |
| 2511 | 2511 | @code |
| 2512 | 2512 | { |
| 2513 | 2513 | "columns":["colName1",..."colNameN"], |
| 2514 | 2514 | "rows":[ |
| 2515 | 2515 | [colVal0, ... colValN], |
| @@ -2516,16 +2516,16 @@ | ||
| 2516 | 2516 | [colVal0, ... colValN], |
| 2517 | 2517 | ... |
| 2518 | 2518 | ] |
| 2519 | 2519 | } |
| 2520 | 2520 | @endcode |
| 2521 | - | |
| 2521 | + | |
| 2522 | 2522 | In the "non-fat" format the order of the columns and row values is |
| 2523 | 2523 | guaranteed to be the same as that of the underlying query. |
| 2524 | - | |
| 2524 | + | |
| 2525 | 2525 | If 'fat' is not 0 then the structure is: |
| 2526 | - | |
| 2526 | + | |
| 2527 | 2527 | @code |
| 2528 | 2528 | { |
| 2529 | 2529 | "columns":["colName1",..."colNameN"], |
| 2530 | 2530 | "rows":[ |
| 2531 | 2531 | {"colName1":value1,..."colNameN":valueN}, |
| @@ -2543,33 +2543,33 @@ | ||
| 2543 | 2543 | |
| 2544 | 2544 | On success it returns 0 and assigns *tgt to a newly-allocated |
| 2545 | 2545 | JSON object tree (using the above structure), which the caller owns. |
| 2546 | 2546 | If the query returns no rows, the "rows" value will be an empty |
| 2547 | 2547 | array, as opposed to null. |
| 2548 | - | |
| 2548 | + | |
| 2549 | 2549 | On error non-0 is returned and *tgt is not modified. |
| 2550 | - | |
| 2550 | + | |
| 2551 | 2551 | The error code cson_rc.IOError is used to indicate a db-level |
| 2552 | 2552 | error, and cson_rc.TypeError is returned if sqlite3_column_count(st) |
| 2553 | 2553 | returns 0 or less (indicating an invalid or non-SELECT statement). |
| 2554 | - | |
| 2554 | + | |
| 2555 | 2555 | The JSON data types are determined by the column type as reported |
| 2556 | 2556 | by sqlite3_column_type(): |
| 2557 | - | |
| 2557 | + | |
| 2558 | 2558 | SQLITE_INTEGER: integer |
| 2559 | - | |
| 2559 | + | |
| 2560 | 2560 | SQLITE_FLOAT: double |
| 2561 | - | |
| 2561 | + | |
| 2562 | 2562 | SQLITE_TEXT or SQLITE_BLOB: string, and this will only work if |
| 2563 | 2563 | the data is UTF8 compatible. |
| 2564 | - | |
| 2564 | + | |
| 2565 | 2565 | If the db returns a literal or SQL NULL for a value it is converted |
| 2566 | 2566 | to a JSON null. If it somehow finds a column type it cannot handle, |
| 2567 | 2567 | the value is also converted to a NULL in the output. |
| 2568 | 2568 | |
| 2569 | 2569 | Example |
| 2570 | - | |
| 2570 | + | |
| 2571 | 2571 | @code |
| 2572 | 2572 | cson_value * json = NULL; |
| 2573 | 2573 | int rc = cson_sqlite3_stmt_to_json( myStatement, &json, 1 ); |
| 2574 | 2574 | if( 0 != rc ) { ... error ... } |
| 2575 | 2575 | else { |
| @@ -2603,14 +2603,14 @@ | ||
| 2603 | 2603 | TODO: add Object support for named parameters. |
| 2604 | 2604 | |
| 2605 | 2605 | Returns 0 on success, non-0 on error. |
| 2606 | 2606 | */ |
| 2607 | 2607 | int cson_sqlite3_bind_value( sqlite3_stmt * st, int ndx, cson_value const * v ); |
| 2608 | - | |
| 2608 | + | |
| 2609 | 2609 | #if defined(__cplusplus) |
| 2610 | 2610 | } /*extern "C"*/ |
| 2611 | 2611 | #endif |
| 2612 | - | |
| 2612 | + | |
| 2613 | 2613 | #endif /* CSON_ENABLE_SQLITE3 */ |
| 2614 | 2614 | #endif /* WANDERINGHORSE_NET_CSON_SQLITE3_H_INCLUDED */ |
| 2615 | 2615 | /* end file include/wh/cson/cson_sqlite3.h */ |
| 2616 | 2616 | #endif /* FOSSIL_ENABLE_JSON */ |
| 2617 | 2617 |
| --- src/cson_amalgamation.h | |
| +++ src/cson_amalgamation.h | |
| @@ -59,11 +59,11 @@ | |
| 59 | #define CSON_INT_T_PFMT "I64d" |
| 60 | #elif (__STDC_VERSION__ >= 199901L) || (HAVE_LONG_LONG == 1) |
| 61 | typedef long long cson_int_t; |
| 62 | #define CSON_INT_T_SFMT "lld" |
| 63 | #define CSON_INT_T_PFMT "lld" |
| 64 | #else |
| 65 | typedef long cson_int_t; |
| 66 | #define CSON_INT_T_SFMT "ld" |
| 67 | #define CSON_INT_T_PFMT "ld" |
| 68 | #endif |
| 69 | |
| @@ -215,11 +215,11 @@ | |
| 215 | Convenience typedef. |
| 216 | */ |
| 217 | typedef struct cson_value cson_value; |
| 218 | |
| 219 | /** @struct cson_value |
| 220 | |
| 221 | The core value type of this API. It is opaque to clients, and |
| 222 | only the cson public API should be used for setting or |
| 223 | inspecting their values. |
| 224 | |
| 225 | This class is opaque because stack-based usage can easily cause |
| @@ -231,11 +231,11 @@ | |
| 231 | counting) as long as those insertions do not cause cycles. However, |
| 232 | be very aware that such value re-use uses a reference to the |
| 233 | original copy, meaning that if its value is changed once, it is |
| 234 | changed everywhere. Also beware that multi-threaded write |
| 235 | operations on such references leads to undefined behaviour. |
| 236 | |
| 237 | PLEASE read the ACHTUNGEN below... |
| 238 | |
| 239 | ACHTUNG #1: |
| 240 | |
| 241 | cson_values MUST NOT form cycles (e.g. via object or array |
| @@ -244,33 +244,33 @@ | |
| 244 | Not abiding th Holy Law Of No Cycles will lead to double-frees and |
| 245 | the like (i.e. undefined behaviour, likely crashes due to infinite |
| 246 | recursion or stepping on invalid (freed) pointers). |
| 247 | |
| 248 | ACHTUNG #2: |
| 249 | |
| 250 | ALL cson_values returned as non-const cson_value pointers from any |
| 251 | public functions in the cson API are to be treated as if they are |
| 252 | heap-allocated, and MUST be freed by client by doing ONE of: |
| 253 | |
| 254 | - Passing it to cson_value_free(). |
| 255 | |
| 256 | - Adding it to an Object or Array, in which case the object/array |
| 257 | takes over ownership. As of 20110323, a value may be inserted into |
| 258 | a single container multiple times, or into multiple containers, |
| 259 | in which case they all share ownership (via reference counting) |
| 260 | of the original value (meaning any changes to it are visible in |
| 261 | all references to it). |
| 262 | |
| 263 | Each call to cson_value_new_xxx() MUST eventually be followed up |
| 264 | by one of those options. |
| 265 | |
| 266 | Some cson_value_new_XXX() implementations do not actually allocate |
| 267 | memory, but this is an internal implementation detail. Client code |
| 268 | MUST NOT rely on this behaviour and MUST treat each object |
| 269 | returned by such a function as if it was a freshly-allocated copy |
| 270 | (even if their pointer addresses are the same). |
| 271 | |
| 272 | ACHTUNG #3: |
| 273 | |
| 274 | Note that ACHTUNG #2 tells us that we must always free (or transfer |
| 275 | ownership of) all pointers returned bycson_value_new_xxx(), but |
| 276 | that two calls to (e.g.) cson_value_new_bool(1) will (or might) |
| @@ -315,11 +315,11 @@ | |
| 315 | if( 0 == rc ) {...success...} |
| 316 | else if( cson_rc.ArgError == rc ) { ... some argument was wrong ... } |
| 317 | else if( cson_rc.AllocError == rc ) { ... allocation error ... } |
| 318 | ... |
| 319 | @endcode |
| 320 | |
| 321 | The entries named Parse_XXX are generally only returned by |
| 322 | cson_parse() and friends. |
| 323 | */ |
| 324 | |
| 325 | /** @struct cson_rc_ |
| @@ -472,11 +472,11 @@ | |
| 472 | |
| 473 | /** |
| 474 | Length, in bytes. |
| 475 | */ |
| 476 | unsigned int length; |
| 477 | |
| 478 | /** |
| 479 | Error code of the parse run (0 for no error). |
| 480 | */ |
| 481 | int errorCode; |
| 482 | |
| @@ -523,11 +523,11 @@ | |
| 523 | /** |
| 524 | Specifies how to indent (or not) output. The values |
| 525 | are: |
| 526 | |
| 527 | (0) == no extra indentation. |
| 528 | |
| 529 | (1) == 1 TAB character for each level. |
| 530 | |
| 531 | (>1) == that number of SPACES for each level. |
| 532 | */ |
| 533 | unsigned char indentation; |
| @@ -536,11 +536,11 @@ | |
| 536 | Maximum object/array depth to traverse. Traversing deeply can |
| 537 | be indicative of cycles in the object/array tree, and this |
| 538 | value is used to figure out when to abort the traversal. |
| 539 | */ |
| 540 | unsigned short maxDepth; |
| 541 | |
| 542 | /** |
| 543 | If true, a newline will be added to generated output, |
| 544 | else not. |
| 545 | */ |
| 546 | char addNewline; |
| @@ -636,11 +636,11 @@ | |
| 636 | |
| 637 | Must return 0 on success, non-0 on error (preferably a value from |
| 638 | cson_rc). |
| 639 | |
| 640 | These functions are called relatively often during the JSON-output |
| 641 | process, and should try to be fast. |
| 642 | */ |
| 643 | typedef int (*cson_data_dest_f)( void * state, void const * src, unsigned int n ); |
| 644 | |
| 645 | /** |
| 646 | Reads JSON-formatted string data (in ASCII, UTF8, or UTF16), using the |
| @@ -664,15 +664,15 @@ | |
| 664 | used. |
| 665 | |
| 666 | The info argument may be NULL. If it is not NULL then the parser |
| 667 | populates it with information which is useful in error |
| 668 | reporting. Namely, it contains the line/column of parse errors. |
| 669 | |
| 670 | The srcState argument is ignored by this function but is passed on to src, |
| 671 | so any output-destination-specific state can be stored there and accessed |
| 672 | via the src callback. |
| 673 | |
| 674 | Non-parse error conditions include: |
| 675 | |
| 676 | - (!tgt) or !src: cson_rc.ArgError |
| 677 | - cson_rc.AllocError can happen at any time during the input phase |
| 678 | |
| @@ -725,11 +725,11 @@ | |
| 725 | TODOs: |
| 726 | |
| 727 | - Buffer the input in larger chunks. We currently read |
| 728 | byte-by-byte, but i'm too tired to write/test the looping code for |
| 729 | the buffering. |
| 730 | |
| 731 | @see cson_parse_FILE() |
| 732 | @see cson_parse_string() |
| 733 | */ |
| 734 | int cson_parse( cson_value ** tgt, cson_data_source_f src, void * srcState, |
| 735 | cson_parse_opt const * opt, cson_parse_info * info ); |
| @@ -786,11 +786,11 @@ | |
| 786 | The destState parameter is ignored by this function and is passed |
| 787 | on to the dest function. |
| 788 | |
| 789 | Returns 0 on success. On error, any amount of output might have been |
| 790 | generated before the error was triggered. |
| 791 | |
| 792 | Example: |
| 793 | |
| 794 | @code |
| 795 | int rc = cson_output( myValue, cson_data_dest_FILE, stdout, NULL ); |
| 796 | // basically equivalent to: cson_output_FILE( myValue, stdout, NULL ); |
| @@ -925,15 +925,15 @@ | |
| 925 | /** |
| 926 | Converts the given value to a boolean, using JavaScript semantics depending |
| 927 | on the concrete type of val: |
| 928 | |
| 929 | undef or null: false |
| 930 | |
| 931 | boolean: same |
| 932 | |
| 933 | integer, double: 0 or 0.0 == false, else true |
| 934 | |
| 935 | object, array: true |
| 936 | |
| 937 | string: length-0 string is false, else true. |
| 938 | |
| 939 | Returns 0 on success and assigns *v (if v is not NULL) to either 0 or 1. |
| @@ -945,18 +945,18 @@ | |
| 945 | Similar to cson_value_fetch_bool(), but fetches an integer value. |
| 946 | |
| 947 | The conversion, if any, depends on the concrete type of val: |
| 948 | |
| 949 | NULL, null, undefined: *v is set to 0 and 0 is returned. |
| 950 | |
| 951 | string, object, array: *v is set to 0 and |
| 952 | cson_rc.TypeError is returned. The error may normally be safely |
| 953 | ignored, but it is provided for those wanted to know whether a direct |
| 954 | conversion was possible. |
| 955 | |
| 956 | integer: *v is set to the int value and 0 is returned. |
| 957 | |
| 958 | double: *v is set to the value truncated to int and 0 is returned. |
| 959 | */ |
| 960 | int cson_value_fetch_integer( cson_value const * val, cson_int_t * v ); |
| 961 | |
| 962 | /** |
| @@ -1084,11 +1084,11 @@ | |
| 1084 | |
| 1085 | - The maximum number of bytes compared is the lesser of rhsLen and |
| 1086 | the length of lhs. If the strings do not match, but compare equal |
| 1087 | up to the just-described comparison length, the shorter string is |
| 1088 | considered to be less-than the longer one. |
| 1089 | |
| 1090 | - If lhs and rhs are both NULL, or both have a length of 0 then they will |
| 1091 | compare equal. |
| 1092 | |
| 1093 | - If lhs is null/length-0 but rhs is not then lhs is considered to be less-than |
| 1094 | rhs. |
| @@ -1110,11 +1110,11 @@ | |
| 1110 | Returns the length, in bytes, of str, or 0 if str is NULL. This is |
| 1111 | an O(1) operation. |
| 1112 | |
| 1113 | TODO: add cson_string_length_chars() (is O(N) unless we add another |
| 1114 | member to store the char length). |
| 1115 | |
| 1116 | @see cson_string_cstr() |
| 1117 | */ |
| 1118 | unsigned int cson_string_length_bytes( cson_string const * str ); |
| 1119 | |
| 1120 | /** |
| @@ -1207,11 +1207,11 @@ | |
| 1207 | ar is expanded, if needed, to be able to hold at least (ndx+1) |
| 1208 | items, and any new entries created by that expansion are empty |
| 1209 | (NULL values). |
| 1210 | |
| 1211 | On success, 0 is returned and ownership of v is transfered to ar. |
| 1212 | |
| 1213 | On error ownership of v is NOT modified, and the caller may still |
| 1214 | need to clean it up. For example, the following code will introduce |
| 1215 | a leak if this function fails: |
| 1216 | |
| 1217 | @code |
| @@ -1240,11 +1240,11 @@ | |
| 1240 | |
| 1241 | This is functionally equivalent to |
| 1242 | cson_array_set(ar,cson_array_length_get(ar),v), but this |
| 1243 | implementation has slightly different array-preallocation policy |
| 1244 | (it grows more eagerly). |
| 1245 | |
| 1246 | Returns 0 on success, non-zero on error. Error cases include: |
| 1247 | |
| 1248 | - ar or v are NULL: cson_rc.ArgError |
| 1249 | |
| 1250 | - Array cannot be expanded to hold enough elements: cson_rc.AllocError. |
| @@ -1283,11 +1283,11 @@ | |
| 1283 | cson_value * cson_new_bool(char v); |
| 1284 | |
| 1285 | /** |
| 1286 | Returns the special JSON "null" value. When outputing JSON, |
| 1287 | its string representation is "null" (without the quotes). |
| 1288 | |
| 1289 | See cson_value_new_bool() for notes regarding the returned |
| 1290 | value's memory. |
| 1291 | */ |
| 1292 | cson_value * cson_value_null(); |
| 1293 | |
| @@ -1323,16 +1323,16 @@ | |
| 1323 | |
| 1324 | /** |
| 1325 | Semantically the same as cson_value_new_bool(), but for strings. |
| 1326 | This creates a JSON value which copies the first n bytes of str. |
| 1327 | The string will automatically be NUL-terminated. |
| 1328 | |
| 1329 | Note that if str is NULL or n is 0, this function still |
| 1330 | returns non-NULL value representing that empty string. |
| 1331 | |
| 1332 | Returns NULL on allocation error. |
| 1333 | |
| 1334 | See cson_value_new_bool() for important information about the |
| 1335 | returned memory. |
| 1336 | */ |
| 1337 | cson_value * cson_value_new_string( char const * str, unsigned int n ); |
| 1338 | |
| @@ -1354,11 +1354,11 @@ | |
| 1354 | This works like cson_value_new_object() but returns an Object |
| 1355 | handle directly. |
| 1356 | |
| 1357 | The value handle for the returned object can be fetched with |
| 1358 | cson_object_value(theObject). |
| 1359 | |
| 1360 | Ownership is transfered to the caller, who must eventually free it |
| 1361 | by passing the Value handle (NOT the Object handle) to |
| 1362 | cson_value_free() or passing ownership to a parent container. |
| 1363 | |
| 1364 | Returns NULL on error (out of memory). |
| @@ -1419,11 +1419,11 @@ | |
| 1419 | cson_value_add_reference(). Even if this function does not |
| 1420 | immediately destroy the value, the value must be considered, from |
| 1421 | the perspective of that client code, to have been |
| 1422 | destroyed/invalidated by this call. |
| 1423 | |
| 1424 | |
| 1425 | @see cson_value_new_object() |
| 1426 | @see cson_value_new_array() |
| 1427 | @see cson_value_add_reference() |
| 1428 | */ |
| 1429 | void cson_value_free(cson_value * v); |
| @@ -1445,11 +1445,11 @@ | |
| 1445 | case, the key is set to the special null value. |
| 1446 | |
| 1447 | The key may be encoded as ASCII or UTF8. Results are undefined |
| 1448 | with other encodings, and the errors won't show up here, but may |
| 1449 | show up later, e.g. during output. |
| 1450 | |
| 1451 | Returns 0 on success, non-0 on error. It has the following error |
| 1452 | cases: |
| 1453 | |
| 1454 | - cson_rc.ArgError: obj or key are NULL or strlen(key) is 0. |
| 1455 | |
| @@ -1498,11 +1498,11 @@ | |
| 1498 | */ |
| 1499 | int cson_object_set_s( cson_object * obj, cson_string * key, cson_value * v ); |
| 1500 | |
| 1501 | /** |
| 1502 | Removes a property from an object. |
| 1503 | |
| 1504 | If obj contains the given key, it is removed and 0 is returned. If |
| 1505 | it is not found, cson_rc.NotFoundError is returned (which can |
| 1506 | normally be ignored by client code). |
| 1507 | |
| 1508 | cson_rc.ArgError is returned if obj or key are NULL or key has |
| @@ -1569,33 +1569,33 @@ | |
| 1569 | |
| 1570 | If it finds the given path, it returns the value by assiging *tgt |
| 1571 | to it. If tgt is NULL then this function has no side-effects but |
| 1572 | will return 0 if the given path is found within the object, so it can be used |
| 1573 | to test for existence without fetching it. |
| 1574 | |
| 1575 | Returns 0 if it finds an entry, cson_rc.NotFoundError if it finds |
| 1576 | no item, and any other non-zero error code on a "real" error. Errors include: |
| 1577 | |
| 1578 | - obj or path are NULL: cson_rc.ArgError |
| 1579 | |
| 1580 | - separator is 0, or path is an empty string or contains only |
| 1581 | separator characters: cson_rc.RangeError |
| 1582 | |
| 1583 | - There is an upper limit on how long a single path component may |
| 1584 | be (some "reasonable" internal size), and cson_rc.RangeError is |
| 1585 | returned if that length is violated. |
| 1586 | |
| 1587 | |
| 1588 | Limitations: |
| 1589 | |
| 1590 | - It has no way to fetch data from arrays this way. i could |
| 1591 | imagine, e.g., a path of "subobj.subArray.0" for |
| 1592 | subobj.subArray[0], or "0.3.1" for [0][3][1]. But i'm too |
| 1593 | lazy/tired to add this. |
| 1594 | |
| 1595 | Example usage: |
| 1596 | |
| 1597 | |
| 1598 | Assume we have a JSON structure which abstractly looks like: |
| 1599 | |
| 1600 | @code |
| 1601 | {"subobj":{"subsubobj":{"myValue":[1,2,3]}}} |
| @@ -1613,11 +1613,11 @@ | |
| 1613 | "subobj/subsubobj/myValue" with separator='/' is equivalent the |
| 1614 | path "subobj.subsubobj.myValue" with separator='.'. The value of 0 |
| 1615 | is not legal as a separator character because we cannot |
| 1616 | distinguish that use from the real end-of-string without requiring |
| 1617 | the caller to also pass in the length of the string. |
| 1618 | |
| 1619 | Multiple successive separators in the list are collapsed into a |
| 1620 | single separator for parsing purposes. e.g. the path "a...b...c" |
| 1621 | (separator='.') is equivalent to "a.b.c". |
| 1622 | |
| 1623 | @see cson_object_get_sub() |
| @@ -1700,11 +1700,11 @@ | |
| 1700 | @see cson_object_iter_init() |
| 1701 | @see cson_object_iter_next() |
| 1702 | */ |
| 1703 | struct cson_object_iterator |
| 1704 | { |
| 1705 | |
| 1706 | /** @internal |
| 1707 | The underlying object. |
| 1708 | */ |
| 1709 | cson_object const * obj; |
| 1710 | /** @internal |
| @@ -1771,11 +1771,11 @@ | |
| 1771 | ... |
| 1772 | } |
| 1773 | @endcode |
| 1774 | |
| 1775 | There is no need to clean up an iterator, as it holds no dynamic resources. |
| 1776 | |
| 1777 | @see cson_kvp_key() |
| 1778 | @see cson_kvp_value() |
| 1779 | */ |
| 1780 | cson_kvp * cson_object_iter_next( cson_object_iterator * iter ); |
| 1781 | |
| @@ -1863,11 +1863,11 @@ | |
| 1863 | buf = cson_buffer_empty; |
| 1864 | @endcode |
| 1865 | |
| 1866 | (You might also need to store buf.used and buf.capacity, |
| 1867 | depending on what you want to do with the memory.) |
| 1868 | |
| 1869 | When doing so, the memory must eventually be passed to free() |
| 1870 | to deallocate it. |
| 1871 | */ |
| 1872 | unsigned char * mem; |
| 1873 | }; |
| @@ -1894,11 +1894,11 @@ | |
| 1894 | On error non-zero is returned. Errors include: |
| 1895 | |
| 1896 | - Invalid arguments: cson_rc.ArgError |
| 1897 | |
| 1898 | - Buffer cannot be expanded (runs out of memory): cson_rc.AllocError |
| 1899 | |
| 1900 | Example usage: |
| 1901 | |
| 1902 | @code |
| 1903 | cson_buffer buf = cson_buffer_empty; |
| 1904 | // optional: cson_buffer_reserve(&buf, 1024 * 10); |
| @@ -1918,13 +1918,13 @@ | |
| 1918 | buf = cson_buffer_empty; |
| 1919 | ... |
| 1920 | free(mem); |
| 1921 | } |
| 1922 | @endcode |
| 1923 | |
| 1924 | @see cson_output() |
| 1925 | |
| 1926 | */ |
| 1927 | int cson_output_buffer( cson_value const * v, cson_buffer * buf, |
| 1928 | cson_output_opt const * opt ); |
| 1929 | |
| 1930 | /** |
| @@ -1993,11 +1993,11 @@ | |
| 1993 | calling cson_buffer_reserve(dest,0). |
| 1994 | |
| 1995 | dest->mem might (and possibly will) be (re)allocated by this |
| 1996 | function, so any pointers to it held from before this call might be |
| 1997 | invalidated by this call. |
| 1998 | |
| 1999 | On error non-0 is returned and dest has almost certainly been |
| 2000 | modified but its state must be considered incomplete. |
| 2001 | |
| 2002 | Errors include: |
| 2003 | |
| @@ -2042,11 +2042,11 @@ | |
| 2042 | void * mem = buf.mem; |
| 2043 | buf = cson_buffer_empty; |
| 2044 | @endcode |
| 2045 | |
| 2046 | In which case the memory must eventually be passed to free() to |
| 2047 | free it. |
| 2048 | */ |
| 2049 | int cson_buffer_fill_from( cson_buffer * dest, cson_data_source_f src, void * state ); |
| 2050 | |
| 2051 | |
| 2052 | /** |
| @@ -2072,11 +2072,11 @@ | |
| 2072 | for other sharing points which added a reference. |
| 2073 | |
| 2074 | Normally any such value handles would be invalidated when the |
| 2075 | parent container(s) is/are cleaned up, but this function can be |
| 2076 | used to effectively delay the cleanup. |
| 2077 | |
| 2078 | This function, at its lowest level, increments the value's |
| 2079 | reference count by 1. |
| 2080 | |
| 2081 | To decrement the reference count, pass the value to |
| 2082 | cson_value_free(), after which the value must be considered, from |
| @@ -2091,11 +2091,11 @@ | |
| 2091 | errors long before the reference count could overflow (assuming |
| 2092 | those reference counts come from container insertions, as opposed |
| 2093 | to via this function). |
| 2094 | |
| 2095 | Insider notes which clients really need to know: |
| 2096 | |
| 2097 | For shared/constant value instances, such as those returned by |
| 2098 | cson_value_true() and cson_value_null(), this function has no side |
| 2099 | effects - it does not actually modify the reference count because |
| 2100 | (A) those instances are shared across all client code and (B) those |
| 2101 | objects are static and never get cleaned up. However, that is an |
| @@ -2173,11 +2173,11 @@ | |
| 2173 | returned object will be of the same logical type as orig. |
| 2174 | |
| 2175 | ACHTUNG: if orig contains any cyclic references at any depth level |
| 2176 | this function will endlessly recurse. (Having _any_ cyclic |
| 2177 | references violates this library's requirements.) |
| 2178 | |
| 2179 | Returns NULL if orig is NULL or if cloning fails. Assuming that |
| 2180 | orig is in a valid state, the only "likely" error case is that an |
| 2181 | allocation fails while constructing the clone. In other words, if |
| 2182 | cloning fails due to something other than an allocation error then |
| 2183 | either orig is in an invalid state or there is a bug. |
| @@ -2278,11 +2278,11 @@ | |
| 2278 | --key=VAL : Treats VAL as either a double, integer, or string. |
| 2279 | |
| 2280 | --key= : Treats key as a JSON null (not literal NULL) value. |
| 2281 | |
| 2282 | Arguments not starting with a dash are skipped. |
| 2283 | |
| 2284 | Each key/value pair is inserted into an object. If a given key |
| 2285 | appears more than once then only the final entry is actually |
| 2286 | stored. |
| 2287 | |
| 2288 | argc and argv are expected to be values from main() (or similar, |
| @@ -2434,22 +2434,22 @@ | |
| 2434 | Integer, double, null, or string (TEXT and BLOB data, though not |
| 2435 | all blob data is legal for a JSON string). |
| 2436 | |
| 2437 | st must be a sqlite3_step()'d row and col must be a 0-based column |
| 2438 | index within that result row. |
| 2439 | */ |
| 2440 | cson_value * cson_sqlite3_column_to_value( sqlite3_stmt * st, int col ); |
| 2441 | |
| 2442 | /** |
| 2443 | Creates a JSON Array object containing the names of all columns |
| 2444 | of the given prepared statement handle. |
| 2445 | |
| 2446 | Returns a new array value on success, which the caller owns. Its elements |
| 2447 | are in the same order as in the underlying query. |
| 2448 | |
| 2449 | On error NULL is returned. |
| 2450 | |
| 2451 | st is not traversed or freed by this function - only the column |
| 2452 | count and names are read. |
| 2453 | */ |
| 2454 | cson_value * cson_sqlite3_column_names( sqlite3_stmt * st ); |
| 2455 | |
| @@ -2494,22 +2494,22 @@ | |
| 2494 | */ |
| 2495 | cson_value * cson_sqlite3_row_to_array( sqlite3_stmt * st ); |
| 2496 | /** |
| 2497 | Converts the results of an sqlite3 SELECT statement to JSON, |
| 2498 | in the form of a cson_value object tree. |
| 2499 | |
| 2500 | st must be a prepared, but not yet traversed, SELECT query. |
| 2501 | tgt must be a pointer to NULL (see the example below). If |
| 2502 | either of those arguments are NULL, cson_rc.ArgError is returned. |
| 2503 | |
| 2504 | This walks the query results and returns a JSON object which |
| 2505 | has a different structure depending on the value of the 'fat' |
| 2506 | argument. |
| 2507 | |
| 2508 | |
| 2509 | If 'fat' is 0 then the structure is: |
| 2510 | |
| 2511 | @code |
| 2512 | { |
| 2513 | "columns":["colName1",..."colNameN"], |
| 2514 | "rows":[ |
| 2515 | [colVal0, ... colValN], |
| @@ -2516,16 +2516,16 @@ | |
| 2516 | [colVal0, ... colValN], |
| 2517 | ... |
| 2518 | ] |
| 2519 | } |
| 2520 | @endcode |
| 2521 | |
| 2522 | In the "non-fat" format the order of the columns and row values is |
| 2523 | guaranteed to be the same as that of the underlying query. |
| 2524 | |
| 2525 | If 'fat' is not 0 then the structure is: |
| 2526 | |
| 2527 | @code |
| 2528 | { |
| 2529 | "columns":["colName1",..."colNameN"], |
| 2530 | "rows":[ |
| 2531 | {"colName1":value1,..."colNameN":valueN}, |
| @@ -2543,33 +2543,33 @@ | |
| 2543 | |
| 2544 | On success it returns 0 and assigns *tgt to a newly-allocated |
| 2545 | JSON object tree (using the above structure), which the caller owns. |
| 2546 | If the query returns no rows, the "rows" value will be an empty |
| 2547 | array, as opposed to null. |
| 2548 | |
| 2549 | On error non-0 is returned and *tgt is not modified. |
| 2550 | |
| 2551 | The error code cson_rc.IOError is used to indicate a db-level |
| 2552 | error, and cson_rc.TypeError is returned if sqlite3_column_count(st) |
| 2553 | returns 0 or less (indicating an invalid or non-SELECT statement). |
| 2554 | |
| 2555 | The JSON data types are determined by the column type as reported |
| 2556 | by sqlite3_column_type(): |
| 2557 | |
| 2558 | SQLITE_INTEGER: integer |
| 2559 | |
| 2560 | SQLITE_FLOAT: double |
| 2561 | |
| 2562 | SQLITE_TEXT or SQLITE_BLOB: string, and this will only work if |
| 2563 | the data is UTF8 compatible. |
| 2564 | |
| 2565 | If the db returns a literal or SQL NULL for a value it is converted |
| 2566 | to a JSON null. If it somehow finds a column type it cannot handle, |
| 2567 | the value is also converted to a NULL in the output. |
| 2568 | |
| 2569 | Example |
| 2570 | |
| 2571 | @code |
| 2572 | cson_value * json = NULL; |
| 2573 | int rc = cson_sqlite3_stmt_to_json( myStatement, &json, 1 ); |
| 2574 | if( 0 != rc ) { ... error ... } |
| 2575 | else { |
| @@ -2603,14 +2603,14 @@ | |
| 2603 | TODO: add Object support for named parameters. |
| 2604 | |
| 2605 | Returns 0 on success, non-0 on error. |
| 2606 | */ |
| 2607 | int cson_sqlite3_bind_value( sqlite3_stmt * st, int ndx, cson_value const * v ); |
| 2608 | |
| 2609 | #if defined(__cplusplus) |
| 2610 | } /*extern "C"*/ |
| 2611 | #endif |
| 2612 | |
| 2613 | #endif /* CSON_ENABLE_SQLITE3 */ |
| 2614 | #endif /* WANDERINGHORSE_NET_CSON_SQLITE3_H_INCLUDED */ |
| 2615 | /* end file include/wh/cson/cson_sqlite3.h */ |
| 2616 | #endif /* FOSSIL_ENABLE_JSON */ |
| 2617 |
| --- src/cson_amalgamation.h | |
| +++ src/cson_amalgamation.h | |
| @@ -59,11 +59,11 @@ | |
| 59 | #define CSON_INT_T_PFMT "I64d" |
| 60 | #elif (__STDC_VERSION__ >= 199901L) || (HAVE_LONG_LONG == 1) |
| 61 | typedef long long cson_int_t; |
| 62 | #define CSON_INT_T_SFMT "lld" |
| 63 | #define CSON_INT_T_PFMT "lld" |
| 64 | #else |
| 65 | typedef long cson_int_t; |
| 66 | #define CSON_INT_T_SFMT "ld" |
| 67 | #define CSON_INT_T_PFMT "ld" |
| 68 | #endif |
| 69 | |
| @@ -215,11 +215,11 @@ | |
| 215 | Convenience typedef. |
| 216 | */ |
| 217 | typedef struct cson_value cson_value; |
| 218 | |
| 219 | /** @struct cson_value |
| 220 | |
| 221 | The core value type of this API. It is opaque to clients, and |
| 222 | only the cson public API should be used for setting or |
| 223 | inspecting their values. |
| 224 | |
| 225 | This class is opaque because stack-based usage can easily cause |
| @@ -231,11 +231,11 @@ | |
| 231 | counting) as long as those insertions do not cause cycles. However, |
| 232 | be very aware that such value re-use uses a reference to the |
| 233 | original copy, meaning that if its value is changed once, it is |
| 234 | changed everywhere. Also beware that multi-threaded write |
| 235 | operations on such references leads to undefined behaviour. |
| 236 | |
| 237 | PLEASE read the ACHTUNGEN below... |
| 238 | |
| 239 | ACHTUNG #1: |
| 240 | |
| 241 | cson_values MUST NOT form cycles (e.g. via object or array |
| @@ -244,33 +244,33 @@ | |
| 244 | Not abiding th Holy Law Of No Cycles will lead to double-frees and |
| 245 | the like (i.e. undefined behaviour, likely crashes due to infinite |
| 246 | recursion or stepping on invalid (freed) pointers). |
| 247 | |
| 248 | ACHTUNG #2: |
| 249 | |
| 250 | ALL cson_values returned as non-const cson_value pointers from any |
| 251 | public functions in the cson API are to be treated as if they are |
| 252 | heap-allocated, and MUST be freed by client by doing ONE of: |
| 253 | |
| 254 | - Passing it to cson_value_free(). |
| 255 | |
| 256 | - Adding it to an Object or Array, in which case the object/array |
| 257 | takes over ownership. As of 20110323, a value may be inserted into |
| 258 | a single container multiple times, or into multiple containers, |
| 259 | in which case they all share ownership (via reference counting) |
| 260 | of the original value (meaning any changes to it are visible in |
| 261 | all references to it). |
| 262 | |
| 263 | Each call to cson_value_new_xxx() MUST eventually be followed up |
| 264 | by one of those options. |
| 265 | |
| 266 | Some cson_value_new_XXX() implementations do not actually allocate |
| 267 | memory, but this is an internal implementation detail. Client code |
| 268 | MUST NOT rely on this behaviour and MUST treat each object |
| 269 | returned by such a function as if it was a freshly-allocated copy |
| 270 | (even if their pointer addresses are the same). |
| 271 | |
| 272 | ACHTUNG #3: |
| 273 | |
| 274 | Note that ACHTUNG #2 tells us that we must always free (or transfer |
| 275 | ownership of) all pointers returned bycson_value_new_xxx(), but |
| 276 | that two calls to (e.g.) cson_value_new_bool(1) will (or might) |
| @@ -315,11 +315,11 @@ | |
| 315 | if( 0 == rc ) {...success...} |
| 316 | else if( cson_rc.ArgError == rc ) { ... some argument was wrong ... } |
| 317 | else if( cson_rc.AllocError == rc ) { ... allocation error ... } |
| 318 | ... |
| 319 | @endcode |
| 320 | |
| 321 | The entries named Parse_XXX are generally only returned by |
| 322 | cson_parse() and friends. |
| 323 | */ |
| 324 | |
| 325 | /** @struct cson_rc_ |
| @@ -472,11 +472,11 @@ | |
| 472 | |
| 473 | /** |
| 474 | Length, in bytes. |
| 475 | */ |
| 476 | unsigned int length; |
| 477 | |
| 478 | /** |
| 479 | Error code of the parse run (0 for no error). |
| 480 | */ |
| 481 | int errorCode; |
| 482 | |
| @@ -523,11 +523,11 @@ | |
| 523 | /** |
| 524 | Specifies how to indent (or not) output. The values |
| 525 | are: |
| 526 | |
| 527 | (0) == no extra indentation. |
| 528 | |
| 529 | (1) == 1 TAB character for each level. |
| 530 | |
| 531 | (>1) == that number of SPACES for each level. |
| 532 | */ |
| 533 | unsigned char indentation; |
| @@ -536,11 +536,11 @@ | |
| 536 | Maximum object/array depth to traverse. Traversing deeply can |
| 537 | be indicative of cycles in the object/array tree, and this |
| 538 | value is used to figure out when to abort the traversal. |
| 539 | */ |
| 540 | unsigned short maxDepth; |
| 541 | |
| 542 | /** |
| 543 | If true, a newline will be added to generated output, |
| 544 | else not. |
| 545 | */ |
| 546 | char addNewline; |
| @@ -636,11 +636,11 @@ | |
| 636 | |
| 637 | Must return 0 on success, non-0 on error (preferably a value from |
| 638 | cson_rc). |
| 639 | |
| 640 | These functions are called relatively often during the JSON-output |
| 641 | process, and should try to be fast. |
| 642 | */ |
| 643 | typedef int (*cson_data_dest_f)( void * state, void const * src, unsigned int n ); |
| 644 | |
| 645 | /** |
| 646 | Reads JSON-formatted string data (in ASCII, UTF8, or UTF16), using the |
| @@ -664,15 +664,15 @@ | |
| 664 | used. |
| 665 | |
| 666 | The info argument may be NULL. If it is not NULL then the parser |
| 667 | populates it with information which is useful in error |
| 668 | reporting. Namely, it contains the line/column of parse errors. |
| 669 | |
| 670 | The srcState argument is ignored by this function but is passed on to src, |
| 671 | so any output-destination-specific state can be stored there and accessed |
| 672 | via the src callback. |
| 673 | |
| 674 | Non-parse error conditions include: |
| 675 | |
| 676 | - (!tgt) or !src: cson_rc.ArgError |
| 677 | - cson_rc.AllocError can happen at any time during the input phase |
| 678 | |
| @@ -725,11 +725,11 @@ | |
| 725 | TODOs: |
| 726 | |
| 727 | - Buffer the input in larger chunks. We currently read |
| 728 | byte-by-byte, but i'm too tired to write/test the looping code for |
| 729 | the buffering. |
| 730 | |
| 731 | @see cson_parse_FILE() |
| 732 | @see cson_parse_string() |
| 733 | */ |
| 734 | int cson_parse( cson_value ** tgt, cson_data_source_f src, void * srcState, |
| 735 | cson_parse_opt const * opt, cson_parse_info * info ); |
| @@ -786,11 +786,11 @@ | |
| 786 | The destState parameter is ignored by this function and is passed |
| 787 | on to the dest function. |
| 788 | |
| 789 | Returns 0 on success. On error, any amount of output might have been |
| 790 | generated before the error was triggered. |
| 791 | |
| 792 | Example: |
| 793 | |
| 794 | @code |
| 795 | int rc = cson_output( myValue, cson_data_dest_FILE, stdout, NULL ); |
| 796 | // basically equivalent to: cson_output_FILE( myValue, stdout, NULL ); |
| @@ -925,15 +925,15 @@ | |
| 925 | /** |
| 926 | Converts the given value to a boolean, using JavaScript semantics depending |
| 927 | on the concrete type of val: |
| 928 | |
| 929 | undef or null: false |
| 930 | |
| 931 | boolean: same |
| 932 | |
| 933 | integer, double: 0 or 0.0 == false, else true |
| 934 | |
| 935 | object, array: true |
| 936 | |
| 937 | string: length-0 string is false, else true. |
| 938 | |
| 939 | Returns 0 on success and assigns *v (if v is not NULL) to either 0 or 1. |
| @@ -945,18 +945,18 @@ | |
| 945 | Similar to cson_value_fetch_bool(), but fetches an integer value. |
| 946 | |
| 947 | The conversion, if any, depends on the concrete type of val: |
| 948 | |
| 949 | NULL, null, undefined: *v is set to 0 and 0 is returned. |
| 950 | |
| 951 | string, object, array: *v is set to 0 and |
| 952 | cson_rc.TypeError is returned. The error may normally be safely |
| 953 | ignored, but it is provided for those wanted to know whether a direct |
| 954 | conversion was possible. |
| 955 | |
| 956 | integer: *v is set to the int value and 0 is returned. |
| 957 | |
| 958 | double: *v is set to the value truncated to int and 0 is returned. |
| 959 | */ |
| 960 | int cson_value_fetch_integer( cson_value const * val, cson_int_t * v ); |
| 961 | |
| 962 | /** |
| @@ -1084,11 +1084,11 @@ | |
| 1084 | |
| 1085 | - The maximum number of bytes compared is the lesser of rhsLen and |
| 1086 | the length of lhs. If the strings do not match, but compare equal |
| 1087 | up to the just-described comparison length, the shorter string is |
| 1088 | considered to be less-than the longer one. |
| 1089 | |
| 1090 | - If lhs and rhs are both NULL, or both have a length of 0 then they will |
| 1091 | compare equal. |
| 1092 | |
| 1093 | - If lhs is null/length-0 but rhs is not then lhs is considered to be less-than |
| 1094 | rhs. |
| @@ -1110,11 +1110,11 @@ | |
| 1110 | Returns the length, in bytes, of str, or 0 if str is NULL. This is |
| 1111 | an O(1) operation. |
| 1112 | |
| 1113 | TODO: add cson_string_length_chars() (is O(N) unless we add another |
| 1114 | member to store the char length). |
| 1115 | |
| 1116 | @see cson_string_cstr() |
| 1117 | */ |
| 1118 | unsigned int cson_string_length_bytes( cson_string const * str ); |
| 1119 | |
| 1120 | /** |
| @@ -1207,11 +1207,11 @@ | |
| 1207 | ar is expanded, if needed, to be able to hold at least (ndx+1) |
| 1208 | items, and any new entries created by that expansion are empty |
| 1209 | (NULL values). |
| 1210 | |
| 1211 | On success, 0 is returned and ownership of v is transfered to ar. |
| 1212 | |
| 1213 | On error ownership of v is NOT modified, and the caller may still |
| 1214 | need to clean it up. For example, the following code will introduce |
| 1215 | a leak if this function fails: |
| 1216 | |
| 1217 | @code |
| @@ -1240,11 +1240,11 @@ | |
| 1240 | |
| 1241 | This is functionally equivalent to |
| 1242 | cson_array_set(ar,cson_array_length_get(ar),v), but this |
| 1243 | implementation has slightly different array-preallocation policy |
| 1244 | (it grows more eagerly). |
| 1245 | |
| 1246 | Returns 0 on success, non-zero on error. Error cases include: |
| 1247 | |
| 1248 | - ar or v are NULL: cson_rc.ArgError |
| 1249 | |
| 1250 | - Array cannot be expanded to hold enough elements: cson_rc.AllocError. |
| @@ -1283,11 +1283,11 @@ | |
| 1283 | cson_value * cson_new_bool(char v); |
| 1284 | |
| 1285 | /** |
| 1286 | Returns the special JSON "null" value. When outputing JSON, |
| 1287 | its string representation is "null" (without the quotes). |
| 1288 | |
| 1289 | See cson_value_new_bool() for notes regarding the returned |
| 1290 | value's memory. |
| 1291 | */ |
| 1292 | cson_value * cson_value_null(); |
| 1293 | |
| @@ -1323,16 +1323,16 @@ | |
| 1323 | |
| 1324 | /** |
| 1325 | Semantically the same as cson_value_new_bool(), but for strings. |
| 1326 | This creates a JSON value which copies the first n bytes of str. |
| 1327 | The string will automatically be NUL-terminated. |
| 1328 | |
| 1329 | Note that if str is NULL or n is 0, this function still |
| 1330 | returns non-NULL value representing that empty string. |
| 1331 | |
| 1332 | Returns NULL on allocation error. |
| 1333 | |
| 1334 | See cson_value_new_bool() for important information about the |
| 1335 | returned memory. |
| 1336 | */ |
| 1337 | cson_value * cson_value_new_string( char const * str, unsigned int n ); |
| 1338 | |
| @@ -1354,11 +1354,11 @@ | |
| 1354 | This works like cson_value_new_object() but returns an Object |
| 1355 | handle directly. |
| 1356 | |
| 1357 | The value handle for the returned object can be fetched with |
| 1358 | cson_object_value(theObject). |
| 1359 | |
| 1360 | Ownership is transfered to the caller, who must eventually free it |
| 1361 | by passing the Value handle (NOT the Object handle) to |
| 1362 | cson_value_free() or passing ownership to a parent container. |
| 1363 | |
| 1364 | Returns NULL on error (out of memory). |
| @@ -1419,11 +1419,11 @@ | |
| 1419 | cson_value_add_reference(). Even if this function does not |
| 1420 | immediately destroy the value, the value must be considered, from |
| 1421 | the perspective of that client code, to have been |
| 1422 | destroyed/invalidated by this call. |
| 1423 | |
| 1424 | |
| 1425 | @see cson_value_new_object() |
| 1426 | @see cson_value_new_array() |
| 1427 | @see cson_value_add_reference() |
| 1428 | */ |
| 1429 | void cson_value_free(cson_value * v); |
| @@ -1445,11 +1445,11 @@ | |
| 1445 | case, the key is set to the special null value. |
| 1446 | |
| 1447 | The key may be encoded as ASCII or UTF8. Results are undefined |
| 1448 | with other encodings, and the errors won't show up here, but may |
| 1449 | show up later, e.g. during output. |
| 1450 | |
| 1451 | Returns 0 on success, non-0 on error. It has the following error |
| 1452 | cases: |
| 1453 | |
| 1454 | - cson_rc.ArgError: obj or key are NULL or strlen(key) is 0. |
| 1455 | |
| @@ -1498,11 +1498,11 @@ | |
| 1498 | */ |
| 1499 | int cson_object_set_s( cson_object * obj, cson_string * key, cson_value * v ); |
| 1500 | |
| 1501 | /** |
| 1502 | Removes a property from an object. |
| 1503 | |
| 1504 | If obj contains the given key, it is removed and 0 is returned. If |
| 1505 | it is not found, cson_rc.NotFoundError is returned (which can |
| 1506 | normally be ignored by client code). |
| 1507 | |
| 1508 | cson_rc.ArgError is returned if obj or key are NULL or key has |
| @@ -1569,33 +1569,33 @@ | |
| 1569 | |
| 1570 | If it finds the given path, it returns the value by assiging *tgt |
| 1571 | to it. If tgt is NULL then this function has no side-effects but |
| 1572 | will return 0 if the given path is found within the object, so it can be used |
| 1573 | to test for existence without fetching it. |
| 1574 | |
| 1575 | Returns 0 if it finds an entry, cson_rc.NotFoundError if it finds |
| 1576 | no item, and any other non-zero error code on a "real" error. Errors include: |
| 1577 | |
| 1578 | - obj or path are NULL: cson_rc.ArgError |
| 1579 | |
| 1580 | - separator is 0, or path is an empty string or contains only |
| 1581 | separator characters: cson_rc.RangeError |
| 1582 | |
| 1583 | - There is an upper limit on how long a single path component may |
| 1584 | be (some "reasonable" internal size), and cson_rc.RangeError is |
| 1585 | returned if that length is violated. |
| 1586 | |
| 1587 | |
| 1588 | Limitations: |
| 1589 | |
| 1590 | - It has no way to fetch data from arrays this way. i could |
| 1591 | imagine, e.g., a path of "subobj.subArray.0" for |
| 1592 | subobj.subArray[0], or "0.3.1" for [0][3][1]. But i'm too |
| 1593 | lazy/tired to add this. |
| 1594 | |
| 1595 | Example usage: |
| 1596 | |
| 1597 | |
| 1598 | Assume we have a JSON structure which abstractly looks like: |
| 1599 | |
| 1600 | @code |
| 1601 | {"subobj":{"subsubobj":{"myValue":[1,2,3]}}} |
| @@ -1613,11 +1613,11 @@ | |
| 1613 | "subobj/subsubobj/myValue" with separator='/' is equivalent the |
| 1614 | path "subobj.subsubobj.myValue" with separator='.'. The value of 0 |
| 1615 | is not legal as a separator character because we cannot |
| 1616 | distinguish that use from the real end-of-string without requiring |
| 1617 | the caller to also pass in the length of the string. |
| 1618 | |
| 1619 | Multiple successive separators in the list are collapsed into a |
| 1620 | single separator for parsing purposes. e.g. the path "a...b...c" |
| 1621 | (separator='.') is equivalent to "a.b.c". |
| 1622 | |
| 1623 | @see cson_object_get_sub() |
| @@ -1700,11 +1700,11 @@ | |
| 1700 | @see cson_object_iter_init() |
| 1701 | @see cson_object_iter_next() |
| 1702 | */ |
| 1703 | struct cson_object_iterator |
| 1704 | { |
| 1705 | |
| 1706 | /** @internal |
| 1707 | The underlying object. |
| 1708 | */ |
| 1709 | cson_object const * obj; |
| 1710 | /** @internal |
| @@ -1771,11 +1771,11 @@ | |
| 1771 | ... |
| 1772 | } |
| 1773 | @endcode |
| 1774 | |
| 1775 | There is no need to clean up an iterator, as it holds no dynamic resources. |
| 1776 | |
| 1777 | @see cson_kvp_key() |
| 1778 | @see cson_kvp_value() |
| 1779 | */ |
| 1780 | cson_kvp * cson_object_iter_next( cson_object_iterator * iter ); |
| 1781 | |
| @@ -1863,11 +1863,11 @@ | |
| 1863 | buf = cson_buffer_empty; |
| 1864 | @endcode |
| 1865 | |
| 1866 | (You might also need to store buf.used and buf.capacity, |
| 1867 | depending on what you want to do with the memory.) |
| 1868 | |
| 1869 | When doing so, the memory must eventually be passed to free() |
| 1870 | to deallocate it. |
| 1871 | */ |
| 1872 | unsigned char * mem; |
| 1873 | }; |
| @@ -1894,11 +1894,11 @@ | |
| 1894 | On error non-zero is returned. Errors include: |
| 1895 | |
| 1896 | - Invalid arguments: cson_rc.ArgError |
| 1897 | |
| 1898 | - Buffer cannot be expanded (runs out of memory): cson_rc.AllocError |
| 1899 | |
| 1900 | Example usage: |
| 1901 | |
| 1902 | @code |
| 1903 | cson_buffer buf = cson_buffer_empty; |
| 1904 | // optional: cson_buffer_reserve(&buf, 1024 * 10); |
| @@ -1918,13 +1918,13 @@ | |
| 1918 | buf = cson_buffer_empty; |
| 1919 | ... |
| 1920 | free(mem); |
| 1921 | } |
| 1922 | @endcode |
| 1923 | |
| 1924 | @see cson_output() |
| 1925 | |
| 1926 | */ |
| 1927 | int cson_output_buffer( cson_value const * v, cson_buffer * buf, |
| 1928 | cson_output_opt const * opt ); |
| 1929 | |
| 1930 | /** |
| @@ -1993,11 +1993,11 @@ | |
| 1993 | calling cson_buffer_reserve(dest,0). |
| 1994 | |
| 1995 | dest->mem might (and possibly will) be (re)allocated by this |
| 1996 | function, so any pointers to it held from before this call might be |
| 1997 | invalidated by this call. |
| 1998 | |
| 1999 | On error non-0 is returned and dest has almost certainly been |
| 2000 | modified but its state must be considered incomplete. |
| 2001 | |
| 2002 | Errors include: |
| 2003 | |
| @@ -2042,11 +2042,11 @@ | |
| 2042 | void * mem = buf.mem; |
| 2043 | buf = cson_buffer_empty; |
| 2044 | @endcode |
| 2045 | |
| 2046 | In which case the memory must eventually be passed to free() to |
| 2047 | free it. |
| 2048 | */ |
| 2049 | int cson_buffer_fill_from( cson_buffer * dest, cson_data_source_f src, void * state ); |
| 2050 | |
| 2051 | |
| 2052 | /** |
| @@ -2072,11 +2072,11 @@ | |
| 2072 | for other sharing points which added a reference. |
| 2073 | |
| 2074 | Normally any such value handles would be invalidated when the |
| 2075 | parent container(s) is/are cleaned up, but this function can be |
| 2076 | used to effectively delay the cleanup. |
| 2077 | |
| 2078 | This function, at its lowest level, increments the value's |
| 2079 | reference count by 1. |
| 2080 | |
| 2081 | To decrement the reference count, pass the value to |
| 2082 | cson_value_free(), after which the value must be considered, from |
| @@ -2091,11 +2091,11 @@ | |
| 2091 | errors long before the reference count could overflow (assuming |
| 2092 | those reference counts come from container insertions, as opposed |
| 2093 | to via this function). |
| 2094 | |
| 2095 | Insider notes which clients really need to know: |
| 2096 | |
| 2097 | For shared/constant value instances, such as those returned by |
| 2098 | cson_value_true() and cson_value_null(), this function has no side |
| 2099 | effects - it does not actually modify the reference count because |
| 2100 | (A) those instances are shared across all client code and (B) those |
| 2101 | objects are static and never get cleaned up. However, that is an |
| @@ -2173,11 +2173,11 @@ | |
| 2173 | returned object will be of the same logical type as orig. |
| 2174 | |
| 2175 | ACHTUNG: if orig contains any cyclic references at any depth level |
| 2176 | this function will endlessly recurse. (Having _any_ cyclic |
| 2177 | references violates this library's requirements.) |
| 2178 | |
| 2179 | Returns NULL if orig is NULL or if cloning fails. Assuming that |
| 2180 | orig is in a valid state, the only "likely" error case is that an |
| 2181 | allocation fails while constructing the clone. In other words, if |
| 2182 | cloning fails due to something other than an allocation error then |
| 2183 | either orig is in an invalid state or there is a bug. |
| @@ -2278,11 +2278,11 @@ | |
| 2278 | --key=VAL : Treats VAL as either a double, integer, or string. |
| 2279 | |
| 2280 | --key= : Treats key as a JSON null (not literal NULL) value. |
| 2281 | |
| 2282 | Arguments not starting with a dash are skipped. |
| 2283 | |
| 2284 | Each key/value pair is inserted into an object. If a given key |
| 2285 | appears more than once then only the final entry is actually |
| 2286 | stored. |
| 2287 | |
| 2288 | argc and argv are expected to be values from main() (or similar, |
| @@ -2434,22 +2434,22 @@ | |
| 2434 | Integer, double, null, or string (TEXT and BLOB data, though not |
| 2435 | all blob data is legal for a JSON string). |
| 2436 | |
| 2437 | st must be a sqlite3_step()'d row and col must be a 0-based column |
| 2438 | index within that result row. |
| 2439 | */ |
| 2440 | cson_value * cson_sqlite3_column_to_value( sqlite3_stmt * st, int col ); |
| 2441 | |
| 2442 | /** |
| 2443 | Creates a JSON Array object containing the names of all columns |
| 2444 | of the given prepared statement handle. |
| 2445 | |
| 2446 | Returns a new array value on success, which the caller owns. Its elements |
| 2447 | are in the same order as in the underlying query. |
| 2448 | |
| 2449 | On error NULL is returned. |
| 2450 | |
| 2451 | st is not traversed or freed by this function - only the column |
| 2452 | count and names are read. |
| 2453 | */ |
| 2454 | cson_value * cson_sqlite3_column_names( sqlite3_stmt * st ); |
| 2455 | |
| @@ -2494,22 +2494,22 @@ | |
| 2494 | */ |
| 2495 | cson_value * cson_sqlite3_row_to_array( sqlite3_stmt * st ); |
| 2496 | /** |
| 2497 | Converts the results of an sqlite3 SELECT statement to JSON, |
| 2498 | in the form of a cson_value object tree. |
| 2499 | |
| 2500 | st must be a prepared, but not yet traversed, SELECT query. |
| 2501 | tgt must be a pointer to NULL (see the example below). If |
| 2502 | either of those arguments are NULL, cson_rc.ArgError is returned. |
| 2503 | |
| 2504 | This walks the query results and returns a JSON object which |
| 2505 | has a different structure depending on the value of the 'fat' |
| 2506 | argument. |
| 2507 | |
| 2508 | |
| 2509 | If 'fat' is 0 then the structure is: |
| 2510 | |
| 2511 | @code |
| 2512 | { |
| 2513 | "columns":["colName1",..."colNameN"], |
| 2514 | "rows":[ |
| 2515 | [colVal0, ... colValN], |
| @@ -2516,16 +2516,16 @@ | |
| 2516 | [colVal0, ... colValN], |
| 2517 | ... |
| 2518 | ] |
| 2519 | } |
| 2520 | @endcode |
| 2521 | |
| 2522 | In the "non-fat" format the order of the columns and row values is |
| 2523 | guaranteed to be the same as that of the underlying query. |
| 2524 | |
| 2525 | If 'fat' is not 0 then the structure is: |
| 2526 | |
| 2527 | @code |
| 2528 | { |
| 2529 | "columns":["colName1",..."colNameN"], |
| 2530 | "rows":[ |
| 2531 | {"colName1":value1,..."colNameN":valueN}, |
| @@ -2543,33 +2543,33 @@ | |
| 2543 | |
| 2544 | On success it returns 0 and assigns *tgt to a newly-allocated |
| 2545 | JSON object tree (using the above structure), which the caller owns. |
| 2546 | If the query returns no rows, the "rows" value will be an empty |
| 2547 | array, as opposed to null. |
| 2548 | |
| 2549 | On error non-0 is returned and *tgt is not modified. |
| 2550 | |
| 2551 | The error code cson_rc.IOError is used to indicate a db-level |
| 2552 | error, and cson_rc.TypeError is returned if sqlite3_column_count(st) |
| 2553 | returns 0 or less (indicating an invalid or non-SELECT statement). |
| 2554 | |
| 2555 | The JSON data types are determined by the column type as reported |
| 2556 | by sqlite3_column_type(): |
| 2557 | |
| 2558 | SQLITE_INTEGER: integer |
| 2559 | |
| 2560 | SQLITE_FLOAT: double |
| 2561 | |
| 2562 | SQLITE_TEXT or SQLITE_BLOB: string, and this will only work if |
| 2563 | the data is UTF8 compatible. |
| 2564 | |
| 2565 | If the db returns a literal or SQL NULL for a value it is converted |
| 2566 | to a JSON null. If it somehow finds a column type it cannot handle, |
| 2567 | the value is also converted to a NULL in the output. |
| 2568 | |
| 2569 | Example |
| 2570 | |
| 2571 | @code |
| 2572 | cson_value * json = NULL; |
| 2573 | int rc = cson_sqlite3_stmt_to_json( myStatement, &json, 1 ); |
| 2574 | if( 0 != rc ) { ... error ... } |
| 2575 | else { |
| @@ -2603,14 +2603,14 @@ | |
| 2603 | TODO: add Object support for named parameters. |
| 2604 | |
| 2605 | Returns 0 on success, non-0 on error. |
| 2606 | */ |
| 2607 | int cson_sqlite3_bind_value( sqlite3_stmt * st, int ndx, cson_value const * v ); |
| 2608 | |
| 2609 | #if defined(__cplusplus) |
| 2610 | } /*extern "C"*/ |
| 2611 | #endif |
| 2612 | |
| 2613 | #endif /* CSON_ENABLE_SQLITE3 */ |
| 2614 | #endif /* WANDERINGHORSE_NET_CSON_SQLITE3_H_INCLUDED */ |
| 2615 | /* end file include/wh/cson/cson_sqlite3.h */ |
| 2616 | #endif /* FOSSIL_ENABLE_JSON */ |
| 2617 |
+1
-2
| --- src/mkindex.c | ||
| +++ src/mkindex.c | ||
| @@ -351,12 +351,11 @@ | ||
| 351 | 351 | /* Output strings for all the help text */ |
| 352 | 352 | for(i=0; i<nFixed; i++){ |
| 353 | 353 | char *z = aEntry[i].zHelp; |
| 354 | 354 | if( z==0 ) continue; |
| 355 | 355 | if( aEntry[i].zIf ) printf("%s", aEntry[i].zIf); |
| 356 | - printf("static const char zHelp%03d[] = \n", aEntry[i].iHelp); | |
| 357 | - printf(" \""); | |
| 356 | + printf("static const char zHelp%03d[] =\n \"", aEntry[i].iHelp); | |
| 358 | 357 | while( *z ){ |
| 359 | 358 | if( *z=='\n' ){ |
| 360 | 359 | printf("\\n\"\n \""); |
| 361 | 360 | }else if( *z=='"' ){ |
| 362 | 361 | printf("\\\""); |
| 363 | 362 |
| --- src/mkindex.c | |
| +++ src/mkindex.c | |
| @@ -351,12 +351,11 @@ | |
| 351 | /* Output strings for all the help text */ |
| 352 | for(i=0; i<nFixed; i++){ |
| 353 | char *z = aEntry[i].zHelp; |
| 354 | if( z==0 ) continue; |
| 355 | if( aEntry[i].zIf ) printf("%s", aEntry[i].zIf); |
| 356 | printf("static const char zHelp%03d[] = \n", aEntry[i].iHelp); |
| 357 | printf(" \""); |
| 358 | while( *z ){ |
| 359 | if( *z=='\n' ){ |
| 360 | printf("\\n\"\n \""); |
| 361 | }else if( *z=='"' ){ |
| 362 | printf("\\\""); |
| 363 |
| --- src/mkindex.c | |
| +++ src/mkindex.c | |
| @@ -351,12 +351,11 @@ | |
| 351 | /* Output strings for all the help text */ |
| 352 | for(i=0; i<nFixed; i++){ |
| 353 | char *z = aEntry[i].zHelp; |
| 354 | if( z==0 ) continue; |
| 355 | if( aEntry[i].zIf ) printf("%s", aEntry[i].zIf); |
| 356 | printf("static const char zHelp%03d[] =\n \"", aEntry[i].iHelp); |
| 357 | while( *z ){ |
| 358 | if( *z=='\n' ){ |
| 359 | printf("\\n\"\n \""); |
| 360 | }else if( *z=='"' ){ |
| 361 | printf("\\\""); |
| 362 |
+39
-39
| --- www/fossil.eps | ||
| +++ www/fossil.eps | ||
| @@ -1,6 +1,6 @@ | ||
| 1 | -%!PS-Adobe-3.0 EPSF-3.0 | |
| 1 | +%!PS-Adobe-3.0 EPSF-3.0 | |
| 2 | 2 | %%BoundingBox: 0 0 249 284 |
| 3 | 3 | %%Pages: 0 |
| 4 | 4 | %%Creator: Sun Microsystems, Inc. |
| 5 | 5 | %%Title: none |
| 6 | 6 | %%CreationDate: none |
| @@ -48,82 +48,82 @@ | ||
| 48 | 48 | %%EndSetup |
| 49 | 49 | %%Page: 1 1 |
| 50 | 50 | %%BeginPageSetup |
| 51 | 51 | %%EndPageSetup |
| 52 | 52 | pum |
| 53 | -0.02835 0.02837 s | |
| 53 | +0.02835 0.02837 s | |
| 54 | 54 | 0 -10008 t |
| 55 | 55 | /tm matrix currentmatrix def |
| 56 | 56 | tm setmatrix |
| 57 | --4875 -2599 t | |
| 58 | -1 1 s | |
| 59 | -0.500 c 7207 8311 m 7036 8281 6990 7727 7105 7073 ct 7221 6420 7453 5915 7625 5945 ct | |
| 57 | +-4875 -2599 t | |
| 58 | +1 1 s | |
| 59 | +0.500 c 7207 8311 m 7036 8281 6990 7727 7105 7073 ct 7221 6420 7453 5915 7625 5945 ct | |
| 60 | 60 | 7796 5975 7842 6529 7727 7183 ct 7612 7836 7379 8342 7207 8311 ct p ef |
| 61 | -7607 10301 m 7445 10335 7221 9926 7107 9387 ct 6992 8847 7030 8382 7192 8348 ct | |
| 61 | +7607 10301 m 7445 10335 7221 9926 7107 9387 ct 6992 8847 7030 8382 7192 8348 ct | |
| 62 | 62 | 7354 8313 7578 8723 7693 9262 ct 7807 9802 7769 10267 7607 10301 ct p ef |
| 63 | -8749 11736 m 8626 11826 8289 11574 7995 11173 ct 7701 10773 7563 10375 7686 10285 ct | |
| 63 | +8749 11736 m 8626 11826 8289 11574 7995 11173 ct 7701 10773 7563 10375 7686 10285 ct | |
| 64 | 64 | 7809 10195 8146 10446 8440 10847 ct 8734 11248 8872 11645 8749 11736 ct p ef |
| 65 | -10691 12070 m 10668 12234 10205 12303 9658 12223 ct 9111 12143 8686 11946 8710 11782 ct | |
| 65 | +10691 12070 m 10668 12234 10205 12303 9658 12223 ct 9111 12143 8686 11946 8710 11782 ct | |
| 66 | 66 | 8734 11618 9197 11550 9744 11629 ct 10291 11709 10715 11906 10691 12070 ct p ef |
| 67 | -10761 12053 m 10721 11951 11064 11722 11526 11541 ct 11989 11360 12396 11296 12436 11398 ct | |
| 68 | -12476 11500 12134 11729 11671 11910 ct 11208 12091 10801 12155 10761 12053 ct | |
| 67 | +10761 12053 m 10721 11951 11064 11722 11526 11541 ct 11989 11360 12396 11296 12436 11398 ct | |
| 68 | +12476 11500 12134 11729 11671 11910 ct 11208 12091 10801 12155 10761 12053 ct | |
| 69 | 69 | p ef |
| 70 | -12410 11353 m 12365 11314 12499 11087 12709 10847 ct 12920 10607 13126 10444 13171 10483 ct | |
| 71 | -13216 10522 13082 10749 12872 10989 ct 12662 11230 12455 11392 12410 11353 ct | |
| 70 | +12410 11353 m 12365 11314 12499 11087 12709 10847 ct 12920 10607 13126 10444 13171 10483 ct | |
| 71 | +13216 10522 13082 10749 12872 10989 ct 12662 11230 12455 11392 12410 11353 ct | |
| 72 | 72 | p ef |
| 73 | -7901 12525 m 7790 12525 7700 12212 7700 11826 ct 7700 11440 7790 11127 7901 11127 ct | |
| 73 | +7901 12525 m 7790 12525 7700 12212 7700 11826 ct 7700 11440 7790 11127 7901 11127 ct | |
| 74 | 74 | 8012 11127 8102 11440 8102 11826 ct 8102 12212 8012 12525 7901 12525 ct p ef |
| 75 | -7826 12575 m 7765 12668 7415 12547 7044 12306 ct 6672 12064 6420 11793 6480 11700 ct | |
| 75 | +7826 12575 m 7765 12668 7415 12547 7044 12306 ct 6672 12064 6420 11793 6480 11700 ct | |
| 76 | 76 | 6541 11607 6891 11728 7262 11970 ct 7634 12211 7886 12482 7826 12575 ct p ef |
| 77 | -6460 11694 m 6435 11723 6333 11673 6234 11584 ct 6134 11494 6073 11399 6099 11371 ct | |
| 77 | +6460 11694 m 6435 11723 6333 11673 6234 11584 ct 6134 11494 6073 11399 6099 11371 ct | |
| 78 | 78 | 6124 11343 6225 11392 6325 11482 ct 6425 11571 6485 11666 6460 11694 ct p ef |
| 79 | -13183 10437 m 13129 10414 13185 10157 13309 9863 ct 13433 9569 13579 9350 13633 9373 ct | |
| 79 | +13183 10437 m 13129 10414 13185 10157 13309 9863 ct 13433 9569 13579 9350 13633 9373 ct | |
| 80 | 80 | 13688 9396 13632 9653 13508 9947 ct 13384 10241 13238 10460 13183 10437 ct p ef |
| 81 | -9900 11524 m 9790 11524 9701 11211 9701 10825 ct 9701 10439 9790 10126 9900 10126 ct | |
| 82 | -10009 10126 10098 10439 10098 10825 ct 10098 11211 10009 11524 9900 11524 ct | |
| 81 | +9900 11524 m 9790 11524 9701 11211 9701 10825 ct 9701 10439 9790 10126 9900 10126 ct | |
| 82 | +10009 10126 10098 10439 10098 10825 ct 10098 11211 10009 11524 9900 11524 ct | |
| 83 | 83 | p ef |
| 84 | -9828 11574 m 9767 11667 9417 11546 9046 11305 ct 8674 11063 8422 10792 8482 10699 ct | |
| 84 | +9828 11574 m 9767 11667 9417 11546 9046 11305 ct 8674 11063 8422 10792 8482 10699 ct | |
| 85 | 85 | 8543 10606 8893 10727 9264 10969 ct 9636 11210 9888 11481 9828 11574 ct p ef |
| 86 | -6085 9230 m 5976 9131 6097 8819 6357 8533 ct 6616 8247 6915 8095 7024 8194 ct | |
| 86 | +6085 9230 m 5976 9131 6097 8819 6357 8533 ct 6616 8247 6915 8095 7024 8194 ct | |
| 87 | 87 | 7133 8293 7012 8605 6752 8892 ct 6493 9178 6194 9329 6085 9230 ct p ef |
| 88 | -5910 9182 m 5805 9210 5629 8884 5516 8456 ct 5403 8027 5396 7657 5501 7629 ct | |
| 88 | +5910 9182 m 5805 9210 5629 8884 5516 8456 ct 5403 8027 5396 7657 5501 7629 ct | |
| 89 | 89 | 5605 7601 5782 7927 5895 8356 ct 6008 8784 6014 9154 5910 9182 ct p ef |
| 90 | -8630 9345 m 8548 9270 8691 8978 8951 8692 ct 9210 8406 9487 8234 9569 8309 ct | |
| 90 | +8630 9345 m 8548 9270 8691 8978 8951 8692 ct 9210 8406 9487 8234 9569 8309 ct | |
| 91 | 91 | 9651 8383 9507 8675 9248 8961 ct 8989 9247 8712 9419 8630 9345 ct p ef |
| 92 | -8566 9556 m 8478 9624 8188 9394 7918 9043 ct 7647 8692 7499 8352 7587 8285 ct | |
| 92 | +8566 9556 m 8478 9624 8188 9394 7918 9043 ct 7647 8692 7499 8352 7587 8285 ct | |
| 93 | 93 | 7675 8217 7965 8447 8235 8798 ct 8506 9149 8654 9489 8566 9556 ct p ef |
| 94 | -6579 11626 m 6549 11638 6480 11543 6425 11413 ct 6371 11283 6352 11167 6382 11154 ct | |
| 94 | +6579 11626 m 6549 11638 6480 11543 6425 11413 ct 6371 11283 6352 11167 6382 11154 ct | |
| 95 | 95 | 6412 11141 6481 11237 6535 11367 ct 6590 11497 6609 11613 6579 11626 ct p ef |
| 96 | -5952 11674 m 5959 11642 6081 11642 6223 11674 ct 6366 11707 6475 11759 6468 11791 ct | |
| 96 | +5952 11674 m 5959 11642 6081 11642 6223 11674 ct 6366 11707 6475 11759 6468 11791 ct | |
| 97 | 97 | 6461 11823 6339 11823 6197 11790 ct 6054 11758 5945 11706 5952 11674 ct p ef |
| 98 | -5384 7615 m 5359 7644 5257 7594 5158 7505 ct 5058 7415 4997 7320 5023 7292 ct | |
| 98 | +5384 7615 m 5359 7644 5257 7594 5158 7505 ct 5058 7415 4997 7320 5023 7292 ct | |
| 99 | 99 | 5048 7264 5149 7313 5249 7403 ct 5349 7492 5409 7587 5384 7615 ct p ef |
| 100 | -5503 7547 m 5473 7559 5404 7464 5349 7334 ct 5295 7204 5276 7088 5306 7075 ct | |
| 100 | +5503 7547 m 5473 7559 5404 7464 5349 7334 ct 5295 7204 5276 7088 5306 7075 ct | |
| 101 | 101 | 5336 7062 5405 7158 5459 7288 ct 5514 7418 5533 7534 5503 7547 ct p ef |
| 102 | -4875 7595 m 4882 7562 5004 7563 5147 7595 ct 5289 7628 5399 7680 5392 7712 ct | |
| 102 | +4875 7595 m 4882 7562 5004 7563 5147 7595 ct 5289 7628 5399 7680 5392 7712 ct | |
| 103 | 103 | 5385 7744 5263 7744 5120 7711 ct 4977 7679 4868 7627 4875 7595 ct p ef |
| 104 | -9764 8248 m 9739 8220 9798 8125 9898 8036 ct 9997 7946 10097 7897 10123 7925 ct | |
| 104 | +9764 8248 m 9739 8220 9798 8125 9898 8036 ct 9997 7946 10097 7897 10123 7925 ct | |
| 105 | 105 | 10148 7952 10088 8047 9989 8137 ct 9890 8226 9789 8276 9764 8248 ct p ef |
| 106 | -9641 8179 m 9611 8167 9631 8051 9685 7920 ct 9740 7790 9809 7694 9839 7707 ct | |
| 106 | +9641 8179 m 9611 8167 9631 8051 9685 7920 ct 9740 7790 9809 7694 9839 7707 ct | |
| 107 | 107 | 9869 7720 9850 7836 9795 7966 ct 9741 8097 9672 8192 9641 8179 ct p ef |
| 108 | -10269 8227 m 10276 8259 10167 8311 10024 8343 ct 9882 8375 9760 8375 9753 8343 ct | |
| 108 | +10269 8227 m 10276 8259 10167 8311 10024 8343 ct 9882 8375 9760 8375 9753 8343 ct | |
| 109 | 109 | 9746 8311 9856 8259 9998 8227 ct 10141 8195 10262 8195 10269 8227 ct p ef |
| 110 | -9749 10085 m 9724 10113 9623 10064 9523 9974 ct 9424 9885 9363 9790 9389 9762 ct | |
| 110 | +9749 10085 m 9724 10113 9623 10064 9523 9974 ct 9424 9885 9363 9790 9389 9762 ct | |
| 111 | 111 | 9414 9734 9515 9783 9615 9872 ct 9714 9961 9775 10057 9749 10085 ct p ef |
| 112 | -9868 10017 m 9838 10029 9770 9934 9715 9804 ct 9661 9674 9641 9558 9671 9545 ct | |
| 112 | +9868 10017 m 9838 10029 9770 9934 9715 9804 ct 9661 9674 9641 9558 9671 9545 ct | |
| 113 | 113 | 9702 9533 9770 9628 9824 9758 ct 9879 9888 9898 10004 9868 10017 ct p ef |
| 114 | -9242 10064 m 9249 10032 9371 10032 9513 10064 ct 9656 10097 9765 10149 9758 10181 ct | |
| 114 | +9242 10064 m 9249 10032 9371 10032 9513 10064 ct 9656 10097 9765 10149 9758 10181 ct | |
| 115 | 115 | 9751 10213 9629 10213 9487 10180 ct 9344 10148 9235 10096 9242 10064 ct p ef |
| 116 | -6841 4401 m 6726 4212 7272 3670 8061 3191 ct 8849 2711 9581 2475 9696 2664 ct | |
| 116 | +6841 4401 m 6726 4212 7272 3670 8061 3191 ct 8849 2711 9581 2475 9696 2664 ct | |
| 117 | 117 | 9811 2853 9265 3395 8477 3875 ct 7688 4355 6956 4590 6841 4401 ct p ef |
| 118 | -9097 6042 m 8862 6353 8161 6221 7532 5745 ct 6902 5270 6583 4632 6818 4321 ct | |
| 118 | +9097 6042 m 8862 6353 8161 6221 7532 5745 ct 6902 5270 6583 4632 6818 4321 ct | |
| 119 | 119 | 7053 4009 7754 4142 8384 4617 ct 9013 5092 9333 5730 9097 6042 ct p ef |
| 120 | -7880 5222 m 7747 5124 7957 4611 8349 4075 ct 8742 3540 9168 3185 9302 3283 ct | |
| 120 | +7880 5222 m 7747 5124 7957 4611 8349 4075 ct 8742 3540 9168 3185 9302 3283 ct | |
| 121 | 121 | 9435 3381 9225 3894 8833 4430 ct 8440 4965 8014 5320 7880 5222 ct p ef |
| 122 | -9003 6100 m 8784 6059 8750 5255 8927 4303 ct 9103 3351 9423 2612 9642 2652 ct | |
| 122 | +9003 6100 m 8784 6059 8750 5255 8927 4303 ct 9103 3351 9423 2612 9642 2652 ct | |
| 123 | 123 | 9861 2693 9895 3498 9719 4450 ct 9543 5401 9222 6140 9003 6100 ct p ef |
| 124 | -0 10008 t | |
| 124 | +0 10008 t | |
| 125 | 125 | pom |
| 126 | 126 | count op_count sub {pop} repeat countdictstack dict_count sub {end} repeat b4_inc_state restore |
| 127 | 127 | %%PageTrailer |
| 128 | 128 | %%Trailer |
| 129 | 129 | %%EOF |
| 130 | 130 |
| --- www/fossil.eps | |
| +++ www/fossil.eps | |
| @@ -1,6 +1,6 @@ | |
| 1 | %!PS-Adobe-3.0 EPSF-3.0 |
| 2 | %%BoundingBox: 0 0 249 284 |
| 3 | %%Pages: 0 |
| 4 | %%Creator: Sun Microsystems, Inc. |
| 5 | %%Title: none |
| 6 | %%CreationDate: none |
| @@ -48,82 +48,82 @@ | |
| 48 | %%EndSetup |
| 49 | %%Page: 1 1 |
| 50 | %%BeginPageSetup |
| 51 | %%EndPageSetup |
| 52 | pum |
| 53 | 0.02835 0.02837 s |
| 54 | 0 -10008 t |
| 55 | /tm matrix currentmatrix def |
| 56 | tm setmatrix |
| 57 | -4875 -2599 t |
| 58 | 1 1 s |
| 59 | 0.500 c 7207 8311 m 7036 8281 6990 7727 7105 7073 ct 7221 6420 7453 5915 7625 5945 ct |
| 60 | 7796 5975 7842 6529 7727 7183 ct 7612 7836 7379 8342 7207 8311 ct p ef |
| 61 | 7607 10301 m 7445 10335 7221 9926 7107 9387 ct 6992 8847 7030 8382 7192 8348 ct |
| 62 | 7354 8313 7578 8723 7693 9262 ct 7807 9802 7769 10267 7607 10301 ct p ef |
| 63 | 8749 11736 m 8626 11826 8289 11574 7995 11173 ct 7701 10773 7563 10375 7686 10285 ct |
| 64 | 7809 10195 8146 10446 8440 10847 ct 8734 11248 8872 11645 8749 11736 ct p ef |
| 65 | 10691 12070 m 10668 12234 10205 12303 9658 12223 ct 9111 12143 8686 11946 8710 11782 ct |
| 66 | 8734 11618 9197 11550 9744 11629 ct 10291 11709 10715 11906 10691 12070 ct p ef |
| 67 | 10761 12053 m 10721 11951 11064 11722 11526 11541 ct 11989 11360 12396 11296 12436 11398 ct |
| 68 | 12476 11500 12134 11729 11671 11910 ct 11208 12091 10801 12155 10761 12053 ct |
| 69 | p ef |
| 70 | 12410 11353 m 12365 11314 12499 11087 12709 10847 ct 12920 10607 13126 10444 13171 10483 ct |
| 71 | 13216 10522 13082 10749 12872 10989 ct 12662 11230 12455 11392 12410 11353 ct |
| 72 | p ef |
| 73 | 7901 12525 m 7790 12525 7700 12212 7700 11826 ct 7700 11440 7790 11127 7901 11127 ct |
| 74 | 8012 11127 8102 11440 8102 11826 ct 8102 12212 8012 12525 7901 12525 ct p ef |
| 75 | 7826 12575 m 7765 12668 7415 12547 7044 12306 ct 6672 12064 6420 11793 6480 11700 ct |
| 76 | 6541 11607 6891 11728 7262 11970 ct 7634 12211 7886 12482 7826 12575 ct p ef |
| 77 | 6460 11694 m 6435 11723 6333 11673 6234 11584 ct 6134 11494 6073 11399 6099 11371 ct |
| 78 | 6124 11343 6225 11392 6325 11482 ct 6425 11571 6485 11666 6460 11694 ct p ef |
| 79 | 13183 10437 m 13129 10414 13185 10157 13309 9863 ct 13433 9569 13579 9350 13633 9373 ct |
| 80 | 13688 9396 13632 9653 13508 9947 ct 13384 10241 13238 10460 13183 10437 ct p ef |
| 81 | 9900 11524 m 9790 11524 9701 11211 9701 10825 ct 9701 10439 9790 10126 9900 10126 ct |
| 82 | 10009 10126 10098 10439 10098 10825 ct 10098 11211 10009 11524 9900 11524 ct |
| 83 | p ef |
| 84 | 9828 11574 m 9767 11667 9417 11546 9046 11305 ct 8674 11063 8422 10792 8482 10699 ct |
| 85 | 8543 10606 8893 10727 9264 10969 ct 9636 11210 9888 11481 9828 11574 ct p ef |
| 86 | 6085 9230 m 5976 9131 6097 8819 6357 8533 ct 6616 8247 6915 8095 7024 8194 ct |
| 87 | 7133 8293 7012 8605 6752 8892 ct 6493 9178 6194 9329 6085 9230 ct p ef |
| 88 | 5910 9182 m 5805 9210 5629 8884 5516 8456 ct 5403 8027 5396 7657 5501 7629 ct |
| 89 | 5605 7601 5782 7927 5895 8356 ct 6008 8784 6014 9154 5910 9182 ct p ef |
| 90 | 8630 9345 m 8548 9270 8691 8978 8951 8692 ct 9210 8406 9487 8234 9569 8309 ct |
| 91 | 9651 8383 9507 8675 9248 8961 ct 8989 9247 8712 9419 8630 9345 ct p ef |
| 92 | 8566 9556 m 8478 9624 8188 9394 7918 9043 ct 7647 8692 7499 8352 7587 8285 ct |
| 93 | 7675 8217 7965 8447 8235 8798 ct 8506 9149 8654 9489 8566 9556 ct p ef |
| 94 | 6579 11626 m 6549 11638 6480 11543 6425 11413 ct 6371 11283 6352 11167 6382 11154 ct |
| 95 | 6412 11141 6481 11237 6535 11367 ct 6590 11497 6609 11613 6579 11626 ct p ef |
| 96 | 5952 11674 m 5959 11642 6081 11642 6223 11674 ct 6366 11707 6475 11759 6468 11791 ct |
| 97 | 6461 11823 6339 11823 6197 11790 ct 6054 11758 5945 11706 5952 11674 ct p ef |
| 98 | 5384 7615 m 5359 7644 5257 7594 5158 7505 ct 5058 7415 4997 7320 5023 7292 ct |
| 99 | 5048 7264 5149 7313 5249 7403 ct 5349 7492 5409 7587 5384 7615 ct p ef |
| 100 | 5503 7547 m 5473 7559 5404 7464 5349 7334 ct 5295 7204 5276 7088 5306 7075 ct |
| 101 | 5336 7062 5405 7158 5459 7288 ct 5514 7418 5533 7534 5503 7547 ct p ef |
| 102 | 4875 7595 m 4882 7562 5004 7563 5147 7595 ct 5289 7628 5399 7680 5392 7712 ct |
| 103 | 5385 7744 5263 7744 5120 7711 ct 4977 7679 4868 7627 4875 7595 ct p ef |
| 104 | 9764 8248 m 9739 8220 9798 8125 9898 8036 ct 9997 7946 10097 7897 10123 7925 ct |
| 105 | 10148 7952 10088 8047 9989 8137 ct 9890 8226 9789 8276 9764 8248 ct p ef |
| 106 | 9641 8179 m 9611 8167 9631 8051 9685 7920 ct 9740 7790 9809 7694 9839 7707 ct |
| 107 | 9869 7720 9850 7836 9795 7966 ct 9741 8097 9672 8192 9641 8179 ct p ef |
| 108 | 10269 8227 m 10276 8259 10167 8311 10024 8343 ct 9882 8375 9760 8375 9753 8343 ct |
| 109 | 9746 8311 9856 8259 9998 8227 ct 10141 8195 10262 8195 10269 8227 ct p ef |
| 110 | 9749 10085 m 9724 10113 9623 10064 9523 9974 ct 9424 9885 9363 9790 9389 9762 ct |
| 111 | 9414 9734 9515 9783 9615 9872 ct 9714 9961 9775 10057 9749 10085 ct p ef |
| 112 | 9868 10017 m 9838 10029 9770 9934 9715 9804 ct 9661 9674 9641 9558 9671 9545 ct |
| 113 | 9702 9533 9770 9628 9824 9758 ct 9879 9888 9898 10004 9868 10017 ct p ef |
| 114 | 9242 10064 m 9249 10032 9371 10032 9513 10064 ct 9656 10097 9765 10149 9758 10181 ct |
| 115 | 9751 10213 9629 10213 9487 10180 ct 9344 10148 9235 10096 9242 10064 ct p ef |
| 116 | 6841 4401 m 6726 4212 7272 3670 8061 3191 ct 8849 2711 9581 2475 9696 2664 ct |
| 117 | 9811 2853 9265 3395 8477 3875 ct 7688 4355 6956 4590 6841 4401 ct p ef |
| 118 | 9097 6042 m 8862 6353 8161 6221 7532 5745 ct 6902 5270 6583 4632 6818 4321 ct |
| 119 | 7053 4009 7754 4142 8384 4617 ct 9013 5092 9333 5730 9097 6042 ct p ef |
| 120 | 7880 5222 m 7747 5124 7957 4611 8349 4075 ct 8742 3540 9168 3185 9302 3283 ct |
| 121 | 9435 3381 9225 3894 8833 4430 ct 8440 4965 8014 5320 7880 5222 ct p ef |
| 122 | 9003 6100 m 8784 6059 8750 5255 8927 4303 ct 9103 3351 9423 2612 9642 2652 ct |
| 123 | 9861 2693 9895 3498 9719 4450 ct 9543 5401 9222 6140 9003 6100 ct p ef |
| 124 | 0 10008 t |
| 125 | pom |
| 126 | count op_count sub {pop} repeat countdictstack dict_count sub {end} repeat b4_inc_state restore |
| 127 | %%PageTrailer |
| 128 | %%Trailer |
| 129 | %%EOF |
| 130 |
| --- www/fossil.eps | |
| +++ www/fossil.eps | |
| @@ -1,6 +1,6 @@ | |
| 1 | %!PS-Adobe-3.0 EPSF-3.0 |
| 2 | %%BoundingBox: 0 0 249 284 |
| 3 | %%Pages: 0 |
| 4 | %%Creator: Sun Microsystems, Inc. |
| 5 | %%Title: none |
| 6 | %%CreationDate: none |
| @@ -48,82 +48,82 @@ | |
| 48 | %%EndSetup |
| 49 | %%Page: 1 1 |
| 50 | %%BeginPageSetup |
| 51 | %%EndPageSetup |
| 52 | pum |
| 53 | 0.02835 0.02837 s |
| 54 | 0 -10008 t |
| 55 | /tm matrix currentmatrix def |
| 56 | tm setmatrix |
| 57 | -4875 -2599 t |
| 58 | 1 1 s |
| 59 | 0.500 c 7207 8311 m 7036 8281 6990 7727 7105 7073 ct 7221 6420 7453 5915 7625 5945 ct |
| 60 | 7796 5975 7842 6529 7727 7183 ct 7612 7836 7379 8342 7207 8311 ct p ef |
| 61 | 7607 10301 m 7445 10335 7221 9926 7107 9387 ct 6992 8847 7030 8382 7192 8348 ct |
| 62 | 7354 8313 7578 8723 7693 9262 ct 7807 9802 7769 10267 7607 10301 ct p ef |
| 63 | 8749 11736 m 8626 11826 8289 11574 7995 11173 ct 7701 10773 7563 10375 7686 10285 ct |
| 64 | 7809 10195 8146 10446 8440 10847 ct 8734 11248 8872 11645 8749 11736 ct p ef |
| 65 | 10691 12070 m 10668 12234 10205 12303 9658 12223 ct 9111 12143 8686 11946 8710 11782 ct |
| 66 | 8734 11618 9197 11550 9744 11629 ct 10291 11709 10715 11906 10691 12070 ct p ef |
| 67 | 10761 12053 m 10721 11951 11064 11722 11526 11541 ct 11989 11360 12396 11296 12436 11398 ct |
| 68 | 12476 11500 12134 11729 11671 11910 ct 11208 12091 10801 12155 10761 12053 ct |
| 69 | p ef |
| 70 | 12410 11353 m 12365 11314 12499 11087 12709 10847 ct 12920 10607 13126 10444 13171 10483 ct |
| 71 | 13216 10522 13082 10749 12872 10989 ct 12662 11230 12455 11392 12410 11353 ct |
| 72 | p ef |
| 73 | 7901 12525 m 7790 12525 7700 12212 7700 11826 ct 7700 11440 7790 11127 7901 11127 ct |
| 74 | 8012 11127 8102 11440 8102 11826 ct 8102 12212 8012 12525 7901 12525 ct p ef |
| 75 | 7826 12575 m 7765 12668 7415 12547 7044 12306 ct 6672 12064 6420 11793 6480 11700 ct |
| 76 | 6541 11607 6891 11728 7262 11970 ct 7634 12211 7886 12482 7826 12575 ct p ef |
| 77 | 6460 11694 m 6435 11723 6333 11673 6234 11584 ct 6134 11494 6073 11399 6099 11371 ct |
| 78 | 6124 11343 6225 11392 6325 11482 ct 6425 11571 6485 11666 6460 11694 ct p ef |
| 79 | 13183 10437 m 13129 10414 13185 10157 13309 9863 ct 13433 9569 13579 9350 13633 9373 ct |
| 80 | 13688 9396 13632 9653 13508 9947 ct 13384 10241 13238 10460 13183 10437 ct p ef |
| 81 | 9900 11524 m 9790 11524 9701 11211 9701 10825 ct 9701 10439 9790 10126 9900 10126 ct |
| 82 | 10009 10126 10098 10439 10098 10825 ct 10098 11211 10009 11524 9900 11524 ct |
| 83 | p ef |
| 84 | 9828 11574 m 9767 11667 9417 11546 9046 11305 ct 8674 11063 8422 10792 8482 10699 ct |
| 85 | 8543 10606 8893 10727 9264 10969 ct 9636 11210 9888 11481 9828 11574 ct p ef |
| 86 | 6085 9230 m 5976 9131 6097 8819 6357 8533 ct 6616 8247 6915 8095 7024 8194 ct |
| 87 | 7133 8293 7012 8605 6752 8892 ct 6493 9178 6194 9329 6085 9230 ct p ef |
| 88 | 5910 9182 m 5805 9210 5629 8884 5516 8456 ct 5403 8027 5396 7657 5501 7629 ct |
| 89 | 5605 7601 5782 7927 5895 8356 ct 6008 8784 6014 9154 5910 9182 ct p ef |
| 90 | 8630 9345 m 8548 9270 8691 8978 8951 8692 ct 9210 8406 9487 8234 9569 8309 ct |
| 91 | 9651 8383 9507 8675 9248 8961 ct 8989 9247 8712 9419 8630 9345 ct p ef |
| 92 | 8566 9556 m 8478 9624 8188 9394 7918 9043 ct 7647 8692 7499 8352 7587 8285 ct |
| 93 | 7675 8217 7965 8447 8235 8798 ct 8506 9149 8654 9489 8566 9556 ct p ef |
| 94 | 6579 11626 m 6549 11638 6480 11543 6425 11413 ct 6371 11283 6352 11167 6382 11154 ct |
| 95 | 6412 11141 6481 11237 6535 11367 ct 6590 11497 6609 11613 6579 11626 ct p ef |
| 96 | 5952 11674 m 5959 11642 6081 11642 6223 11674 ct 6366 11707 6475 11759 6468 11791 ct |
| 97 | 6461 11823 6339 11823 6197 11790 ct 6054 11758 5945 11706 5952 11674 ct p ef |
| 98 | 5384 7615 m 5359 7644 5257 7594 5158 7505 ct 5058 7415 4997 7320 5023 7292 ct |
| 99 | 5048 7264 5149 7313 5249 7403 ct 5349 7492 5409 7587 5384 7615 ct p ef |
| 100 | 5503 7547 m 5473 7559 5404 7464 5349 7334 ct 5295 7204 5276 7088 5306 7075 ct |
| 101 | 5336 7062 5405 7158 5459 7288 ct 5514 7418 5533 7534 5503 7547 ct p ef |
| 102 | 4875 7595 m 4882 7562 5004 7563 5147 7595 ct 5289 7628 5399 7680 5392 7712 ct |
| 103 | 5385 7744 5263 7744 5120 7711 ct 4977 7679 4868 7627 4875 7595 ct p ef |
| 104 | 9764 8248 m 9739 8220 9798 8125 9898 8036 ct 9997 7946 10097 7897 10123 7925 ct |
| 105 | 10148 7952 10088 8047 9989 8137 ct 9890 8226 9789 8276 9764 8248 ct p ef |
| 106 | 9641 8179 m 9611 8167 9631 8051 9685 7920 ct 9740 7790 9809 7694 9839 7707 ct |
| 107 | 9869 7720 9850 7836 9795 7966 ct 9741 8097 9672 8192 9641 8179 ct p ef |
| 108 | 10269 8227 m 10276 8259 10167 8311 10024 8343 ct 9882 8375 9760 8375 9753 8343 ct |
| 109 | 9746 8311 9856 8259 9998 8227 ct 10141 8195 10262 8195 10269 8227 ct p ef |
| 110 | 9749 10085 m 9724 10113 9623 10064 9523 9974 ct 9424 9885 9363 9790 9389 9762 ct |
| 111 | 9414 9734 9515 9783 9615 9872 ct 9714 9961 9775 10057 9749 10085 ct p ef |
| 112 | 9868 10017 m 9838 10029 9770 9934 9715 9804 ct 9661 9674 9641 9558 9671 9545 ct |
| 113 | 9702 9533 9770 9628 9824 9758 ct 9879 9888 9898 10004 9868 10017 ct p ef |
| 114 | 9242 10064 m 9249 10032 9371 10032 9513 10064 ct 9656 10097 9765 10149 9758 10181 ct |
| 115 | 9751 10213 9629 10213 9487 10180 ct 9344 10148 9235 10096 9242 10064 ct p ef |
| 116 | 6841 4401 m 6726 4212 7272 3670 8061 3191 ct 8849 2711 9581 2475 9696 2664 ct |
| 117 | 9811 2853 9265 3395 8477 3875 ct 7688 4355 6956 4590 6841 4401 ct p ef |
| 118 | 9097 6042 m 8862 6353 8161 6221 7532 5745 ct 6902 5270 6583 4632 6818 4321 ct |
| 119 | 7053 4009 7754 4142 8384 4617 ct 9013 5092 9333 5730 9097 6042 ct p ef |
| 120 | 7880 5222 m 7747 5124 7957 4611 8349 4075 ct 8742 3540 9168 3185 9302 3283 ct |
| 121 | 9435 3381 9225 3894 8833 4430 ct 8440 4965 8014 5320 7880 5222 ct p ef |
| 122 | 9003 6100 m 8784 6059 8750 5255 8927 4303 ct 9103 3351 9423 2612 9642 2652 ct |
| 123 | 9861 2693 9895 3498 9719 4450 ct 9543 5401 9222 6140 9003 6100 ct p ef |
| 124 | 0 10008 t |
| 125 | pom |
| 126 | count op_count sub {pop} repeat countdictstack dict_count sub {end} repeat b4_inc_state restore |
| 127 | %%PageTrailer |
| 128 | %%Trailer |
| 129 | %%EOF |
| 130 |
+104
-104
| --- www/fossil2.eps | ||
| +++ www/fossil2.eps | ||
| @@ -1,6 +1,6 @@ | ||
| 1 | -%!PS-Adobe-3.0 EPSF-3.0 | |
| 1 | +%!PS-Adobe-3.0 EPSF-3.0 | |
| 2 | 2 | %%BoundingBox: 0 0 555 735 |
| 3 | 3 | %%Pages: 0 |
| 4 | 4 | %%Creator: Sun Microsystems, Inc. |
| 5 | 5 | %%Title: none |
| 6 | 6 | %%CreationDate: none |
| @@ -48,155 +48,155 @@ | ||
| 48 | 48 | %%EndSetup |
| 49 | 49 | %%Page: 1 1 |
| 50 | 50 | %%BeginPageSetup |
| 51 | 51 | %%EndPageSetup |
| 52 | 52 | pum |
| 53 | -0.02833 0.02833 s | |
| 53 | +0.02833 0.02833 s | |
| 54 | 54 | 0 -25940 t |
| 55 | 55 | /tm matrix currentmatrix def |
| 56 | 56 | gs |
| 57 | 57 | tm setmatrix |
| 58 | --1000 -1000 t | |
| 59 | -1 1 s | |
| 58 | +-1000 -1000 t | |
| 59 | +1 1 s | |
| 60 | 60 | 1000 1000 m 20589 1000 l 20589 26939 l 1000 26939 l 1000 1000 l eoclip newpath |
| 61 | 61 | gs |
| 62 | 62 | 1000 1000 m 20589 1000 l 20589 26939 l 1000 26939 l 1000 1000 l eoclip newpath |
| 63 | 63 | 1000 1000 m 20590 1000 l 20590 26940 l 1000 26940 l 1000 1000 l eoclip newpath |
| 64 | -0.500 c 7207 8311 m 7036 8281 6989 7726 7104 7073 ct 7220 6420 7453 5913 7624 5944 ct | |
| 64 | +0.500 c 7207 8311 m 7036 8281 6989 7726 7104 7073 ct 7220 6420 7453 5913 7624 5944 ct | |
| 65 | 65 | 7796 5974 7842 6529 7727 7182 ct 7612 7835 7378 8341 7207 8311 ct p ef |
| 66 | -7607 10301 m 7446 10335 7220 9925 7106 9386 ct 6991 8847 7030 8381 7191 8347 ct | |
| 66 | +7607 10301 m 7446 10335 7220 9925 7106 9386 ct 6991 8847 7030 8381 7191 8347 ct | |
| 67 | 67 | 7353 8312 7578 8723 7693 9262 ct 7807 9800 7768 10267 7607 10301 ct p ef |
| 68 | -8749 11736 m 8627 11825 8288 11574 7995 11173 ct 7701 10772 7562 10374 7685 10284 ct | |
| 68 | +8749 11736 m 8627 11825 8288 11574 7995 11173 ct 7701 10772 7562 10374 7685 10284 ct | |
| 69 | 69 | 7808 10194 8146 10446 8440 10847 ct 8734 11247 8872 11646 8749 11736 ct p ef |
| 70 | -10683 12127 m 10664 12260 10204 12303 9657 12224 ct 9111 12145 8683 11972 8702 11840 ct | |
| 70 | +10683 12127 m 10664 12260 10204 12303 9657 12224 ct 9111 12145 8683 11972 8702 11840 ct | |
| 71 | 71 | 8721 11707 9181 11664 9727 11743 ct 10274 11822 10702 11995 10683 12127 ct p ef |
| 72 | -10761 12053 m 10721 11951 11064 11721 11526 11540 ct 11989 11359 12397 11296 12437 11397 ct | |
| 73 | -12477 11499 12134 11729 11671 11910 ct 11209 12091 10801 12154 10761 12053 ct | |
| 72 | +10761 12053 m 10721 11951 11064 11721 11526 11540 ct 11989 11359 12397 11296 12437 11397 ct | |
| 73 | +12477 11499 12134 11729 11671 11910 ct 11209 12091 10801 12154 10761 12053 ct | |
| 74 | 74 | p ef |
| 75 | -12410 11353 m 12366 11314 12500 11087 12710 10847 ct 12920 10607 13127 10444 13171 10483 ct | |
| 76 | -13216 10522 13082 10749 12872 10989 ct 12662 11229 12455 11392 12410 11353 ct | |
| 75 | +12410 11353 m 12366 11314 12500 11087 12710 10847 ct 12920 10607 13127 10444 13171 10483 ct | |
| 76 | +13216 10522 13082 10749 12872 10989 ct 12662 11229 12455 11392 12410 11353 ct | |
| 77 | 77 | p ef |
| 78 | -7901 12525 m 7790 12525 7700 12212 7700 11826 ct 7700 11440 7790 11127 7901 11127 ct | |
| 78 | +7901 12525 m 7790 12525 7700 12212 7700 11826 ct 7700 11440 7790 11127 7901 11127 ct | |
| 79 | 79 | 8012 11127 8102 11440 8102 11826 ct 8102 12212 8012 12525 7901 12525 ct p ef |
| 80 | -7825 12576 m 7765 12669 7414 12548 7043 12306 ct 6671 12065 6419 11793 6479 11700 ct | |
| 80 | +7825 12576 m 7765 12669 7414 12548 7043 12306 ct 6671 12065 6419 11793 6479 11700 ct | |
| 81 | 81 | 6540 11607 6891 11728 7262 11969 ct 7633 12211 7886 12483 7825 12576 ct p ef |
| 82 | -6460 11695 m 6434 11723 6333 11674 6233 11584 ct 6133 11495 6072 11399 6098 11371 ct | |
| 82 | +6460 11695 m 6434 11723 6333 11674 6233 11584 ct 6133 11495 6072 11399 6098 11371 ct | |
| 83 | 83 | 6123 11342 6225 11392 6325 11481 ct 6425 11571 6485 11666 6460 11695 ct p ef |
| 84 | -13184 10437 m 13129 10414 13185 10156 13309 9862 ct 13434 9569 13580 9349 13634 9372 ct | |
| 84 | +13184 10437 m 13129 10414 13185 10156 13309 9862 ct 13434 9569 13580 9349 13634 9372 ct | |
| 85 | 85 | 13688 9395 13632 9653 13508 9947 ct 13384 10240 13238 10460 13184 10437 ct p ef |
| 86 | -9899 11524 m 9790 11524 9700 11211 9700 10825 ct 9700 10439 9790 10126 9899 10126 ct | |
| 87 | -10008 10126 10098 10439 10098 10825 ct 10098 11211 10008 11524 9899 11524 ct | |
| 86 | +9899 11524 m 9790 11524 9700 11211 9700 10825 ct 9700 10439 9790 10126 9899 10126 ct | |
| 87 | +10008 10126 10098 10439 10098 10825 ct 10098 11211 10008 11524 9899 11524 ct | |
| 88 | 88 | p ef |
| 89 | -9827 11575 m 9767 11668 9416 11547 9045 11305 ct 8673 11064 8421 10792 8481 10699 ct | |
| 89 | +9827 11575 m 9767 11668 9416 11547 9045 11305 ct 8673 11064 8421 10792 8481 10699 ct | |
| 90 | 90 | 8542 10606 8893 10727 9264 10968 ct 9635 11210 9888 11482 9827 11575 ct p ef |
| 91 | -6085 9230 m 5976 9132 6098 8819 6357 8533 ct 6616 8247 6915 8096 7024 8194 ct | |
| 91 | +6085 9230 m 5976 9132 6098 8819 6357 8533 ct 6616 8247 6915 8096 7024 8194 ct | |
| 92 | 92 | 7133 8293 7012 8605 6753 8892 ct 6493 9178 6194 9329 6085 9230 ct p ef |
| 93 | -5910 9183 m 5806 9210 5629 8885 5516 8456 ct 5403 8028 5396 7658 5501 7630 ct | |
| 93 | +5910 9183 m 5806 9210 5629 8885 5516 8456 ct 5403 8028 5396 7658 5501 7630 ct | |
| 94 | 94 | 5605 7602 5782 7928 5895 8357 ct 6008 8785 6014 9155 5910 9183 ct p ef |
| 95 | -8630 9344 m 8547 9270 8691 8977 8950 8691 ct 9209 8405 9486 8234 9568 8308 ct | |
| 95 | +8630 9344 m 8547 9270 8691 8977 8950 8691 ct 9209 8405 9486 8234 9568 8308 ct | |
| 96 | 96 | 9650 8383 9507 8675 9248 8961 ct 8989 9247 8712 9419 8630 9344 ct p ef |
| 97 | -8566 9557 m 8478 9625 8187 9395 7917 9044 ct 7646 8693 7498 8353 7586 8285 ct | |
| 97 | +8566 9557 m 8478 9625 8187 9395 7917 9044 ct 7646 8693 7498 8353 7586 8285 ct | |
| 98 | 98 | 7674 8217 7965 8448 8235 8799 ct 8505 9150 8654 9490 8566 9557 ct p ef |
| 99 | -6578 11626 m 6548 11638 6479 11543 6424 11413 ct 6370 11283 6351 11166 6381 11153 ct | |
| 99 | +6578 11626 m 6548 11638 6479 11543 6424 11413 ct 6370 11283 6351 11166 6381 11153 ct | |
| 100 | 100 | 6412 11141 6481 11236 6535 11366 ct 6589 11496 6609 11613 6578 11626 ct p ef |
| 101 | -5952 11673 m 5959 11641 6081 11641 6224 11674 ct 6366 11706 6476 11759 6469 11791 ct | |
| 101 | +5952 11673 m 5959 11641 6081 11641 6224 11674 ct 6366 11706 6476 11759 6469 11791 ct | |
| 102 | 102 | 6462 11823 6340 11823 6197 11791 ct 6055 11758 5945 11706 5952 11673 ct p ef |
| 103 | -5384 7616 m 5358 7644 5257 7595 5157 7505 ct 5057 7416 4996 7320 5022 7292 ct | |
| 103 | +5384 7616 m 5358 7644 5257 7595 5157 7505 ct 5057 7416 4996 7320 5022 7292 ct | |
| 104 | 104 | 5047 7263 5149 7313 5249 7402 ct 5349 7492 5409 7587 5384 7616 ct p ef |
| 105 | -5502 7547 m 5472 7559 5403 7464 5348 7334 ct 5294 7204 5275 7087 5305 7074 ct | |
| 105 | +5502 7547 m 5472 7559 5403 7464 5348 7334 ct 5294 7204 5275 7087 5305 7074 ct | |
| 106 | 106 | 5336 7062 5405 7157 5459 7287 ct 5513 7417 5533 7534 5502 7547 ct p ef |
| 107 | -4875 7594 m 4882 7562 5004 7562 5147 7594 ct 5289 7627 5399 7679 5392 7712 ct | |
| 107 | +4875 7594 m 4882 7562 5004 7562 5147 7594 ct 5289 7627 5399 7679 5392 7712 ct | |
| 108 | 108 | 5385 7744 5263 7744 5120 7711 ct 4978 7679 4868 7626 4875 7594 ct p ef |
| 109 | -9763 8248 m 9738 8220 9798 8124 9897 8035 ct 9996 7946 10097 7896 10122 7924 ct | |
| 109 | +9763 8248 m 9738 8220 9798 8124 9897 8035 ct 9996 7946 10097 7896 10122 7924 ct | |
| 110 | 110 | 10147 7951 10087 8047 9988 8136 ct 9889 8225 9787 8275 9763 8248 ct p ef |
| 111 | -9639 8179 m 9608 8166 9628 8050 9682 7920 ct 9737 7790 9806 7694 9836 7707 ct | |
| 111 | +9639 8179 m 9608 8166 9628 8050 9682 7920 ct 9737 7790 9806 7694 9836 7707 ct | |
| 112 | 112 | 9867 7719 9847 7836 9793 7966 ct 9739 8096 9669 8192 9639 8179 ct p ef |
| 113 | -10269 8228 m 10277 8260 10166 8312 10024 8344 ct 9881 8376 9759 8376 9752 8344 ct | |
| 113 | +10269 8228 m 10277 8260 10166 8312 10024 8344 ct 9881 8376 9759 8376 9752 8344 ct | |
| 114 | 114 | 9745 8311 9855 8259 9998 8227 ct 10140 8195 10262 8196 10269 8228 ct p ef |
| 115 | -9749 10085 m 9724 10113 9622 10064 9523 9975 ct 9424 9886 9363 9791 9388 9762 ct | |
| 115 | +9749 10085 m 9724 10113 9622 10064 9523 9975 ct 9424 9886 9363 9791 9388 9762 ct | |
| 116 | 116 | 9414 9734 9516 9784 9615 9872 ct 9714 9961 9774 10057 9749 10085 ct p ef |
| 117 | -9868 10017 m 9839 10029 9770 9933 9715 9803 ct 9661 9673 9642 9557 9671 9544 ct | |
| 117 | +9868 10017 m 9839 10029 9770 9933 9715 9803 ct 9661 9673 9642 9557 9671 9544 ct | |
| 118 | 118 | 9701 9532 9770 9628 9824 9758 ct 9879 9888 9898 10004 9868 10017 ct p ef |
| 119 | -9242 10063 m 9249 10031 9371 10031 9514 10064 ct 9656 10096 9766 10149 9759 10181 ct | |
| 119 | +9242 10063 m 9249 10031 9371 10031 9514 10064 ct 9656 10096 9766 10149 9759 10181 ct | |
| 120 | 120 | 9752 10213 9630 10213 9487 10181 ct 9345 10148 9235 10096 9242 10063 ct p ef |
| 121 | -6841 4401 m 6726 4212 7272 3669 8060 3190 ct 8848 2710 9581 2475 9696 2664 ct | |
| 121 | +6841 4401 m 6726 4212 7272 3669 8060 3190 ct 8848 2710 9581 2475 9696 2664 ct | |
| 122 | 122 | 9811 2853 9265 3396 8477 3875 ct 7689 4354 6956 4590 6841 4401 ct p ef |
| 123 | -9098 6041 m 8863 6352 8161 6220 7532 5745 ct 6903 5271 6583 4632 6818 4321 ct | |
| 123 | +9098 6041 m 8863 6352 8161 6220 7532 5745 ct 6903 5271 6583 4632 6818 4321 ct | |
| 124 | 124 | 7053 4009 7755 4142 8384 4617 ct 9013 5091 9333 5730 9098 6041 ct p ef |
| 125 | -7879 5222 m 7746 5124 7956 4610 8348 4075 ct 8740 3540 9167 3185 9300 3283 ct | |
| 125 | +7879 5222 m 7746 5124 7956 4610 8348 4075 ct 8740 3540 9167 3185 9300 3283 ct | |
| 126 | 126 | 9433 3380 9224 3895 8832 4430 ct 8440 4964 8012 5319 7879 5222 ct p ef |
| 127 | -9004 6100 m 8786 6059 8751 5255 8927 4303 ct 9103 3351 9424 2612 9642 2652 ct | |
| 127 | +9004 6100 m 8786 6059 8751 5255 8927 4303 ct 9103 3351 9424 2612 9642 2652 ct | |
| 128 | 128 | 9861 2693 9896 3498 9719 4449 ct 9543 5401 9222 6140 9004 6100 ct p ef |
| 129 | -106 lw 1 lj 9435 13668 m 9429 13652 l 9421 13637 l 9412 13622 l 9401 13607 l | |
| 130 | -9390 13593 l 9377 13579 l 9363 13565 l 9347 13552 l 9331 13539 l 9313 13526 l | |
| 131 | -9295 13515 l 9275 13503 l 9254 13493 l 9233 13482 l 9211 13473 l 9188 13464 l | |
| 132 | -9164 13456 l 9139 13448 l 9114 13441 l 9088 13435 l 9062 13430 l 9035 13425 l | |
| 133 | -9008 13422 l 8981 13419 l 8953 13416 l 8925 13415 l 8898 13414 l 8870 13414 l | |
| 134 | -8842 13415 l 8814 13417 l 8787 13419 l 8759 13422 l 8732 13426 l 8706 13431 l | |
| 135 | -8680 13437 l 8654 13443 l 8629 13450 l 8605 13458 l 8581 13466 l 8558 13475 l | |
| 136 | -8536 13485 l 8514 13495 l 8494 13506 l 8475 13517 l 8456 13529 l 8439 13542 l | |
| 137 | -8423 13555 l 8408 13568 l 8394 13582 l 8381 13596 l 8370 13611 l 8360 13626 l | |
| 138 | -8351 13641 l 8344 13656 l 8338 13672 l 8333 13687 l 8330 13703 l 8328 13719 l | |
| 139 | -8327 13735 l 8328 13751 l 8330 13767 l 8334 13783 l 8338 13798 l 8345 13814 l | |
| 140 | -8352 13829 l 8361 13844 l 8372 13859 l 8383 13874 l 8396 13888 l 8410 13902 l | |
| 141 | -8425 13915 l 8441 13928 l 8459 13940 l 8477 13952 l 8497 13964 l 8517 13974 l | |
| 142 | -8539 13985 l 8561 13994 l 8584 14003 l 8608 14011 l 8632 14019 l 8657 14026 l | |
| 143 | -8683 14032 l 8709 14037 l 8736 14042 l 8763 14046 l 8790 14049 l 8818 14052 l | |
| 129 | +106 lw 1 lj 9435 13668 m 9429 13652 l 9421 13637 l 9412 13622 l 9401 13607 l | |
| 130 | +9390 13593 l 9377 13579 l 9363 13565 l 9347 13552 l 9331 13539 l 9313 13526 l | |
| 131 | +9295 13515 l 9275 13503 l 9254 13493 l 9233 13482 l 9211 13473 l 9188 13464 l | |
| 132 | +9164 13456 l 9139 13448 l 9114 13441 l 9088 13435 l 9062 13430 l 9035 13425 l | |
| 133 | +9008 13422 l 8981 13419 l 8953 13416 l 8925 13415 l 8898 13414 l 8870 13414 l | |
| 134 | +8842 13415 l 8814 13417 l 8787 13419 l 8759 13422 l 8732 13426 l 8706 13431 l | |
| 135 | +8680 13437 l 8654 13443 l 8629 13450 l 8605 13458 l 8581 13466 l 8558 13475 l | |
| 136 | +8536 13485 l 8514 13495 l 8494 13506 l 8475 13517 l 8456 13529 l 8439 13542 l | |
| 137 | +8423 13555 l 8408 13568 l 8394 13582 l 8381 13596 l 8370 13611 l 8360 13626 l | |
| 138 | +8351 13641 l 8344 13656 l 8338 13672 l 8333 13687 l 8330 13703 l 8328 13719 l | |
| 139 | +8327 13735 l 8328 13751 l 8330 13767 l 8334 13783 l 8338 13798 l 8345 13814 l | |
| 140 | +8352 13829 l 8361 13844 l 8372 13859 l 8383 13874 l 8396 13888 l 8410 13902 l | |
| 141 | +8425 13915 l 8441 13928 l 8459 13940 l 8477 13952 l 8497 13964 l 8517 13974 l | |
| 142 | +8539 13985 l 8561 13994 l 8584 14003 l 8608 14011 l 8632 14019 l 8657 14026 l | |
| 143 | +8683 14032 l 8709 14037 l 8736 14042 l 8763 14046 l 8790 14049 l 8818 14052 l | |
| 144 | 144 | 8846 14053 l 8873 14054 l 8901 14054 l 8929 14053 l 8957 14051 l ps |
| 145 | -8347 14443 m 8354 14459 l 8362 14474 l 8371 14489 l 8382 14504 l 8394 14518 l | |
| 146 | -8407 14533 l 8421 14546 l 8436 14560 l 8453 14573 l 8471 14585 l 8490 14597 l | |
| 147 | -8510 14608 l 8530 14619 l 8552 14629 l 8575 14639 l 8598 14647 l 8622 14656 l | |
| 148 | -8647 14663 l 8673 14670 l 8699 14676 l 8725 14681 l 8752 14685 l 8779 14689 l | |
| 149 | -8807 14692 l 8835 14694 l 8863 14695 l 8891 14696 l 8919 14696 l 8947 14695 l | |
| 150 | -8975 14693 l 9002 14690 l 9030 14687 l 9057 14682 l 9083 14677 l 9109 14672 l | |
| 151 | -9135 14665 l 9160 14658 l 9184 14650 l 9208 14641 l 9231 14632 l 9253 14622 l | |
| 152 | -9274 14612 l 9294 14600 l 9313 14589 l 9332 14576 l 9349 14564 l 9364 14550 l | |
| 153 | -9379 14537 l 9393 14523 l 9405 14508 l 9416 14494 l 9425 14479 l 9434 14463 l | |
| 154 | -9441 14448 l 9446 14432 l 9451 14416 l 9453 14400 l 9455 14384 l 9455 14368 l | |
| 155 | -9453 14352 l 9451 14336 l 9446 14320 l 9441 14305 l 9434 14289 l 9426 14274 l | |
| 156 | -9416 14259 l 9405 14244 l 9393 14230 l 9380 14216 l 9365 14202 l 9349 14189 l | |
| 157 | -9332 14176 l 9314 14164 l 9295 14152 l 9275 14141 l 9254 14130 l 9232 14120 l | |
| 158 | -9209 14111 l 9185 14102 l 9161 14094 l 9136 14087 l 9110 14081 l 9084 14075 l | |
| 145 | +8347 14443 m 8354 14459 l 8362 14474 l 8371 14489 l 8382 14504 l 8394 14518 l | |
| 146 | +8407 14533 l 8421 14546 l 8436 14560 l 8453 14573 l 8471 14585 l 8490 14597 l | |
| 147 | +8510 14608 l 8530 14619 l 8552 14629 l 8575 14639 l 8598 14647 l 8622 14656 l | |
| 148 | +8647 14663 l 8673 14670 l 8699 14676 l 8725 14681 l 8752 14685 l 8779 14689 l | |
| 149 | +8807 14692 l 8835 14694 l 8863 14695 l 8891 14696 l 8919 14696 l 8947 14695 l | |
| 150 | +8975 14693 l 9002 14690 l 9030 14687 l 9057 14682 l 9083 14677 l 9109 14672 l | |
| 151 | +9135 14665 l 9160 14658 l 9184 14650 l 9208 14641 l 9231 14632 l 9253 14622 l | |
| 152 | +9274 14612 l 9294 14600 l 9313 14589 l 9332 14576 l 9349 14564 l 9364 14550 l | |
| 153 | +9379 14537 l 9393 14523 l 9405 14508 l 9416 14494 l 9425 14479 l 9434 14463 l | |
| 154 | +9441 14448 l 9446 14432 l 9451 14416 l 9453 14400 l 9455 14384 l 9455 14368 l | |
| 155 | +9453 14352 l 9451 14336 l 9446 14320 l 9441 14305 l 9434 14289 l 9426 14274 l | |
| 156 | +9416 14259 l 9405 14244 l 9393 14230 l 9380 14216 l 9365 14202 l 9349 14189 l | |
| 157 | +9332 14176 l 9314 14164 l 9295 14152 l 9275 14141 l 9254 14130 l 9232 14120 l | |
| 158 | +9209 14111 l 9185 14102 l 9161 14094 l 9136 14087 l 9110 14081 l 9084 14075 l | |
| 159 | 159 | 9057 14070 l 9030 14066 l 9003 14062 l 8975 14059 l 8948 14057 l ps |
| 160 | -10974 13668 m 10968 13652 l 10960 13637 l 10951 13622 l 10940 13607 l | |
| 161 | -10929 13593 l 10916 13579 l 10902 13565 l 10886 13552 l 10870 13539 l | |
| 162 | -10853 13526 l 10834 13515 l 10814 13503 l 10794 13493 l 10772 13482 l | |
| 163 | -10750 13473 l 10727 13464 l 10703 13456 l 10679 13448 l 10653 13441 l | |
| 164 | -10628 13435 l 10602 13430 l 10575 13425 l 10548 13422 l 10521 13419 l | |
| 165 | -10493 13416 l 10465 13415 l 10438 13414 l 10410 13414 l 10382 13415 l | |
| 166 | -10354 13417 l 10327 13419 l 10300 13422 l 10273 13426 l 10246 13431 l | |
| 167 | -10220 13437 l 10194 13443 l 10169 13450 l 10145 13458 l 10121 13466 l | |
| 168 | -10098 13475 l 10076 13485 l 10055 13495 l 10035 13506 l 10015 13517 l | |
| 169 | -9997 13529 l 9980 13542 l 9964 13555 l 9949 13568 l 9935 13582 l 9922 13596 l | |
| 170 | -9911 13611 l 9901 13626 l 9892 13641 l 9885 13656 l 9879 13672 l 9874 13687 l | |
| 171 | -9871 13703 l 9869 13719 l 9868 13735 l 9869 13751 l 9871 13767 l 9875 13783 l | |
| 172 | -9879 13798 l 9886 13814 l 9893 13829 l 9902 13844 l 9912 13859 l 9924 13874 l | |
| 173 | -9937 13888 l 9951 13902 l 9966 13915 l 9982 13928 l 10000 13940 l | |
| 174 | -10018 13952 l 10037 13964 l 10058 13974 l 10079 13985 l 10101 13994 l | |
| 175 | -10124 14003 l 10148 14011 l 10173 14019 l 10198 14026 l 10223 14032 l | |
| 176 | -10250 14037 l 10276 14042 l 10303 14046 l 10330 14049 l 10358 14052 l | |
| 177 | -10386 14053 l 10413 14054 l 10441 14054 l 10469 14053 l 10497 14051 l | |
| 160 | +10974 13668 m 10968 13652 l 10960 13637 l 10951 13622 l 10940 13607 l | |
| 161 | +10929 13593 l 10916 13579 l 10902 13565 l 10886 13552 l 10870 13539 l | |
| 162 | +10853 13526 l 10834 13515 l 10814 13503 l 10794 13493 l 10772 13482 l | |
| 163 | +10750 13473 l 10727 13464 l 10703 13456 l 10679 13448 l 10653 13441 l | |
| 164 | +10628 13435 l 10602 13430 l 10575 13425 l 10548 13422 l 10521 13419 l | |
| 165 | +10493 13416 l 10465 13415 l 10438 13414 l 10410 13414 l 10382 13415 l | |
| 166 | +10354 13417 l 10327 13419 l 10300 13422 l 10273 13426 l 10246 13431 l | |
| 167 | +10220 13437 l 10194 13443 l 10169 13450 l 10145 13458 l 10121 13466 l | |
| 168 | +10098 13475 l 10076 13485 l 10055 13495 l 10035 13506 l 10015 13517 l | |
| 169 | +9997 13529 l 9980 13542 l 9964 13555 l 9949 13568 l 9935 13582 l 9922 13596 l | |
| 170 | +9911 13611 l 9901 13626 l 9892 13641 l 9885 13656 l 9879 13672 l 9874 13687 l | |
| 171 | +9871 13703 l 9869 13719 l 9868 13735 l 9869 13751 l 9871 13767 l 9875 13783 l | |
| 172 | +9879 13798 l 9886 13814 l 9893 13829 l 9902 13844 l 9912 13859 l 9924 13874 l | |
| 173 | +9937 13888 l 9951 13902 l 9966 13915 l 9982 13928 l 10000 13940 l | |
| 174 | +10018 13952 l 10037 13964 l 10058 13974 l 10079 13985 l 10101 13994 l | |
| 175 | +10124 14003 l 10148 14011 l 10173 14019 l 10198 14026 l 10223 14032 l | |
| 176 | +10250 14037 l 10276 14042 l 10303 14046 l 10330 14049 l 10358 14052 l | |
| 177 | +10386 14053 l 10413 14054 l 10441 14054 l 10469 14053 l 10497 14051 l | |
| 178 | 178 | ps |
| 179 | -9888 14443 m 9895 14459 l 9903 14474 l 9912 14489 l 9923 14504 l 9934 14518 l | |
| 180 | -9948 14533 l 9962 14546 l 9977 14560 l 9994 14573 l 10012 14585 l | |
| 181 | -10031 14597 l 10050 14608 l 10071 14619 l 10093 14629 l 10115 14639 l | |
| 182 | -10139 14647 l 10163 14656 l 10188 14663 l 10213 14670 l 10239 14676 l | |
| 183 | -10265 14681 l 10292 14685 l 10320 14689 l 10347 14692 l 10375 14694 l | |
| 184 | -10403 14695 l 10431 14696 l 10459 14696 l 10487 14695 l 10514 14693 l | |
| 185 | -10542 14690 l 10569 14687 l 10596 14682 l 10623 14677 l 10649 14672 l | |
| 186 | -10675 14665 l 10700 14658 l 10724 14650 l 10748 14641 l 10770 14632 l | |
| 187 | -10792 14622 l 10813 14612 l 10834 14600 l 10853 14589 l 10871 14576 l | |
| 188 | -10888 14564 l 10904 14550 l 10918 14537 l 10932 14523 l 10944 14508 l | |
| 189 | -10955 14494 l 10965 14479 l 10973 14463 l 10980 14448 l 10985 14432 l | |
| 190 | -10990 14416 l 10992 14400 l 10994 14384 l 10994 14368 l 10992 14352 l | |
| 191 | -10990 14336 l 10986 14320 l 10980 14305 l 10973 14289 l 10965 14274 l | |
| 192 | -10955 14259 l 10944 14244 l 10932 14230 l 10919 14216 l 10904 14202 l | |
| 193 | -10888 14189 l 10871 14176 l 10853 14164 l 10834 14152 l 10814 14141 l | |
| 194 | -10793 14130 l 10771 14120 l 10748 14111 l 10725 14102 l 10700 14094 l | |
| 195 | -10675 14087 l 10650 14081 l 10624 14075 l 10597 14070 l 10570 14066 l | |
| 179 | +9888 14443 m 9895 14459 l 9903 14474 l 9912 14489 l 9923 14504 l 9934 14518 l | |
| 180 | +9948 14533 l 9962 14546 l 9977 14560 l 9994 14573 l 10012 14585 l | |
| 181 | +10031 14597 l 10050 14608 l 10071 14619 l 10093 14629 l 10115 14639 l | |
| 182 | +10139 14647 l 10163 14656 l 10188 14663 l 10213 14670 l 10239 14676 l | |
| 183 | +10265 14681 l 10292 14685 l 10320 14689 l 10347 14692 l 10375 14694 l | |
| 184 | +10403 14695 l 10431 14696 l 10459 14696 l 10487 14695 l 10514 14693 l | |
| 185 | +10542 14690 l 10569 14687 l 10596 14682 l 10623 14677 l 10649 14672 l | |
| 186 | +10675 14665 l 10700 14658 l 10724 14650 l 10748 14641 l 10770 14632 l | |
| 187 | +10792 14622 l 10813 14612 l 10834 14600 l 10853 14589 l 10871 14576 l | |
| 188 | +10888 14564 l 10904 14550 l 10918 14537 l 10932 14523 l 10944 14508 l | |
| 189 | +10955 14494 l 10965 14479 l 10973 14463 l 10980 14448 l 10985 14432 l | |
| 190 | +10990 14416 l 10992 14400 l 10994 14384 l 10994 14368 l 10992 14352 l | |
| 191 | +10990 14336 l 10986 14320 l 10980 14305 l 10973 14289 l 10965 14274 l | |
| 192 | +10955 14259 l 10944 14244 l 10932 14230 l 10919 14216 l 10904 14202 l | |
| 193 | +10888 14189 l 10871 14176 l 10853 14164 l 10834 14152 l 10814 14141 l | |
| 194 | +10793 14130 l 10771 14120 l 10748 14111 l 10725 14102 l 10700 14094 l | |
| 195 | +10675 14087 l 10650 14081 l 10624 14075 l 10597 14070 l 10570 14066 l | |
| 196 | 196 | 10543 14062 l 10515 14059 l 10488 14057 l ps |
| 197 | -7205 14684 m 6849 14684 6559 14412 6559 14078 ct 6559 13744 6849 13472 7205 13472 ct | |
| 197 | +7205 14684 m 6849 14684 6559 14412 6559 14078 ct 6559 13744 6849 13472 7205 13472 ct | |
| 198 | 198 | 7561 13472 7851 13744 7851 14078 ct 7851 14412 7561 14684 7205 14684 ct pc |
| 199 | 199 | 5427 13589 m 5427 14657 l ps |
| 200 | 200 | 5374 13560 m 6242 13560 l ps |
| 201 | 201 | 5374 13914 m 6090 13914 l ps |
| 202 | 202 | 11776 13397 m 11776 14697 l ps |
| @@ -205,11 +205,11 @@ | ||
| 205 | 205 | gr |
| 206 | 206 | gs |
| 207 | 207 | 1000 1000 m 20589 1000 l 20589 26939 l 1000 26939 l 1000 1000 l eoclip newpath |
| 208 | 208 | gr |
| 209 | 209 | gr |
| 210 | -0 25940 t | |
| 210 | +0 25940 t | |
| 211 | 211 | pom |
| 212 | 212 | count op_count sub {pop} repeat countdictstack dict_count sub {end} repeat b4_inc_state restore |
| 213 | 213 | %%PageTrailer |
| 214 | 214 | %%Trailer |
| 215 | 215 | %%EOF |
| 216 | 216 |
| --- www/fossil2.eps | |
| +++ www/fossil2.eps | |
| @@ -1,6 +1,6 @@ | |
| 1 | %!PS-Adobe-3.0 EPSF-3.0 |
| 2 | %%BoundingBox: 0 0 555 735 |
| 3 | %%Pages: 0 |
| 4 | %%Creator: Sun Microsystems, Inc. |
| 5 | %%Title: none |
| 6 | %%CreationDate: none |
| @@ -48,155 +48,155 @@ | |
| 48 | %%EndSetup |
| 49 | %%Page: 1 1 |
| 50 | %%BeginPageSetup |
| 51 | %%EndPageSetup |
| 52 | pum |
| 53 | 0.02833 0.02833 s |
| 54 | 0 -25940 t |
| 55 | /tm matrix currentmatrix def |
| 56 | gs |
| 57 | tm setmatrix |
| 58 | -1000 -1000 t |
| 59 | 1 1 s |
| 60 | 1000 1000 m 20589 1000 l 20589 26939 l 1000 26939 l 1000 1000 l eoclip newpath |
| 61 | gs |
| 62 | 1000 1000 m 20589 1000 l 20589 26939 l 1000 26939 l 1000 1000 l eoclip newpath |
| 63 | 1000 1000 m 20590 1000 l 20590 26940 l 1000 26940 l 1000 1000 l eoclip newpath |
| 64 | 0.500 c 7207 8311 m 7036 8281 6989 7726 7104 7073 ct 7220 6420 7453 5913 7624 5944 ct |
| 65 | 7796 5974 7842 6529 7727 7182 ct 7612 7835 7378 8341 7207 8311 ct p ef |
| 66 | 7607 10301 m 7446 10335 7220 9925 7106 9386 ct 6991 8847 7030 8381 7191 8347 ct |
| 67 | 7353 8312 7578 8723 7693 9262 ct 7807 9800 7768 10267 7607 10301 ct p ef |
| 68 | 8749 11736 m 8627 11825 8288 11574 7995 11173 ct 7701 10772 7562 10374 7685 10284 ct |
| 69 | 7808 10194 8146 10446 8440 10847 ct 8734 11247 8872 11646 8749 11736 ct p ef |
| 70 | 10683 12127 m 10664 12260 10204 12303 9657 12224 ct 9111 12145 8683 11972 8702 11840 ct |
| 71 | 8721 11707 9181 11664 9727 11743 ct 10274 11822 10702 11995 10683 12127 ct p ef |
| 72 | 10761 12053 m 10721 11951 11064 11721 11526 11540 ct 11989 11359 12397 11296 12437 11397 ct |
| 73 | 12477 11499 12134 11729 11671 11910 ct 11209 12091 10801 12154 10761 12053 ct |
| 74 | p ef |
| 75 | 12410 11353 m 12366 11314 12500 11087 12710 10847 ct 12920 10607 13127 10444 13171 10483 ct |
| 76 | 13216 10522 13082 10749 12872 10989 ct 12662 11229 12455 11392 12410 11353 ct |
| 77 | p ef |
| 78 | 7901 12525 m 7790 12525 7700 12212 7700 11826 ct 7700 11440 7790 11127 7901 11127 ct |
| 79 | 8012 11127 8102 11440 8102 11826 ct 8102 12212 8012 12525 7901 12525 ct p ef |
| 80 | 7825 12576 m 7765 12669 7414 12548 7043 12306 ct 6671 12065 6419 11793 6479 11700 ct |
| 81 | 6540 11607 6891 11728 7262 11969 ct 7633 12211 7886 12483 7825 12576 ct p ef |
| 82 | 6460 11695 m 6434 11723 6333 11674 6233 11584 ct 6133 11495 6072 11399 6098 11371 ct |
| 83 | 6123 11342 6225 11392 6325 11481 ct 6425 11571 6485 11666 6460 11695 ct p ef |
| 84 | 13184 10437 m 13129 10414 13185 10156 13309 9862 ct 13434 9569 13580 9349 13634 9372 ct |
| 85 | 13688 9395 13632 9653 13508 9947 ct 13384 10240 13238 10460 13184 10437 ct p ef |
| 86 | 9899 11524 m 9790 11524 9700 11211 9700 10825 ct 9700 10439 9790 10126 9899 10126 ct |
| 87 | 10008 10126 10098 10439 10098 10825 ct 10098 11211 10008 11524 9899 11524 ct |
| 88 | p ef |
| 89 | 9827 11575 m 9767 11668 9416 11547 9045 11305 ct 8673 11064 8421 10792 8481 10699 ct |
| 90 | 8542 10606 8893 10727 9264 10968 ct 9635 11210 9888 11482 9827 11575 ct p ef |
| 91 | 6085 9230 m 5976 9132 6098 8819 6357 8533 ct 6616 8247 6915 8096 7024 8194 ct |
| 92 | 7133 8293 7012 8605 6753 8892 ct 6493 9178 6194 9329 6085 9230 ct p ef |
| 93 | 5910 9183 m 5806 9210 5629 8885 5516 8456 ct 5403 8028 5396 7658 5501 7630 ct |
| 94 | 5605 7602 5782 7928 5895 8357 ct 6008 8785 6014 9155 5910 9183 ct p ef |
| 95 | 8630 9344 m 8547 9270 8691 8977 8950 8691 ct 9209 8405 9486 8234 9568 8308 ct |
| 96 | 9650 8383 9507 8675 9248 8961 ct 8989 9247 8712 9419 8630 9344 ct p ef |
| 97 | 8566 9557 m 8478 9625 8187 9395 7917 9044 ct 7646 8693 7498 8353 7586 8285 ct |
| 98 | 7674 8217 7965 8448 8235 8799 ct 8505 9150 8654 9490 8566 9557 ct p ef |
| 99 | 6578 11626 m 6548 11638 6479 11543 6424 11413 ct 6370 11283 6351 11166 6381 11153 ct |
| 100 | 6412 11141 6481 11236 6535 11366 ct 6589 11496 6609 11613 6578 11626 ct p ef |
| 101 | 5952 11673 m 5959 11641 6081 11641 6224 11674 ct 6366 11706 6476 11759 6469 11791 ct |
| 102 | 6462 11823 6340 11823 6197 11791 ct 6055 11758 5945 11706 5952 11673 ct p ef |
| 103 | 5384 7616 m 5358 7644 5257 7595 5157 7505 ct 5057 7416 4996 7320 5022 7292 ct |
| 104 | 5047 7263 5149 7313 5249 7402 ct 5349 7492 5409 7587 5384 7616 ct p ef |
| 105 | 5502 7547 m 5472 7559 5403 7464 5348 7334 ct 5294 7204 5275 7087 5305 7074 ct |
| 106 | 5336 7062 5405 7157 5459 7287 ct 5513 7417 5533 7534 5502 7547 ct p ef |
| 107 | 4875 7594 m 4882 7562 5004 7562 5147 7594 ct 5289 7627 5399 7679 5392 7712 ct |
| 108 | 5385 7744 5263 7744 5120 7711 ct 4978 7679 4868 7626 4875 7594 ct p ef |
| 109 | 9763 8248 m 9738 8220 9798 8124 9897 8035 ct 9996 7946 10097 7896 10122 7924 ct |
| 110 | 10147 7951 10087 8047 9988 8136 ct 9889 8225 9787 8275 9763 8248 ct p ef |
| 111 | 9639 8179 m 9608 8166 9628 8050 9682 7920 ct 9737 7790 9806 7694 9836 7707 ct |
| 112 | 9867 7719 9847 7836 9793 7966 ct 9739 8096 9669 8192 9639 8179 ct p ef |
| 113 | 10269 8228 m 10277 8260 10166 8312 10024 8344 ct 9881 8376 9759 8376 9752 8344 ct |
| 114 | 9745 8311 9855 8259 9998 8227 ct 10140 8195 10262 8196 10269 8228 ct p ef |
| 115 | 9749 10085 m 9724 10113 9622 10064 9523 9975 ct 9424 9886 9363 9791 9388 9762 ct |
| 116 | 9414 9734 9516 9784 9615 9872 ct 9714 9961 9774 10057 9749 10085 ct p ef |
| 117 | 9868 10017 m 9839 10029 9770 9933 9715 9803 ct 9661 9673 9642 9557 9671 9544 ct |
| 118 | 9701 9532 9770 9628 9824 9758 ct 9879 9888 9898 10004 9868 10017 ct p ef |
| 119 | 9242 10063 m 9249 10031 9371 10031 9514 10064 ct 9656 10096 9766 10149 9759 10181 ct |
| 120 | 9752 10213 9630 10213 9487 10181 ct 9345 10148 9235 10096 9242 10063 ct p ef |
| 121 | 6841 4401 m 6726 4212 7272 3669 8060 3190 ct 8848 2710 9581 2475 9696 2664 ct |
| 122 | 9811 2853 9265 3396 8477 3875 ct 7689 4354 6956 4590 6841 4401 ct p ef |
| 123 | 9098 6041 m 8863 6352 8161 6220 7532 5745 ct 6903 5271 6583 4632 6818 4321 ct |
| 124 | 7053 4009 7755 4142 8384 4617 ct 9013 5091 9333 5730 9098 6041 ct p ef |
| 125 | 7879 5222 m 7746 5124 7956 4610 8348 4075 ct 8740 3540 9167 3185 9300 3283 ct |
| 126 | 9433 3380 9224 3895 8832 4430 ct 8440 4964 8012 5319 7879 5222 ct p ef |
| 127 | 9004 6100 m 8786 6059 8751 5255 8927 4303 ct 9103 3351 9424 2612 9642 2652 ct |
| 128 | 9861 2693 9896 3498 9719 4449 ct 9543 5401 9222 6140 9004 6100 ct p ef |
| 129 | 106 lw 1 lj 9435 13668 m 9429 13652 l 9421 13637 l 9412 13622 l 9401 13607 l |
| 130 | 9390 13593 l 9377 13579 l 9363 13565 l 9347 13552 l 9331 13539 l 9313 13526 l |
| 131 | 9295 13515 l 9275 13503 l 9254 13493 l 9233 13482 l 9211 13473 l 9188 13464 l |
| 132 | 9164 13456 l 9139 13448 l 9114 13441 l 9088 13435 l 9062 13430 l 9035 13425 l |
| 133 | 9008 13422 l 8981 13419 l 8953 13416 l 8925 13415 l 8898 13414 l 8870 13414 l |
| 134 | 8842 13415 l 8814 13417 l 8787 13419 l 8759 13422 l 8732 13426 l 8706 13431 l |
| 135 | 8680 13437 l 8654 13443 l 8629 13450 l 8605 13458 l 8581 13466 l 8558 13475 l |
| 136 | 8536 13485 l 8514 13495 l 8494 13506 l 8475 13517 l 8456 13529 l 8439 13542 l |
| 137 | 8423 13555 l 8408 13568 l 8394 13582 l 8381 13596 l 8370 13611 l 8360 13626 l |
| 138 | 8351 13641 l 8344 13656 l 8338 13672 l 8333 13687 l 8330 13703 l 8328 13719 l |
| 139 | 8327 13735 l 8328 13751 l 8330 13767 l 8334 13783 l 8338 13798 l 8345 13814 l |
| 140 | 8352 13829 l 8361 13844 l 8372 13859 l 8383 13874 l 8396 13888 l 8410 13902 l |
| 141 | 8425 13915 l 8441 13928 l 8459 13940 l 8477 13952 l 8497 13964 l 8517 13974 l |
| 142 | 8539 13985 l 8561 13994 l 8584 14003 l 8608 14011 l 8632 14019 l 8657 14026 l |
| 143 | 8683 14032 l 8709 14037 l 8736 14042 l 8763 14046 l 8790 14049 l 8818 14052 l |
| 144 | 8846 14053 l 8873 14054 l 8901 14054 l 8929 14053 l 8957 14051 l ps |
| 145 | 8347 14443 m 8354 14459 l 8362 14474 l 8371 14489 l 8382 14504 l 8394 14518 l |
| 146 | 8407 14533 l 8421 14546 l 8436 14560 l 8453 14573 l 8471 14585 l 8490 14597 l |
| 147 | 8510 14608 l 8530 14619 l 8552 14629 l 8575 14639 l 8598 14647 l 8622 14656 l |
| 148 | 8647 14663 l 8673 14670 l 8699 14676 l 8725 14681 l 8752 14685 l 8779 14689 l |
| 149 | 8807 14692 l 8835 14694 l 8863 14695 l 8891 14696 l 8919 14696 l 8947 14695 l |
| 150 | 8975 14693 l 9002 14690 l 9030 14687 l 9057 14682 l 9083 14677 l 9109 14672 l |
| 151 | 9135 14665 l 9160 14658 l 9184 14650 l 9208 14641 l 9231 14632 l 9253 14622 l |
| 152 | 9274 14612 l 9294 14600 l 9313 14589 l 9332 14576 l 9349 14564 l 9364 14550 l |
| 153 | 9379 14537 l 9393 14523 l 9405 14508 l 9416 14494 l 9425 14479 l 9434 14463 l |
| 154 | 9441 14448 l 9446 14432 l 9451 14416 l 9453 14400 l 9455 14384 l 9455 14368 l |
| 155 | 9453 14352 l 9451 14336 l 9446 14320 l 9441 14305 l 9434 14289 l 9426 14274 l |
| 156 | 9416 14259 l 9405 14244 l 9393 14230 l 9380 14216 l 9365 14202 l 9349 14189 l |
| 157 | 9332 14176 l 9314 14164 l 9295 14152 l 9275 14141 l 9254 14130 l 9232 14120 l |
| 158 | 9209 14111 l 9185 14102 l 9161 14094 l 9136 14087 l 9110 14081 l 9084 14075 l |
| 159 | 9057 14070 l 9030 14066 l 9003 14062 l 8975 14059 l 8948 14057 l ps |
| 160 | 10974 13668 m 10968 13652 l 10960 13637 l 10951 13622 l 10940 13607 l |
| 161 | 10929 13593 l 10916 13579 l 10902 13565 l 10886 13552 l 10870 13539 l |
| 162 | 10853 13526 l 10834 13515 l 10814 13503 l 10794 13493 l 10772 13482 l |
| 163 | 10750 13473 l 10727 13464 l 10703 13456 l 10679 13448 l 10653 13441 l |
| 164 | 10628 13435 l 10602 13430 l 10575 13425 l 10548 13422 l 10521 13419 l |
| 165 | 10493 13416 l 10465 13415 l 10438 13414 l 10410 13414 l 10382 13415 l |
| 166 | 10354 13417 l 10327 13419 l 10300 13422 l 10273 13426 l 10246 13431 l |
| 167 | 10220 13437 l 10194 13443 l 10169 13450 l 10145 13458 l 10121 13466 l |
| 168 | 10098 13475 l 10076 13485 l 10055 13495 l 10035 13506 l 10015 13517 l |
| 169 | 9997 13529 l 9980 13542 l 9964 13555 l 9949 13568 l 9935 13582 l 9922 13596 l |
| 170 | 9911 13611 l 9901 13626 l 9892 13641 l 9885 13656 l 9879 13672 l 9874 13687 l |
| 171 | 9871 13703 l 9869 13719 l 9868 13735 l 9869 13751 l 9871 13767 l 9875 13783 l |
| 172 | 9879 13798 l 9886 13814 l 9893 13829 l 9902 13844 l 9912 13859 l 9924 13874 l |
| 173 | 9937 13888 l 9951 13902 l 9966 13915 l 9982 13928 l 10000 13940 l |
| 174 | 10018 13952 l 10037 13964 l 10058 13974 l 10079 13985 l 10101 13994 l |
| 175 | 10124 14003 l 10148 14011 l 10173 14019 l 10198 14026 l 10223 14032 l |
| 176 | 10250 14037 l 10276 14042 l 10303 14046 l 10330 14049 l 10358 14052 l |
| 177 | 10386 14053 l 10413 14054 l 10441 14054 l 10469 14053 l 10497 14051 l |
| 178 | ps |
| 179 | 9888 14443 m 9895 14459 l 9903 14474 l 9912 14489 l 9923 14504 l 9934 14518 l |
| 180 | 9948 14533 l 9962 14546 l 9977 14560 l 9994 14573 l 10012 14585 l |
| 181 | 10031 14597 l 10050 14608 l 10071 14619 l 10093 14629 l 10115 14639 l |
| 182 | 10139 14647 l 10163 14656 l 10188 14663 l 10213 14670 l 10239 14676 l |
| 183 | 10265 14681 l 10292 14685 l 10320 14689 l 10347 14692 l 10375 14694 l |
| 184 | 10403 14695 l 10431 14696 l 10459 14696 l 10487 14695 l 10514 14693 l |
| 185 | 10542 14690 l 10569 14687 l 10596 14682 l 10623 14677 l 10649 14672 l |
| 186 | 10675 14665 l 10700 14658 l 10724 14650 l 10748 14641 l 10770 14632 l |
| 187 | 10792 14622 l 10813 14612 l 10834 14600 l 10853 14589 l 10871 14576 l |
| 188 | 10888 14564 l 10904 14550 l 10918 14537 l 10932 14523 l 10944 14508 l |
| 189 | 10955 14494 l 10965 14479 l 10973 14463 l 10980 14448 l 10985 14432 l |
| 190 | 10990 14416 l 10992 14400 l 10994 14384 l 10994 14368 l 10992 14352 l |
| 191 | 10990 14336 l 10986 14320 l 10980 14305 l 10973 14289 l 10965 14274 l |
| 192 | 10955 14259 l 10944 14244 l 10932 14230 l 10919 14216 l 10904 14202 l |
| 193 | 10888 14189 l 10871 14176 l 10853 14164 l 10834 14152 l 10814 14141 l |
| 194 | 10793 14130 l 10771 14120 l 10748 14111 l 10725 14102 l 10700 14094 l |
| 195 | 10675 14087 l 10650 14081 l 10624 14075 l 10597 14070 l 10570 14066 l |
| 196 | 10543 14062 l 10515 14059 l 10488 14057 l ps |
| 197 | 7205 14684 m 6849 14684 6559 14412 6559 14078 ct 6559 13744 6849 13472 7205 13472 ct |
| 198 | 7561 13472 7851 13744 7851 14078 ct 7851 14412 7561 14684 7205 14684 ct pc |
| 199 | 5427 13589 m 5427 14657 l ps |
| 200 | 5374 13560 m 6242 13560 l ps |
| 201 | 5374 13914 m 6090 13914 l ps |
| 202 | 11776 13397 m 11776 14697 l ps |
| @@ -205,11 +205,11 @@ | |
| 205 | gr |
| 206 | gs |
| 207 | 1000 1000 m 20589 1000 l 20589 26939 l 1000 26939 l 1000 1000 l eoclip newpath |
| 208 | gr |
| 209 | gr |
| 210 | 0 25940 t |
| 211 | pom |
| 212 | count op_count sub {pop} repeat countdictstack dict_count sub {end} repeat b4_inc_state restore |
| 213 | %%PageTrailer |
| 214 | %%Trailer |
| 215 | %%EOF |
| 216 |
| --- www/fossil2.eps | |
| +++ www/fossil2.eps | |
| @@ -1,6 +1,6 @@ | |
| 1 | %!PS-Adobe-3.0 EPSF-3.0 |
| 2 | %%BoundingBox: 0 0 555 735 |
| 3 | %%Pages: 0 |
| 4 | %%Creator: Sun Microsystems, Inc. |
| 5 | %%Title: none |
| 6 | %%CreationDate: none |
| @@ -48,155 +48,155 @@ | |
| 48 | %%EndSetup |
| 49 | %%Page: 1 1 |
| 50 | %%BeginPageSetup |
| 51 | %%EndPageSetup |
| 52 | pum |
| 53 | 0.02833 0.02833 s |
| 54 | 0 -25940 t |
| 55 | /tm matrix currentmatrix def |
| 56 | gs |
| 57 | tm setmatrix |
| 58 | -1000 -1000 t |
| 59 | 1 1 s |
| 60 | 1000 1000 m 20589 1000 l 20589 26939 l 1000 26939 l 1000 1000 l eoclip newpath |
| 61 | gs |
| 62 | 1000 1000 m 20589 1000 l 20589 26939 l 1000 26939 l 1000 1000 l eoclip newpath |
| 63 | 1000 1000 m 20590 1000 l 20590 26940 l 1000 26940 l 1000 1000 l eoclip newpath |
| 64 | 0.500 c 7207 8311 m 7036 8281 6989 7726 7104 7073 ct 7220 6420 7453 5913 7624 5944 ct |
| 65 | 7796 5974 7842 6529 7727 7182 ct 7612 7835 7378 8341 7207 8311 ct p ef |
| 66 | 7607 10301 m 7446 10335 7220 9925 7106 9386 ct 6991 8847 7030 8381 7191 8347 ct |
| 67 | 7353 8312 7578 8723 7693 9262 ct 7807 9800 7768 10267 7607 10301 ct p ef |
| 68 | 8749 11736 m 8627 11825 8288 11574 7995 11173 ct 7701 10772 7562 10374 7685 10284 ct |
| 69 | 7808 10194 8146 10446 8440 10847 ct 8734 11247 8872 11646 8749 11736 ct p ef |
| 70 | 10683 12127 m 10664 12260 10204 12303 9657 12224 ct 9111 12145 8683 11972 8702 11840 ct |
| 71 | 8721 11707 9181 11664 9727 11743 ct 10274 11822 10702 11995 10683 12127 ct p ef |
| 72 | 10761 12053 m 10721 11951 11064 11721 11526 11540 ct 11989 11359 12397 11296 12437 11397 ct |
| 73 | 12477 11499 12134 11729 11671 11910 ct 11209 12091 10801 12154 10761 12053 ct |
| 74 | p ef |
| 75 | 12410 11353 m 12366 11314 12500 11087 12710 10847 ct 12920 10607 13127 10444 13171 10483 ct |
| 76 | 13216 10522 13082 10749 12872 10989 ct 12662 11229 12455 11392 12410 11353 ct |
| 77 | p ef |
| 78 | 7901 12525 m 7790 12525 7700 12212 7700 11826 ct 7700 11440 7790 11127 7901 11127 ct |
| 79 | 8012 11127 8102 11440 8102 11826 ct 8102 12212 8012 12525 7901 12525 ct p ef |
| 80 | 7825 12576 m 7765 12669 7414 12548 7043 12306 ct 6671 12065 6419 11793 6479 11700 ct |
| 81 | 6540 11607 6891 11728 7262 11969 ct 7633 12211 7886 12483 7825 12576 ct p ef |
| 82 | 6460 11695 m 6434 11723 6333 11674 6233 11584 ct 6133 11495 6072 11399 6098 11371 ct |
| 83 | 6123 11342 6225 11392 6325 11481 ct 6425 11571 6485 11666 6460 11695 ct p ef |
| 84 | 13184 10437 m 13129 10414 13185 10156 13309 9862 ct 13434 9569 13580 9349 13634 9372 ct |
| 85 | 13688 9395 13632 9653 13508 9947 ct 13384 10240 13238 10460 13184 10437 ct p ef |
| 86 | 9899 11524 m 9790 11524 9700 11211 9700 10825 ct 9700 10439 9790 10126 9899 10126 ct |
| 87 | 10008 10126 10098 10439 10098 10825 ct 10098 11211 10008 11524 9899 11524 ct |
| 88 | p ef |
| 89 | 9827 11575 m 9767 11668 9416 11547 9045 11305 ct 8673 11064 8421 10792 8481 10699 ct |
| 90 | 8542 10606 8893 10727 9264 10968 ct 9635 11210 9888 11482 9827 11575 ct p ef |
| 91 | 6085 9230 m 5976 9132 6098 8819 6357 8533 ct 6616 8247 6915 8096 7024 8194 ct |
| 92 | 7133 8293 7012 8605 6753 8892 ct 6493 9178 6194 9329 6085 9230 ct p ef |
| 93 | 5910 9183 m 5806 9210 5629 8885 5516 8456 ct 5403 8028 5396 7658 5501 7630 ct |
| 94 | 5605 7602 5782 7928 5895 8357 ct 6008 8785 6014 9155 5910 9183 ct p ef |
| 95 | 8630 9344 m 8547 9270 8691 8977 8950 8691 ct 9209 8405 9486 8234 9568 8308 ct |
| 96 | 9650 8383 9507 8675 9248 8961 ct 8989 9247 8712 9419 8630 9344 ct p ef |
| 97 | 8566 9557 m 8478 9625 8187 9395 7917 9044 ct 7646 8693 7498 8353 7586 8285 ct |
| 98 | 7674 8217 7965 8448 8235 8799 ct 8505 9150 8654 9490 8566 9557 ct p ef |
| 99 | 6578 11626 m 6548 11638 6479 11543 6424 11413 ct 6370 11283 6351 11166 6381 11153 ct |
| 100 | 6412 11141 6481 11236 6535 11366 ct 6589 11496 6609 11613 6578 11626 ct p ef |
| 101 | 5952 11673 m 5959 11641 6081 11641 6224 11674 ct 6366 11706 6476 11759 6469 11791 ct |
| 102 | 6462 11823 6340 11823 6197 11791 ct 6055 11758 5945 11706 5952 11673 ct p ef |
| 103 | 5384 7616 m 5358 7644 5257 7595 5157 7505 ct 5057 7416 4996 7320 5022 7292 ct |
| 104 | 5047 7263 5149 7313 5249 7402 ct 5349 7492 5409 7587 5384 7616 ct p ef |
| 105 | 5502 7547 m 5472 7559 5403 7464 5348 7334 ct 5294 7204 5275 7087 5305 7074 ct |
| 106 | 5336 7062 5405 7157 5459 7287 ct 5513 7417 5533 7534 5502 7547 ct p ef |
| 107 | 4875 7594 m 4882 7562 5004 7562 5147 7594 ct 5289 7627 5399 7679 5392 7712 ct |
| 108 | 5385 7744 5263 7744 5120 7711 ct 4978 7679 4868 7626 4875 7594 ct p ef |
| 109 | 9763 8248 m 9738 8220 9798 8124 9897 8035 ct 9996 7946 10097 7896 10122 7924 ct |
| 110 | 10147 7951 10087 8047 9988 8136 ct 9889 8225 9787 8275 9763 8248 ct p ef |
| 111 | 9639 8179 m 9608 8166 9628 8050 9682 7920 ct 9737 7790 9806 7694 9836 7707 ct |
| 112 | 9867 7719 9847 7836 9793 7966 ct 9739 8096 9669 8192 9639 8179 ct p ef |
| 113 | 10269 8228 m 10277 8260 10166 8312 10024 8344 ct 9881 8376 9759 8376 9752 8344 ct |
| 114 | 9745 8311 9855 8259 9998 8227 ct 10140 8195 10262 8196 10269 8228 ct p ef |
| 115 | 9749 10085 m 9724 10113 9622 10064 9523 9975 ct 9424 9886 9363 9791 9388 9762 ct |
| 116 | 9414 9734 9516 9784 9615 9872 ct 9714 9961 9774 10057 9749 10085 ct p ef |
| 117 | 9868 10017 m 9839 10029 9770 9933 9715 9803 ct 9661 9673 9642 9557 9671 9544 ct |
| 118 | 9701 9532 9770 9628 9824 9758 ct 9879 9888 9898 10004 9868 10017 ct p ef |
| 119 | 9242 10063 m 9249 10031 9371 10031 9514 10064 ct 9656 10096 9766 10149 9759 10181 ct |
| 120 | 9752 10213 9630 10213 9487 10181 ct 9345 10148 9235 10096 9242 10063 ct p ef |
| 121 | 6841 4401 m 6726 4212 7272 3669 8060 3190 ct 8848 2710 9581 2475 9696 2664 ct |
| 122 | 9811 2853 9265 3396 8477 3875 ct 7689 4354 6956 4590 6841 4401 ct p ef |
| 123 | 9098 6041 m 8863 6352 8161 6220 7532 5745 ct 6903 5271 6583 4632 6818 4321 ct |
| 124 | 7053 4009 7755 4142 8384 4617 ct 9013 5091 9333 5730 9098 6041 ct p ef |
| 125 | 7879 5222 m 7746 5124 7956 4610 8348 4075 ct 8740 3540 9167 3185 9300 3283 ct |
| 126 | 9433 3380 9224 3895 8832 4430 ct 8440 4964 8012 5319 7879 5222 ct p ef |
| 127 | 9004 6100 m 8786 6059 8751 5255 8927 4303 ct 9103 3351 9424 2612 9642 2652 ct |
| 128 | 9861 2693 9896 3498 9719 4449 ct 9543 5401 9222 6140 9004 6100 ct p ef |
| 129 | 106 lw 1 lj 9435 13668 m 9429 13652 l 9421 13637 l 9412 13622 l 9401 13607 l |
| 130 | 9390 13593 l 9377 13579 l 9363 13565 l 9347 13552 l 9331 13539 l 9313 13526 l |
| 131 | 9295 13515 l 9275 13503 l 9254 13493 l 9233 13482 l 9211 13473 l 9188 13464 l |
| 132 | 9164 13456 l 9139 13448 l 9114 13441 l 9088 13435 l 9062 13430 l 9035 13425 l |
| 133 | 9008 13422 l 8981 13419 l 8953 13416 l 8925 13415 l 8898 13414 l 8870 13414 l |
| 134 | 8842 13415 l 8814 13417 l 8787 13419 l 8759 13422 l 8732 13426 l 8706 13431 l |
| 135 | 8680 13437 l 8654 13443 l 8629 13450 l 8605 13458 l 8581 13466 l 8558 13475 l |
| 136 | 8536 13485 l 8514 13495 l 8494 13506 l 8475 13517 l 8456 13529 l 8439 13542 l |
| 137 | 8423 13555 l 8408 13568 l 8394 13582 l 8381 13596 l 8370 13611 l 8360 13626 l |
| 138 | 8351 13641 l 8344 13656 l 8338 13672 l 8333 13687 l 8330 13703 l 8328 13719 l |
| 139 | 8327 13735 l 8328 13751 l 8330 13767 l 8334 13783 l 8338 13798 l 8345 13814 l |
| 140 | 8352 13829 l 8361 13844 l 8372 13859 l 8383 13874 l 8396 13888 l 8410 13902 l |
| 141 | 8425 13915 l 8441 13928 l 8459 13940 l 8477 13952 l 8497 13964 l 8517 13974 l |
| 142 | 8539 13985 l 8561 13994 l 8584 14003 l 8608 14011 l 8632 14019 l 8657 14026 l |
| 143 | 8683 14032 l 8709 14037 l 8736 14042 l 8763 14046 l 8790 14049 l 8818 14052 l |
| 144 | 8846 14053 l 8873 14054 l 8901 14054 l 8929 14053 l 8957 14051 l ps |
| 145 | 8347 14443 m 8354 14459 l 8362 14474 l 8371 14489 l 8382 14504 l 8394 14518 l |
| 146 | 8407 14533 l 8421 14546 l 8436 14560 l 8453 14573 l 8471 14585 l 8490 14597 l |
| 147 | 8510 14608 l 8530 14619 l 8552 14629 l 8575 14639 l 8598 14647 l 8622 14656 l |
| 148 | 8647 14663 l 8673 14670 l 8699 14676 l 8725 14681 l 8752 14685 l 8779 14689 l |
| 149 | 8807 14692 l 8835 14694 l 8863 14695 l 8891 14696 l 8919 14696 l 8947 14695 l |
| 150 | 8975 14693 l 9002 14690 l 9030 14687 l 9057 14682 l 9083 14677 l 9109 14672 l |
| 151 | 9135 14665 l 9160 14658 l 9184 14650 l 9208 14641 l 9231 14632 l 9253 14622 l |
| 152 | 9274 14612 l 9294 14600 l 9313 14589 l 9332 14576 l 9349 14564 l 9364 14550 l |
| 153 | 9379 14537 l 9393 14523 l 9405 14508 l 9416 14494 l 9425 14479 l 9434 14463 l |
| 154 | 9441 14448 l 9446 14432 l 9451 14416 l 9453 14400 l 9455 14384 l 9455 14368 l |
| 155 | 9453 14352 l 9451 14336 l 9446 14320 l 9441 14305 l 9434 14289 l 9426 14274 l |
| 156 | 9416 14259 l 9405 14244 l 9393 14230 l 9380 14216 l 9365 14202 l 9349 14189 l |
| 157 | 9332 14176 l 9314 14164 l 9295 14152 l 9275 14141 l 9254 14130 l 9232 14120 l |
| 158 | 9209 14111 l 9185 14102 l 9161 14094 l 9136 14087 l 9110 14081 l 9084 14075 l |
| 159 | 9057 14070 l 9030 14066 l 9003 14062 l 8975 14059 l 8948 14057 l ps |
| 160 | 10974 13668 m 10968 13652 l 10960 13637 l 10951 13622 l 10940 13607 l |
| 161 | 10929 13593 l 10916 13579 l 10902 13565 l 10886 13552 l 10870 13539 l |
| 162 | 10853 13526 l 10834 13515 l 10814 13503 l 10794 13493 l 10772 13482 l |
| 163 | 10750 13473 l 10727 13464 l 10703 13456 l 10679 13448 l 10653 13441 l |
| 164 | 10628 13435 l 10602 13430 l 10575 13425 l 10548 13422 l 10521 13419 l |
| 165 | 10493 13416 l 10465 13415 l 10438 13414 l 10410 13414 l 10382 13415 l |
| 166 | 10354 13417 l 10327 13419 l 10300 13422 l 10273 13426 l 10246 13431 l |
| 167 | 10220 13437 l 10194 13443 l 10169 13450 l 10145 13458 l 10121 13466 l |
| 168 | 10098 13475 l 10076 13485 l 10055 13495 l 10035 13506 l 10015 13517 l |
| 169 | 9997 13529 l 9980 13542 l 9964 13555 l 9949 13568 l 9935 13582 l 9922 13596 l |
| 170 | 9911 13611 l 9901 13626 l 9892 13641 l 9885 13656 l 9879 13672 l 9874 13687 l |
| 171 | 9871 13703 l 9869 13719 l 9868 13735 l 9869 13751 l 9871 13767 l 9875 13783 l |
| 172 | 9879 13798 l 9886 13814 l 9893 13829 l 9902 13844 l 9912 13859 l 9924 13874 l |
| 173 | 9937 13888 l 9951 13902 l 9966 13915 l 9982 13928 l 10000 13940 l |
| 174 | 10018 13952 l 10037 13964 l 10058 13974 l 10079 13985 l 10101 13994 l |
| 175 | 10124 14003 l 10148 14011 l 10173 14019 l 10198 14026 l 10223 14032 l |
| 176 | 10250 14037 l 10276 14042 l 10303 14046 l 10330 14049 l 10358 14052 l |
| 177 | 10386 14053 l 10413 14054 l 10441 14054 l 10469 14053 l 10497 14051 l |
| 178 | ps |
| 179 | 9888 14443 m 9895 14459 l 9903 14474 l 9912 14489 l 9923 14504 l 9934 14518 l |
| 180 | 9948 14533 l 9962 14546 l 9977 14560 l 9994 14573 l 10012 14585 l |
| 181 | 10031 14597 l 10050 14608 l 10071 14619 l 10093 14629 l 10115 14639 l |
| 182 | 10139 14647 l 10163 14656 l 10188 14663 l 10213 14670 l 10239 14676 l |
| 183 | 10265 14681 l 10292 14685 l 10320 14689 l 10347 14692 l 10375 14694 l |
| 184 | 10403 14695 l 10431 14696 l 10459 14696 l 10487 14695 l 10514 14693 l |
| 185 | 10542 14690 l 10569 14687 l 10596 14682 l 10623 14677 l 10649 14672 l |
| 186 | 10675 14665 l 10700 14658 l 10724 14650 l 10748 14641 l 10770 14632 l |
| 187 | 10792 14622 l 10813 14612 l 10834 14600 l 10853 14589 l 10871 14576 l |
| 188 | 10888 14564 l 10904 14550 l 10918 14537 l 10932 14523 l 10944 14508 l |
| 189 | 10955 14494 l 10965 14479 l 10973 14463 l 10980 14448 l 10985 14432 l |
| 190 | 10990 14416 l 10992 14400 l 10994 14384 l 10994 14368 l 10992 14352 l |
| 191 | 10990 14336 l 10986 14320 l 10980 14305 l 10973 14289 l 10965 14274 l |
| 192 | 10955 14259 l 10944 14244 l 10932 14230 l 10919 14216 l 10904 14202 l |
| 193 | 10888 14189 l 10871 14176 l 10853 14164 l 10834 14152 l 10814 14141 l |
| 194 | 10793 14130 l 10771 14120 l 10748 14111 l 10725 14102 l 10700 14094 l |
| 195 | 10675 14087 l 10650 14081 l 10624 14075 l 10597 14070 l 10570 14066 l |
| 196 | 10543 14062 l 10515 14059 l 10488 14057 l ps |
| 197 | 7205 14684 m 6849 14684 6559 14412 6559 14078 ct 6559 13744 6849 13472 7205 13472 ct |
| 198 | 7561 13472 7851 13744 7851 14078 ct 7851 14412 7561 14684 7205 14684 ct pc |
| 199 | 5427 13589 m 5427 14657 l ps |
| 200 | 5374 13560 m 6242 13560 l ps |
| 201 | 5374 13914 m 6090 13914 l ps |
| 202 | 11776 13397 m 11776 14697 l ps |
| @@ -205,11 +205,11 @@ | |
| 205 | gr |
| 206 | gs |
| 207 | 1000 1000 m 20589 1000 l 20589 26939 l 1000 26939 l 1000 1000 l eoclip newpath |
| 208 | gr |
| 209 | gr |
| 210 | 0 25940 t |
| 211 | pom |
| 212 | count op_count sub {pop} repeat countdictstack dict_count sub {end} repeat b4_inc_state restore |
| 213 | %%PageTrailer |
| 214 | %%Trailer |
| 215 | %%EOF |
| 216 |
+1
-1
| --- www/sync.wiki | ||
| +++ www/sync.wiki | ||
| @@ -189,11 +189,11 @@ | ||
| 189 | 189 | <blockquote> |
| 190 | 190 | <b>file</b> <i>artifact-id size</i> <b>\n</b> <i>content</i><br> |
| 191 | 191 | <b>file</b> <i>artifact-id delta-artifact-id size</i> <b>\n</b> <i>content</i> |
| 192 | 192 | </blockquote> |
| 193 | 193 | |
| 194 | -<p>File cards are followed by in-line "payload" data. | |
| 194 | +<p>File cards are followed by in-line "payload" data. | |
| 195 | 195 | The content of the artifact |
| 196 | 196 | or the artifact delta is the first <i>size</i> bytes of the |
| 197 | 197 | x-fossil content that immediately follow the newline that |
| 198 | 198 | terminates the file card. |
| 199 | 199 | </p> |
| 200 | 200 |
| --- www/sync.wiki | |
| +++ www/sync.wiki | |
| @@ -189,11 +189,11 @@ | |
| 189 | <blockquote> |
| 190 | <b>file</b> <i>artifact-id size</i> <b>\n</b> <i>content</i><br> |
| 191 | <b>file</b> <i>artifact-id delta-artifact-id size</i> <b>\n</b> <i>content</i> |
| 192 | </blockquote> |
| 193 | |
| 194 | <p>File cards are followed by in-line "payload" data. |
| 195 | The content of the artifact |
| 196 | or the artifact delta is the first <i>size</i> bytes of the |
| 197 | x-fossil content that immediately follow the newline that |
| 198 | terminates the file card. |
| 199 | </p> |
| 200 |
| --- www/sync.wiki | |
| +++ www/sync.wiki | |
| @@ -189,11 +189,11 @@ | |
| 189 | <blockquote> |
| 190 | <b>file</b> <i>artifact-id size</i> <b>\n</b> <i>content</i><br> |
| 191 | <b>file</b> <i>artifact-id delta-artifact-id size</i> <b>\n</b> <i>content</i> |
| 192 | </blockquote> |
| 193 | |
| 194 | <p>File cards are followed by in-line "payload" data. |
| 195 | The content of the artifact |
| 196 | or the artifact delta is the first <i>size</i> bytes of the |
| 197 | x-fossil content that immediately follow the newline that |
| 198 | terminates the file card. |
| 199 | </p> |
| 200 |