Fossil SCM
Assorted improvements to Pikchr handling in the docs under the new skin.
Commit
b3d99d9260faa4dc63dfd98e1e04600637c9dd3a57a13a7c20a8ff75c9bf1782
Parent
eedcd15040ec36c…
5 files changed
+2
-18
+2
+1
-1
+2
-3
-1
+2
-18
| --- skins/default/css.txt | ||
| +++ skins/default/css.txt | ||
| @@ -332,27 +332,10 @@ | ||
| 332 | 332 | .content pre, table.numbered-lines > tbody > tr { |
| 333 | 333 | hyphens: none; |
| 334 | 334 | line-height: 1.25; |
| 335 | 335 | } |
| 336 | 336 | |
| 337 | -.content .pikchr-wrapper { | |
| 338 | - /* Pikchr was developed with the assumption that it would be | |
| 339 | - * integrated into a Fossil repo using the old 0.9em body font | |
| 340 | - * size, which no longer obtians. This gives us a choice: | |
| 341 | - * | |
| 342 | - * 1. Change Pikchr to track this skin change, potentially breaking | |
| 343 | - * uses of alternate skins with differing default font sizes. | |
| 344 | - * 2. Restore the old default for Pikchr diagrams so the old | |
| 345 | - * assumptions continue to be valid. | |
| 346 | - * 3. Make everyone with custom skins set pikchr-scale=1.11 (1/0.9) | |
| 347 | - * in their skin's footer.txt to increase the diagram's relative | |
| 348 | - * size to compensate for the font size change. | |
| 349 | - * | |
| 350 | - * We choose #2 because it puts both adjustments in the same file. */ | |
| 351 | - font-size: 0.9em; | |
| 352 | -} | |
| 353 | - | |
| 354 | 337 | .content ul li { |
| 355 | 338 | list-style-type: disc; |
| 356 | 339 | } |
| 357 | 340 | |
| 358 | 341 | .doc > .content table { |
| @@ -700,11 +683,12 @@ | ||
| 700 | 683 | /* Selector naming scheme mismatch is intentional: it must match the |
| 701 | 684 | * way it's given in default.css exactly if it is to override it. */ |
| 702 | 685 | margin-left: 70pt; |
| 703 | 686 | margin-right: 50pt; |
| 704 | 687 | } |
| 705 | - div.pikchr-wrapper.center:not(.source) { | |
| 688 | + div.pikchr-wrapper.center:not(.source), | |
| 689 | + div.pikchr-wrapper.float-right:not(.source) { | |
| 706 | 690 | margin-left: 0; |
| 707 | 691 | } |
| 708 | 692 | |
| 709 | 693 | /* Special treatment for backward compatibility. */ |
| 710 | 694 | .indent, /* clean alternative to misusing <blockquote> */ |
| 711 | 695 |
| --- skins/default/css.txt | |
| +++ skins/default/css.txt | |
| @@ -332,27 +332,10 @@ | |
| 332 | .content pre, table.numbered-lines > tbody > tr { |
| 333 | hyphens: none; |
| 334 | line-height: 1.25; |
| 335 | } |
| 336 | |
| 337 | .content .pikchr-wrapper { |
| 338 | /* Pikchr was developed with the assumption that it would be |
| 339 | * integrated into a Fossil repo using the old 0.9em body font |
| 340 | * size, which no longer obtians. This gives us a choice: |
| 341 | * |
| 342 | * 1. Change Pikchr to track this skin change, potentially breaking |
| 343 | * uses of alternate skins with differing default font sizes. |
| 344 | * 2. Restore the old default for Pikchr diagrams so the old |
| 345 | * assumptions continue to be valid. |
| 346 | * 3. Make everyone with custom skins set pikchr-scale=1.11 (1/0.9) |
| 347 | * in their skin's footer.txt to increase the diagram's relative |
| 348 | * size to compensate for the font size change. |
| 349 | * |
| 350 | * We choose #2 because it puts both adjustments in the same file. */ |
| 351 | font-size: 0.9em; |
| 352 | } |
| 353 | |
| 354 | .content ul li { |
| 355 | list-style-type: disc; |
| 356 | } |
| 357 | |
| 358 | .doc > .content table { |
| @@ -700,11 +683,12 @@ | |
| 700 | /* Selector naming scheme mismatch is intentional: it must match the |
| 701 | * way it's given in default.css exactly if it is to override it. */ |
| 702 | margin-left: 70pt; |
| 703 | margin-right: 50pt; |
| 704 | } |
| 705 | div.pikchr-wrapper.center:not(.source) { |
| 706 | margin-left: 0; |
| 707 | } |
| 708 | |
| 709 | /* Special treatment for backward compatibility. */ |
| 710 | .indent, /* clean alternative to misusing <blockquote> */ |
| 711 |
| --- skins/default/css.txt | |
| +++ skins/default/css.txt | |
| @@ -332,27 +332,10 @@ | |
| 332 | .content pre, table.numbered-lines > tbody > tr { |
| 333 | hyphens: none; |
| 334 | line-height: 1.25; |
| 335 | } |
| 336 | |
| 337 | .content ul li { |
| 338 | list-style-type: disc; |
| 339 | } |
| 340 | |
| 341 | .doc > .content table { |
| @@ -700,11 +683,12 @@ | |
| 683 | /* Selector naming scheme mismatch is intentional: it must match the |
| 684 | * way it's given in default.css exactly if it is to override it. */ |
| 685 | margin-left: 70pt; |
| 686 | margin-right: 50pt; |
| 687 | } |
| 688 | div.pikchr-wrapper.center:not(.source), |
| 689 | div.pikchr-wrapper.float-right:not(.source) { |
| 690 | margin-left: 0; |
| 691 | } |
| 692 | |
| 693 | /* Special treatment for backward compatibility. */ |
| 694 | .indent, /* clean alternative to misusing <blockquote> */ |
| 695 |
| --- skins/default/details.txt | ||
| +++ skins/default/details.txt | ||
| @@ -1,4 +1,6 @@ | ||
| 1 | +pikchr-fontscale: "0.9" | |
| 2 | +pikchr-scale: "1.1" | |
| 1 | 3 | timeline-arrowheads: 1 |
| 2 | 4 | timeline-circle-nodes: 1 |
| 3 | 5 | timeline-color-graph-lines: 1 |
| 4 | 6 | white-foreground: 0 |
| 5 | 7 |
| --- skins/default/details.txt | |
| +++ skins/default/details.txt | |
| @@ -1,4 +1,6 @@ | |
| 1 | timeline-arrowheads: 1 |
| 2 | timeline-circle-nodes: 1 |
| 3 | timeline-color-graph-lines: 1 |
| 4 | white-foreground: 0 |
| 5 |
| --- skins/default/details.txt | |
| +++ skins/default/details.txt | |
| @@ -1,4 +1,6 @@ | |
| 1 | pikchr-fontscale: "0.9" |
| 2 | pikchr-scale: "1.1" |
| 3 | timeline-arrowheads: 1 |
| 4 | timeline-circle-nodes: 1 |
| 5 | timeline-color-graph-lines: 1 |
| 6 | white-foreground: 0 |
| 7 |
+1
-1
| --- www/branching.wiki | ||
| +++ www/branching.wiki | ||
| @@ -491,11 +491,11 @@ | ||
| 491 | 491 | [#dist-clone|Above], we stated that forks carry a risk that development |
| 492 | 492 | effort on a branch can be divided among the forks. It might not be |
| 493 | 493 | immediately obvious why this is so. To see it, consider this swim lane |
| 494 | 494 | diagram: |
| 495 | 495 | |
| 496 | -<verbatim type="pikchr center toggle toggle"> | |
| 496 | +<verbatim type="pikchr center toggle"> | |
| 497 | 497 | $laneh = 0.75 |
| 498 | 498 | |
| 499 | 499 | ALL: [ |
| 500 | 500 | # Draw the lanes |
| 501 | 501 | down |
| 502 | 502 |
| --- www/branching.wiki | |
| +++ www/branching.wiki | |
| @@ -491,11 +491,11 @@ | |
| 491 | [#dist-clone|Above], we stated that forks carry a risk that development |
| 492 | effort on a branch can be divided among the forks. It might not be |
| 493 | immediately obvious why this is so. To see it, consider this swim lane |
| 494 | diagram: |
| 495 | |
| 496 | <verbatim type="pikchr center toggle toggle"> |
| 497 | $laneh = 0.75 |
| 498 | |
| 499 | ALL: [ |
| 500 | # Draw the lanes |
| 501 | down |
| 502 |
| --- www/branching.wiki | |
| +++ www/branching.wiki | |
| @@ -491,11 +491,11 @@ | |
| 491 | [#dist-clone|Above], we stated that forks carry a risk that development |
| 492 | effort on a branch can be divided among the forks. It might not be |
| 493 | immediately obvious why this is so. To see it, consider this swim lane |
| 494 | diagram: |
| 495 | |
| 496 | <verbatim type="pikchr center toggle"> |
| 497 | $laneh = 0.75 |
| 498 | |
| 499 | ALL: [ |
| 500 | # Draw the lanes |
| 501 | down |
| 502 |
+2
-3
| --- www/delta_encoder_algorithm.wiki | ||
| +++ www/delta_encoder_algorithm.wiki | ||
| @@ -107,13 +107,13 @@ | ||
| 107 | 107 | <li>move the window forward one byte. |
| 108 | 108 | </li> |
| 109 | 109 | </ul> |
| 110 | 110 | </p> |
| 111 | 111 | |
| 112 | -<div style="float:right"> | |
| 113 | -<verbatim type="pikchr" style="float:right"> | |
| 112 | +<verbatim type="pikchr float-right"> | |
| 114 | 113 | TARGET: [ |
| 114 | + scale = 0.8 | |
| 115 | 115 | down |
| 116 | 116 | "Target" bold |
| 117 | 117 | box fill palegreen width 150% height 200% "Processed" |
| 118 | 118 | GI: box same as first box fill yellow height 25% "Gap → Insert" |
| 119 | 119 | CC: box same fill orange height 200% "Common → Copy" |
| @@ -133,11 +133,10 @@ | ||
| 133 | 133 | B3: box fill white height 200% |
| 134 | 134 | ] with .nw at 0.75 right of TARGET.ne |
| 135 | 135 | |
| 136 | 136 | arrow from TARGET.W.e to ORIGIN.B2.w "Signature" aligned above |
| 137 | 137 | </verbatim> |
| 138 | -</div> | |
| 139 | 138 | |
| 140 | 139 | <p>To make this decision the encoder first computes the hash value for |
| 141 | 140 | the NHASH bytes in the window and then looks at all the locations in |
| 142 | 141 | the "origin" which have the same signature. This part uses the hash |
| 143 | 142 | table created by the pre-processing step to efficiently find these |
| 144 | 143 |
| --- www/delta_encoder_algorithm.wiki | |
| +++ www/delta_encoder_algorithm.wiki | |
| @@ -107,13 +107,13 @@ | |
| 107 | <li>move the window forward one byte. |
| 108 | </li> |
| 109 | </ul> |
| 110 | </p> |
| 111 | |
| 112 | <div style="float:right"> |
| 113 | <verbatim type="pikchr" style="float:right"> |
| 114 | TARGET: [ |
| 115 | down |
| 116 | "Target" bold |
| 117 | box fill palegreen width 150% height 200% "Processed" |
| 118 | GI: box same as first box fill yellow height 25% "Gap → Insert" |
| 119 | CC: box same fill orange height 200% "Common → Copy" |
| @@ -133,11 +133,10 @@ | |
| 133 | B3: box fill white height 200% |
| 134 | ] with .nw at 0.75 right of TARGET.ne |
| 135 | |
| 136 | arrow from TARGET.W.e to ORIGIN.B2.w "Signature" aligned above |
| 137 | </verbatim> |
| 138 | </div> |
| 139 | |
| 140 | <p>To make this decision the encoder first computes the hash value for |
| 141 | the NHASH bytes in the window and then looks at all the locations in |
| 142 | the "origin" which have the same signature. This part uses the hash |
| 143 | table created by the pre-processing step to efficiently find these |
| 144 |
| --- www/delta_encoder_algorithm.wiki | |
| +++ www/delta_encoder_algorithm.wiki | |
| @@ -107,13 +107,13 @@ | |
| 107 | <li>move the window forward one byte. |
| 108 | </li> |
| 109 | </ul> |
| 110 | </p> |
| 111 | |
| 112 | <verbatim type="pikchr float-right"> |
| 113 | TARGET: [ |
| 114 | scale = 0.8 |
| 115 | down |
| 116 | "Target" bold |
| 117 | box fill palegreen width 150% height 200% "Processed" |
| 118 | GI: box same as first box fill yellow height 25% "Gap → Insert" |
| 119 | CC: box same fill orange height 200% "Common → Copy" |
| @@ -133,11 +133,10 @@ | |
| 133 | B3: box fill white height 200% |
| 134 | ] with .nw at 0.75 right of TARGET.ne |
| 135 | |
| 136 | arrow from TARGET.W.e to ORIGIN.B2.w "Signature" aligned above |
| 137 | </verbatim> |
| 138 | |
| 139 | <p>To make this decision the encoder first computes the hash value for |
| 140 | the NHASH bytes in the window and then looks at all the locations in |
| 141 | the "origin" which have the same signature. This part uses the hash |
| 142 | table created by the pre-processing step to efficiently find these |
| 143 |
-1
| --- www/glossary.md | ||
| +++ www/glossary.md | ||
| @@ -167,11 +167,10 @@ | ||
| 167 | 167 | suffices for simple purposes, but you may have use for something |
| 168 | 168 | more complicated. This author uses a scheme like the following on |
| 169 | 169 | mobile machines that shuttle between home and the office: |
| 170 | 170 | |
| 171 | 171 | ``` pikchr toggle indent |
| 172 | -scale=0.8 | |
| 173 | 172 | box "~/museum/" fit |
| 174 | 173 | move right 0.1 |
| 175 | 174 | line right dotted |
| 176 | 175 | move right 0.05 |
| 177 | 176 | box invis "where one stores valuable fossils" ljust |
| 178 | 177 |
| --- www/glossary.md | |
| +++ www/glossary.md | |
| @@ -167,11 +167,10 @@ | |
| 167 | suffices for simple purposes, but you may have use for something |
| 168 | more complicated. This author uses a scheme like the following on |
| 169 | mobile machines that shuttle between home and the office: |
| 170 | |
| 171 | ``` pikchr toggle indent |
| 172 | scale=0.8 |
| 173 | box "~/museum/" fit |
| 174 | move right 0.1 |
| 175 | line right dotted |
| 176 | move right 0.05 |
| 177 | box invis "where one stores valuable fossils" ljust |
| 178 |
| --- www/glossary.md | |
| +++ www/glossary.md | |
| @@ -167,11 +167,10 @@ | |
| 167 | suffices for simple purposes, but you may have use for something |
| 168 | more complicated. This author uses a scheme like the following on |
| 169 | mobile machines that shuttle between home and the office: |
| 170 | |
| 171 | ``` pikchr toggle indent |
| 172 | box "~/museum/" fit |
| 173 | move right 0.1 |
| 174 | line right dotted |
| 175 | move right 0.05 |
| 176 | box invis "where one stores valuable fossils" ljust |
| 177 |