Fossil SCM
Convert the diagrams in the "Rebase Considered Harmful" document over to Pikchr.
Commit
38d6a8f30eb0d58a9817350f9d987c04880d3d48766f50297bf4374b2ea2ca12
Parent
bac677f7a968d33…
6 files changed
-71
-69
-92
-108
-101
+101
-5
D
www/rebase01.svg
-71
| --- a/www/rebase01.svg | ||
| +++ b/www/rebase01.svg | ||
| @@ -1,71 +0,0 @@ | ||
| 1 | -<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="289" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="97" font-family="'Dialog'" font-style="normal" stroke-linejoin="miter" font-size="12px" stroke-dashoffset="0" image-rendering="auto"> | |
| 2 | - <!--Generated by ySVG 2.5--> | |
| 3 | - <defs id="genericDefs"/> | |
| 4 | - <g> | |
| 5 | - <defs id="defs1"> | |
| 6 | - <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"> | |
| 7 | - <path d="M0 0 L289 0 L289 97 L0 97 L0 0 Z"/> | |
| 8 | - </clipPath> | |
| 9 | - <clipPath clipPathUnits="userSpaceOnUse" id="clipPath2"> | |
| 10 | - <path d="M193 -522 L482 -522 L482 -425 L193 -425 L193 -522 Z"/> | |
| 11 | - </clipPath> | |
| 12 | - </defs> | |
| 13 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="translate(-193,522)" stroke="white"> | |
| 14 | - <rect x="193" width="289" height="97" y="-522" clip-path="url(#clipPath2)" stroke="none"/> | |
| 15 | - </g> | |
| 16 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> | |
| 17 | - <circle r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668" stroke="none"/> | |
| 18 | - </g> | |
| 19 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> | |
| 20 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668"/> | |
| 21 | - <text x="210.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C0</text> | |
| 22 | - </g> | |
| 23 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> | |
| 24 | - <circle r="15" clip-path="url(#clipPath2)" cx="278.5" cy="-450.668" stroke="none"/> | |
| 25 | - </g> | |
| 26 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> | |
| 27 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="278.5" cy="-450.668"/> | |
| 28 | - <text x="270.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C1</text> | |
| 29 | - </g> | |
| 30 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> | |
| 31 | - <circle r="15" clip-path="url(#clipPath2)" cx="338.5" cy="-450.668" stroke="none"/> | |
| 32 | - </g> | |
| 33 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> | |
| 34 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="338.5" cy="-450.668"/> | |
| 35 | - <text x="330.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C2</text> | |
| 36 | - </g> | |
| 37 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> | |
| 38 | - <circle r="15" clip-path="url(#clipPath2)" cx="397.5" cy="-450.668" stroke="none"/> | |
| 39 | - </g> | |
| 40 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> | |
| 41 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="397.5" cy="-450.668"/> | |
| 42 | - <text x="389.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C3</text> | |
| 43 | - </g> | |
| 44 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> | |
| 45 | - <circle r="15" clip-path="url(#clipPath2)" cx="456.5" cy="-450.668" stroke="none"/> | |
| 46 | - </g> | |
| 47 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> | |
| 48 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="456.5" cy="-450.668"/> | |
| 49 | - <text x="448.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C5</text> | |
| 50 | - </g> | |
| 51 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> | |
| 52 | - <circle r="15" clip-path="url(#clipPath2)" cx="397.5" cy="-496.8418" stroke="none"/> | |
| 53 | - </g> | |
| 54 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> | |
| 55 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="397.5" cy="-496.8418"/> | |
| 56 | - <text x="389.5547" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C4</text> | |
| 57 | - <path fill="none" d="M233.5 -450.668 L255.5 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 58 | - <path d="M263.5 -450.668 L251.5 -455.668 L254.5 -450.668 L251.5 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 59 | - <path fill="none" d="M293.5 -450.668 L315.5 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 60 | - <path d="M323.5 -450.668 L311.5 -455.668 L314.5 -450.668 L311.5 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 61 | - <path fill="none" d="M353.5 -450.668 L374.5 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 62 | - <path d="M382.5 -450.668 L370.5 -455.668 L373.5 -450.668 L370.5 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 63 | - <path fill="none" d="M412.5 -450.668 L433.5 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 64 | - <path d="M441.5 -450.668 L429.5 -455.668 L432.5 -450.668 L429.5 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 65 | - <path fill="none" d="M350.3126 -459.9126 L379.3874 -482.6667" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 66 | - <path d="M385.6874 -487.5972 L373.1558 -484.139 L378.5999 -482.0504 L379.3189 -476.264 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 67 | - <path fill="none" d="M409.3126 -487.5972 L438.3874 -464.843" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 68 | - <path d="M444.6874 -459.9126 L438.3189 -471.2458 L437.5999 -465.4594 L432.1559 -463.3708 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 69 | - </g> | |
| 70 | - </g> | |
| 71 | -</svg> |
| --- a/www/rebase01.svg | |
| +++ b/www/rebase01.svg | |
| @@ -1,71 +0,0 @@ | |
| 1 | <?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="289" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="97" font-family="'Dialog'" font-style="normal" stroke-linejoin="miter" font-size="12px" stroke-dashoffset="0" image-rendering="auto"> |
| 2 | <!--Generated by ySVG 2.5--> |
| 3 | <defs id="genericDefs"/> |
| 4 | <g> |
| 5 | <defs id="defs1"> |
| 6 | <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"> |
| 7 | <path d="M0 0 L289 0 L289 97 L0 97 L0 0 Z"/> |
| 8 | </clipPath> |
| 9 | <clipPath clipPathUnits="userSpaceOnUse" id="clipPath2"> |
| 10 | <path d="M193 -522 L482 -522 L482 -425 L193 -425 L193 -522 Z"/> |
| 11 | </clipPath> |
| 12 | </defs> |
| 13 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="translate(-193,522)" stroke="white"> |
| 14 | <rect x="193" width="289" height="97" y="-522" clip-path="url(#clipPath2)" stroke="none"/> |
| 15 | </g> |
| 16 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> |
| 17 | <circle r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668" stroke="none"/> |
| 18 | </g> |
| 19 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> |
| 20 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668"/> |
| 21 | <text x="210.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C0</text> |
| 22 | </g> |
| 23 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> |
| 24 | <circle r="15" clip-path="url(#clipPath2)" cx="278.5" cy="-450.668" stroke="none"/> |
| 25 | </g> |
| 26 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> |
| 27 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="278.5" cy="-450.668"/> |
| 28 | <text x="270.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C1</text> |
| 29 | </g> |
| 30 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> |
| 31 | <circle r="15" clip-path="url(#clipPath2)" cx="338.5" cy="-450.668" stroke="none"/> |
| 32 | </g> |
| 33 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> |
| 34 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="338.5" cy="-450.668"/> |
| 35 | <text x="330.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C2</text> |
| 36 | </g> |
| 37 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> |
| 38 | <circle r="15" clip-path="url(#clipPath2)" cx="397.5" cy="-450.668" stroke="none"/> |
| 39 | </g> |
| 40 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> |
| 41 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="397.5" cy="-450.668"/> |
| 42 | <text x="389.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C3</text> |
| 43 | </g> |
| 44 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> |
| 45 | <circle r="15" clip-path="url(#clipPath2)" cx="456.5" cy="-450.668" stroke="none"/> |
| 46 | </g> |
| 47 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> |
| 48 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="456.5" cy="-450.668"/> |
| 49 | <text x="448.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C5</text> |
| 50 | </g> |
| 51 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> |
| 52 | <circle r="15" clip-path="url(#clipPath2)" cx="397.5" cy="-496.8418" stroke="none"/> |
| 53 | </g> |
| 54 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> |
| 55 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="397.5" cy="-496.8418"/> |
| 56 | <text x="389.5547" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C4</text> |
| 57 | <path fill="none" d="M233.5 -450.668 L255.5 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 58 | <path d="M263.5 -450.668 L251.5 -455.668 L254.5 -450.668 L251.5 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 59 | <path fill="none" d="M293.5 -450.668 L315.5 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 60 | <path d="M323.5 -450.668 L311.5 -455.668 L314.5 -450.668 L311.5 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 61 | <path fill="none" d="M353.5 -450.668 L374.5 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 62 | <path d="M382.5 -450.668 L370.5 -455.668 L373.5 -450.668 L370.5 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 63 | <path fill="none" d="M412.5 -450.668 L433.5 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 64 | <path d="M441.5 -450.668 L429.5 -455.668 L432.5 -450.668 L429.5 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 65 | <path fill="none" d="M350.3126 -459.9126 L379.3874 -482.6667" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 66 | <path d="M385.6874 -487.5972 L373.1558 -484.139 L378.5999 -482.0504 L379.3189 -476.264 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 67 | <path fill="none" d="M409.3126 -487.5972 L438.3874 -464.843" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 68 | <path d="M444.6874 -459.9126 L438.3189 -471.2458 L437.5999 -465.4594 L432.1559 -463.3708 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 69 | </g> |
| 70 | </g> |
| 71 | </svg> |
| --- a/www/rebase01.svg | |
| +++ b/www/rebase01.svg | |
| @@ -1,71 +0,0 @@ | |
D
www/rebase02.svg
-69
| --- a/www/rebase02.svg | ||
| +++ b/www/rebase02.svg | ||
| @@ -1,69 +0,0 @@ | ||
| 1 | -<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="289" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="97" font-family="'Dialog'" font-style="normal" stroke-linejoin="miter" font-size="12px" stroke-dashoffset="0" image-rendering="auto"> | |
| 2 | - <!--Generated by ySVG 2.5--> | |
| 3 | - <defs id="genericDefs"/> | |
| 4 | - <g> | |
| 5 | - <defs id="defs1"> | |
| 6 | - <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"> | |
| 7 | - <path d="M0 0 L289 0 L289 97 L0 97 L0 0 Z"/> | |
| 8 | - </clipPath> | |
| 9 | - <clipPath clipPathUnits="userSpaceOnUse" id="clipPath2"> | |
| 10 | - <path d="M193 -522 L482 -522 L482 -425 L193 -425 L193 -522 Z"/> | |
| 11 | - </clipPath> | |
| 12 | - </defs> | |
| 13 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="translate(-193,522)" stroke="white"> | |
| 14 | - <rect x="193" width="289" height="97" y="-522" clip-path="url(#clipPath2)" stroke="none"/> | |
| 15 | - </g> | |
| 16 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> | |
| 17 | - <circle r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668" stroke="none"/> | |
| 18 | - </g> | |
| 19 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> | |
| 20 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668"/> | |
| 21 | - <text x="210.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C0</text> | |
| 22 | - </g> | |
| 23 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> | |
| 24 | - <circle r="15" clip-path="url(#clipPath2)" cx="278.5" cy="-450.668" stroke="none"/> | |
| 25 | - </g> | |
| 26 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> | |
| 27 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="278.5" cy="-450.668"/> | |
| 28 | - <text x="270.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C1</text> | |
| 29 | - </g> | |
| 30 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> | |
| 31 | - <circle r="15" clip-path="url(#clipPath2)" cx="338.5" cy="-450.668" stroke="none"/> | |
| 32 | - </g> | |
| 33 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> | |
| 34 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="338.5" cy="-450.668"/> | |
| 35 | - <text x="330.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C2</text> | |
| 36 | - </g> | |
| 37 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> | |
| 38 | - <circle r="15" clip-path="url(#clipPath2)" cx="397.5" cy="-450.668" stroke="none"/> | |
| 39 | - </g> | |
| 40 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> | |
| 41 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="397.5" cy="-450.668"/> | |
| 42 | - <text x="389.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C3</text> | |
| 43 | - </g> | |
| 44 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> | |
| 45 | - <circle r="15" clip-path="url(#clipPath2)" cx="456.5" cy="-450.668" stroke="none"/> | |
| 46 | - </g> | |
| 47 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> | |
| 48 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="456.5" cy="-450.668"/> | |
| 49 | - <text x="447.1807" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C4'</text> | |
| 50 | - </g> | |
| 51 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> | |
| 52 | - <circle r="15" clip-path="url(#clipPath2)" cx="397.5" cy="-496.8418" stroke="none"/> | |
| 53 | - </g> | |
| 54 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> | |
| 55 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="397.5" cy="-496.8418"/> | |
| 56 | - <text x="389.5547" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C4</text> | |
| 57 | - <path fill="none" d="M233.5 -450.668 L255.5 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 58 | - <path d="M263.5 -450.668 L251.5 -455.668 L254.5 -450.668 L251.5 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 59 | - <path fill="none" d="M293.5 -450.668 L315.5 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 60 | - <path d="M323.5 -450.668 L311.5 -455.668 L314.5 -450.668 L311.5 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 61 | - <path fill="none" d="M353.5 -450.668 L374.5 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 62 | - <path d="M382.5 -450.668 L370.5 -455.668 L373.5 -450.668 L370.5 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 63 | - <path fill="none" d="M412.5 -450.668 L433.5 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 64 | - <path d="M441.5 -450.668 L429.5 -455.668 L432.5 -450.668 L429.5 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 65 | - <path fill="none" d="M350.3126 -459.9126 L379.3874 -482.6667" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 66 | - <path d="M385.6874 -487.5972 L373.1558 -484.139 L378.5999 -482.0504 L379.3189 -476.264 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 67 | - </g> | |
| 68 | - </g> | |
| 69 | -</svg> |
| --- a/www/rebase02.svg | |
| +++ b/www/rebase02.svg | |
| @@ -1,69 +0,0 @@ | |
| 1 | <?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="289" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="97" font-family="'Dialog'" font-style="normal" stroke-linejoin="miter" font-size="12px" stroke-dashoffset="0" image-rendering="auto"> |
| 2 | <!--Generated by ySVG 2.5--> |
| 3 | <defs id="genericDefs"/> |
| 4 | <g> |
| 5 | <defs id="defs1"> |
| 6 | <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"> |
| 7 | <path d="M0 0 L289 0 L289 97 L0 97 L0 0 Z"/> |
| 8 | </clipPath> |
| 9 | <clipPath clipPathUnits="userSpaceOnUse" id="clipPath2"> |
| 10 | <path d="M193 -522 L482 -522 L482 -425 L193 -425 L193 -522 Z"/> |
| 11 | </clipPath> |
| 12 | </defs> |
| 13 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="translate(-193,522)" stroke="white"> |
| 14 | <rect x="193" width="289" height="97" y="-522" clip-path="url(#clipPath2)" stroke="none"/> |
| 15 | </g> |
| 16 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> |
| 17 | <circle r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668" stroke="none"/> |
| 18 | </g> |
| 19 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> |
| 20 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668"/> |
| 21 | <text x="210.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C0</text> |
| 22 | </g> |
| 23 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> |
| 24 | <circle r="15" clip-path="url(#clipPath2)" cx="278.5" cy="-450.668" stroke="none"/> |
| 25 | </g> |
| 26 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> |
| 27 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="278.5" cy="-450.668"/> |
| 28 | <text x="270.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C1</text> |
| 29 | </g> |
| 30 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> |
| 31 | <circle r="15" clip-path="url(#clipPath2)" cx="338.5" cy="-450.668" stroke="none"/> |
| 32 | </g> |
| 33 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> |
| 34 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="338.5" cy="-450.668"/> |
| 35 | <text x="330.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C2</text> |
| 36 | </g> |
| 37 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> |
| 38 | <circle r="15" clip-path="url(#clipPath2)" cx="397.5" cy="-450.668" stroke="none"/> |
| 39 | </g> |
| 40 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> |
| 41 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="397.5" cy="-450.668"/> |
| 42 | <text x="389.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C3</text> |
| 43 | </g> |
| 44 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> |
| 45 | <circle r="15" clip-path="url(#clipPath2)" cx="456.5" cy="-450.668" stroke="none"/> |
| 46 | </g> |
| 47 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> |
| 48 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="456.5" cy="-450.668"/> |
| 49 | <text x="447.1807" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C4'</text> |
| 50 | </g> |
| 51 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke="white"> |
| 52 | <circle r="15" clip-path="url(#clipPath2)" cx="397.5" cy="-496.8418" stroke="none"/> |
| 53 | </g> |
| 54 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-193,522)" stroke-linecap="butt"> |
| 55 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="397.5" cy="-496.8418"/> |
| 56 | <text x="389.5547" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C4</text> |
| 57 | <path fill="none" d="M233.5 -450.668 L255.5 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 58 | <path d="M263.5 -450.668 L251.5 -455.668 L254.5 -450.668 L251.5 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 59 | <path fill="none" d="M293.5 -450.668 L315.5 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 60 | <path d="M323.5 -450.668 L311.5 -455.668 L314.5 -450.668 L311.5 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 61 | <path fill="none" d="M353.5 -450.668 L374.5 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 62 | <path d="M382.5 -450.668 L370.5 -455.668 L373.5 -450.668 L370.5 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 63 | <path fill="none" d="M412.5 -450.668 L433.5 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 64 | <path d="M441.5 -450.668 L429.5 -455.668 L432.5 -450.668 L429.5 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 65 | <path fill="none" d="M350.3126 -459.9126 L379.3874 -482.6667" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 66 | <path d="M385.6874 -487.5972 L373.1558 -484.139 L378.5999 -482.0504 L379.3189 -476.264 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 67 | </g> |
| 68 | </g> |
| 69 | </svg> |
| --- a/www/rebase02.svg | |
| +++ b/www/rebase02.svg | |
| @@ -1,69 +0,0 @@ | |
D
www/rebase03.svg
-92
| --- a/www/rebase03.svg | ||
| +++ b/www/rebase03.svg | ||
| @@ -1,92 +0,0 @@ | ||
| 1 | -<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="326" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="157" font-family="'Dialog'" font-style="normal" stroke-linejoin="miter" font-size="12px" stroke-dashoffset="0" image-rendering="auto"> | |
| 2 | - <!--Generated by ySVG 2.5--> | |
| 3 | - <defs id="genericDefs"/> | |
| 4 | - <g> | |
| 5 | - <defs id="defs1"> | |
| 6 | - <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"> | |
| 7 | - <path d="M0 0 L326 0 L326 157 L0 157 L0 0 Z"/> | |
| 8 | - </clipPath> | |
| 9 | - <clipPath clipPathUnits="userSpaceOnUse" id="clipPath2"> | |
| 10 | - <path d="M180 -552 L506 -552 L506 -395 L180 -395 L180 -552 Z"/> | |
| 11 | - </clipPath> | |
| 12 | - </defs> | |
| 13 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="translate(-180,552)" stroke="white"> | |
| 14 | - <rect x="180" width="326" height="157" y="-552" clip-path="url(#clipPath2)" stroke="none"/> | |
| 15 | - </g> | |
| 16 | - <g fill="rgb(198,226,255)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="rgb(198,226,255)"> | |
| 17 | - <rect x="190.2647" width="304.8657" height="46" y="-473.8418" clip-path="url(#clipPath2)" stroke="none"/> | |
| 18 | - </g> | |
| 19 | - <g stroke-linecap="butt" transform="matrix(1,0,0,1,-180,552)" fill="rgb(124,165,204)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" stroke="rgb(124,165,204)" stroke-miterlimit="1.45"> | |
| 20 | - <rect fill="none" x="190.2647" width="304.8657" height="46" y="-473.8418" clip-path="url(#clipPath2)"/> | |
| 21 | - <text x="328.3245" y="-410.2403" clip-path="url(#clipPath2)" fill="black" font-family="sans-serif" stroke="none" xml:space="preserve">main</text> | |
| 22 | - </g> | |
| 23 | - <g fill="rgb(154,204,252)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="rgb(154,204,252)"> | |
| 24 | - <rect x="337.1353" width="157.9952" height="46" y="-519.8418" clip-path="url(#clipPath2)" stroke="none"/> | |
| 25 | - </g> | |
| 26 | - <g stroke-linecap="butt" transform="matrix(1,0,0,1,-180,552)" fill="rgb(124,165,204)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" stroke="rgb(124,165,204)" stroke-miterlimit="1.45"> | |
| 27 | - <rect fill="none" x="337.1353" width="157.9952" height="46" y="-519.8418" clip-path="url(#clipPath2)"/> | |
| 28 | - <text x="395.5049" y="-528.3731" clip-path="url(#clipPath2)" fill="black" font-family="sans-serif" stroke="none" xml:space="preserve">feature</text> | |
| 29 | - </g> | |
| 30 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="white"> | |
| 31 | - <circle r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668" stroke="none"/> | |
| 32 | - </g> | |
| 33 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke-linecap="butt"> | |
| 34 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668"/> | |
| 35 | - <text x="210.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C0</text> | |
| 36 | - </g> | |
| 37 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="white"> | |
| 38 | - <circle r="15" clip-path="url(#clipPath2)" cx="280.0721" cy="-450.668" stroke="none"/> | |
| 39 | - </g> | |
| 40 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke-linecap="butt"> | |
| 41 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="280.0721" cy="-450.668"/> | |
| 42 | - <text x="272.1268" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C1</text> | |
| 43 | - </g> | |
| 44 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="white"> | |
| 45 | - <circle r="15" clip-path="url(#clipPath2)" cx="341.6441" cy="-450.668" stroke="none"/> | |
| 46 | - </g> | |
| 47 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke-linecap="butt"> | |
| 48 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="341.6441" cy="-450.668"/> | |
| 49 | - <text x="333.6988" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C2</text> | |
| 50 | - </g> | |
| 51 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="white"> | |
| 52 | - <circle r="15" clip-path="url(#clipPath2)" cx="464.7883" cy="-450.668" stroke="none"/> | |
| 53 | - </g> | |
| 54 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke-linecap="butt"> | |
| 55 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="464.7883" cy="-450.668"/> | |
| 56 | - <text x="456.843" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C6</text> | |
| 57 | - </g> | |
| 58 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="white"> | |
| 59 | - <circle r="15" clip-path="url(#clipPath2)" cx="403.2162" cy="-450.668" stroke="none"/> | |
| 60 | - </g> | |
| 61 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke-linecap="butt"> | |
| 62 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="403.2162" cy="-450.668"/> | |
| 63 | - <text x="395.2709" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C4</text> | |
| 64 | - </g> | |
| 65 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="white"> | |
| 66 | - <circle r="15" clip-path="url(#clipPath2)" cx="372.4302" cy="-496.8418" stroke="none"/> | |
| 67 | - </g> | |
| 68 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke-linecap="butt"> | |
| 69 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="372.4302" cy="-496.8418"/> | |
| 70 | - <text x="364.4849" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C3</text> | |
| 71 | - </g> | |
| 72 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="white"> | |
| 73 | - <circle r="15" clip-path="url(#clipPath2)" cx="434.0022" cy="-496.8418" stroke="none"/> | |
| 74 | - </g> | |
| 75 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke-linecap="butt"> | |
| 76 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="434.0022" cy="-496.8418"/> | |
| 77 | - <text x="426.0569" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C5</text> | |
| 78 | - <path fill="none" d="M233.5 -450.668 L257.0721 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 79 | - <path d="M265.0721 -450.668 L253.0721 -455.668 L256.0721 -450.668 L253.0721 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 80 | - <path fill="none" d="M295.0721 -450.668 L318.6441 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 81 | - <path d="M326.6441 -450.668 L314.6441 -455.668 L317.6441 -450.668 L314.6441 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 82 | - <path fill="none" d="M356.6441 -450.668 L380.2162 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 83 | - <path d="M388.2162 -450.668 L376.2162 -455.668 L379.2162 -450.668 L376.2162 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 84 | - <path fill="none" d="M418.2162 -450.668 L441.7883 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 85 | - <path d="M449.7883 -450.668 L437.7883 -455.668 L440.7883 -450.668 L437.7883 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 86 | - <path fill="none" d="M349.9653 -463.1483 L359.6711 -477.7054" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 87 | - <path d="M364.109 -484.3615 L353.292 -477.151 L359.1163 -476.8734 L361.6122 -471.6036 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 88 | - <path fill="none" d="M387.4302 -496.8418 L411.0022 -496.8418" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 89 | - <path d="M419.0022 -496.8418 L407.0022 -501.8418 L410.0022 -496.8418 L407.0022 -491.8418 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 90 | - </g> | |
| 91 | - </g> | |
| 92 | -</svg> |
| --- a/www/rebase03.svg | |
| +++ b/www/rebase03.svg | |
| @@ -1,92 +0,0 @@ | |
| 1 | <?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="326" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="157" font-family="'Dialog'" font-style="normal" stroke-linejoin="miter" font-size="12px" stroke-dashoffset="0" image-rendering="auto"> |
| 2 | <!--Generated by ySVG 2.5--> |
| 3 | <defs id="genericDefs"/> |
| 4 | <g> |
| 5 | <defs id="defs1"> |
| 6 | <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"> |
| 7 | <path d="M0 0 L326 0 L326 157 L0 157 L0 0 Z"/> |
| 8 | </clipPath> |
| 9 | <clipPath clipPathUnits="userSpaceOnUse" id="clipPath2"> |
| 10 | <path d="M180 -552 L506 -552 L506 -395 L180 -395 L180 -552 Z"/> |
| 11 | </clipPath> |
| 12 | </defs> |
| 13 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="translate(-180,552)" stroke="white"> |
| 14 | <rect x="180" width="326" height="157" y="-552" clip-path="url(#clipPath2)" stroke="none"/> |
| 15 | </g> |
| 16 | <g fill="rgb(198,226,255)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="rgb(198,226,255)"> |
| 17 | <rect x="190.2647" width="304.8657" height="46" y="-473.8418" clip-path="url(#clipPath2)" stroke="none"/> |
| 18 | </g> |
| 19 | <g stroke-linecap="butt" transform="matrix(1,0,0,1,-180,552)" fill="rgb(124,165,204)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" stroke="rgb(124,165,204)" stroke-miterlimit="1.45"> |
| 20 | <rect fill="none" x="190.2647" width="304.8657" height="46" y="-473.8418" clip-path="url(#clipPath2)"/> |
| 21 | <text x="328.3245" y="-410.2403" clip-path="url(#clipPath2)" fill="black" font-family="sans-serif" stroke="none" xml:space="preserve">main</text> |
| 22 | </g> |
| 23 | <g fill="rgb(154,204,252)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="rgb(154,204,252)"> |
| 24 | <rect x="337.1353" width="157.9952" height="46" y="-519.8418" clip-path="url(#clipPath2)" stroke="none"/> |
| 25 | </g> |
| 26 | <g stroke-linecap="butt" transform="matrix(1,0,0,1,-180,552)" fill="rgb(124,165,204)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" stroke="rgb(124,165,204)" stroke-miterlimit="1.45"> |
| 27 | <rect fill="none" x="337.1353" width="157.9952" height="46" y="-519.8418" clip-path="url(#clipPath2)"/> |
| 28 | <text x="395.5049" y="-528.3731" clip-path="url(#clipPath2)" fill="black" font-family="sans-serif" stroke="none" xml:space="preserve">feature</text> |
| 29 | </g> |
| 30 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="white"> |
| 31 | <circle r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668" stroke="none"/> |
| 32 | </g> |
| 33 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke-linecap="butt"> |
| 34 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668"/> |
| 35 | <text x="210.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C0</text> |
| 36 | </g> |
| 37 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="white"> |
| 38 | <circle r="15" clip-path="url(#clipPath2)" cx="280.0721" cy="-450.668" stroke="none"/> |
| 39 | </g> |
| 40 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke-linecap="butt"> |
| 41 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="280.0721" cy="-450.668"/> |
| 42 | <text x="272.1268" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C1</text> |
| 43 | </g> |
| 44 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="white"> |
| 45 | <circle r="15" clip-path="url(#clipPath2)" cx="341.6441" cy="-450.668" stroke="none"/> |
| 46 | </g> |
| 47 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke-linecap="butt"> |
| 48 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="341.6441" cy="-450.668"/> |
| 49 | <text x="333.6988" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C2</text> |
| 50 | </g> |
| 51 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="white"> |
| 52 | <circle r="15" clip-path="url(#clipPath2)" cx="464.7883" cy="-450.668" stroke="none"/> |
| 53 | </g> |
| 54 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke-linecap="butt"> |
| 55 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="464.7883" cy="-450.668"/> |
| 56 | <text x="456.843" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C6</text> |
| 57 | </g> |
| 58 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="white"> |
| 59 | <circle r="15" clip-path="url(#clipPath2)" cx="403.2162" cy="-450.668" stroke="none"/> |
| 60 | </g> |
| 61 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke-linecap="butt"> |
| 62 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="403.2162" cy="-450.668"/> |
| 63 | <text x="395.2709" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C4</text> |
| 64 | </g> |
| 65 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="white"> |
| 66 | <circle r="15" clip-path="url(#clipPath2)" cx="372.4302" cy="-496.8418" stroke="none"/> |
| 67 | </g> |
| 68 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke-linecap="butt"> |
| 69 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="372.4302" cy="-496.8418"/> |
| 70 | <text x="364.4849" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C3</text> |
| 71 | </g> |
| 72 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke="white"> |
| 73 | <circle r="15" clip-path="url(#clipPath2)" cx="434.0022" cy="-496.8418" stroke="none"/> |
| 74 | </g> |
| 75 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,552)" stroke-linecap="butt"> |
| 76 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="434.0022" cy="-496.8418"/> |
| 77 | <text x="426.0569" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C5</text> |
| 78 | <path fill="none" d="M233.5 -450.668 L257.0721 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 79 | <path d="M265.0721 -450.668 L253.0721 -455.668 L256.0721 -450.668 L253.0721 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 80 | <path fill="none" d="M295.0721 -450.668 L318.6441 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 81 | <path d="M326.6441 -450.668 L314.6441 -455.668 L317.6441 -450.668 L314.6441 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 82 | <path fill="none" d="M356.6441 -450.668 L380.2162 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 83 | <path d="M388.2162 -450.668 L376.2162 -455.668 L379.2162 -450.668 L376.2162 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 84 | <path fill="none" d="M418.2162 -450.668 L441.7883 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 85 | <path d="M449.7883 -450.668 L437.7883 -455.668 L440.7883 -450.668 L437.7883 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 86 | <path fill="none" d="M349.9653 -463.1483 L359.6711 -477.7054" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 87 | <path d="M364.109 -484.3615 L353.292 -477.151 L359.1163 -476.8734 L361.6122 -471.6036 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 88 | <path fill="none" d="M387.4302 -496.8418 L411.0022 -496.8418" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 89 | <path d="M419.0022 -496.8418 L407.0022 -501.8418 L410.0022 -496.8418 L407.0022 -491.8418 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 90 | </g> |
| 91 | </g> |
| 92 | </svg> |
| --- a/www/rebase03.svg | |
| +++ b/www/rebase03.svg | |
| @@ -1,92 +0,0 @@ | |
D
www/rebase04.svg
-108
| --- a/www/rebase04.svg | ||
| +++ b/www/rebase04.svg | ||
| @@ -1,108 +0,0 @@ | ||
| 1 | -<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="424" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="113" font-family="'Dialog'" font-style="normal" stroke-linejoin="miter" font-size="12px" stroke-dashoffset="0" image-rendering="auto"> | |
| 2 | - <!--Generated by ySVG 2.5--> | |
| 3 | - <defs id="genericDefs"/> | |
| 4 | - <g> | |
| 5 | - <defs id="defs1"> | |
| 6 | - <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"> | |
| 7 | - <path d="M0 0 L424 0 L424 113 L0 113 L0 0 Z"/> | |
| 8 | - </clipPath> | |
| 9 | - <clipPath clipPathUnits="userSpaceOnUse" id="clipPath2"> | |
| 10 | - <path d="M180 -530 L604 -530 L604 -417 L180 -417 L180 -530 Z"/> | |
| 11 | - </clipPath> | |
| 12 | - </defs> | |
| 13 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="translate(-180,530)" stroke="white"> | |
| 14 | - <rect x="180" width="424" height="113" y="-530" clip-path="url(#clipPath2)" stroke="none"/> | |
| 15 | - </g> | |
| 16 | - <g fill="rgb(198,226,255)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="rgb(198,226,255)"> | |
| 17 | - <rect x="190.2647" width="402.9305" height="46" y="-473.8418" clip-path="url(#clipPath2)" stroke="none"/> | |
| 18 | - </g> | |
| 19 | - <g stroke-linecap="butt" transform="matrix(1,0,0,1,-180,530)" fill="rgb(124,165,204)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" stroke="rgb(124,165,204)" stroke-miterlimit="1.45"> | |
| 20 | - <rect fill="none" x="190.2647" width="402.9305" height="46" y="-473.8418" clip-path="url(#clipPath2)"/> | |
| 21 | - </g> | |
| 22 | - <g fill="rgb(154,204,252)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="rgb(154,204,252)"> | |
| 23 | - <rect x="337.1353" width="256.0599" height="46" y="-519.8418" clip-path="url(#clipPath2)" stroke="none"/> | |
| 24 | - </g> | |
| 25 | - <g stroke-linecap="butt" transform="matrix(1,0,0,1,-180,530)" fill="rgb(124,165,204)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" stroke="rgb(124,165,204)" stroke-miterlimit="1.45"> | |
| 26 | - <rect fill="none" x="337.1353" width="256.0599" height="46" y="-519.8418" clip-path="url(#clipPath2)"/> | |
| 27 | - </g> | |
| 28 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 29 | - <circle r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668" stroke="none"/> | |
| 30 | - </g> | |
| 31 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 32 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668"/> | |
| 33 | - <text x="210.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C0</text> | |
| 34 | - </g> | |
| 35 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 36 | - <circle r="15" clip-path="url(#clipPath2)" cx="280.0721" cy="-450.668" stroke="none"/> | |
| 37 | - </g> | |
| 38 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 39 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="280.0721" cy="-450.668"/> | |
| 40 | - <text x="272.1268" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C1</text> | |
| 41 | - </g> | |
| 42 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 43 | - <circle r="15" clip-path="url(#clipPath2)" cx="341.6441" cy="-450.668" stroke="none"/> | |
| 44 | - </g> | |
| 45 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 46 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="341.6441" cy="-450.668"/> | |
| 47 | - <text x="333.6988" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C2</text> | |
| 48 | - </g> | |
| 49 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 50 | - <circle r="15" clip-path="url(#clipPath2)" cx="464.7883" cy="-450.668" stroke="none"/> | |
| 51 | - </g> | |
| 52 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 53 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="464.7883" cy="-450.668"/> | |
| 54 | - <text x="456.843" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C6</text> | |
| 55 | - </g> | |
| 56 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 57 | - <circle r="15" clip-path="url(#clipPath2)" cx="403.2162" cy="-450.668" stroke="none"/> | |
| 58 | - </g> | |
| 59 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 60 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="403.2162" cy="-450.668"/> | |
| 61 | - <text x="395.2709" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C4</text> | |
| 62 | - </g> | |
| 63 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 64 | - <circle r="15" clip-path="url(#clipPath2)" cx="372.4302" cy="-496.8418" stroke="none"/> | |
| 65 | - </g> | |
| 66 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 67 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="372.4302" cy="-496.8418"/> | |
| 68 | - <text x="364.4849" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C3</text> | |
| 69 | - </g> | |
| 70 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 71 | - <circle r="15" clip-path="url(#clipPath2)" cx="434.0022" cy="-496.8418" stroke="none"/> | |
| 72 | - </g> | |
| 73 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 74 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="434.0022" cy="-496.8418"/> | |
| 75 | - <text x="426.0569" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C5</text> | |
| 76 | - </g> | |
| 77 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 78 | - <circle r="15" clip-path="url(#clipPath2)" cx="495.5743" cy="-496.8418" stroke="none"/> | |
| 79 | - </g> | |
| 80 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 81 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="495.5743" cy="-496.8418"/> | |
| 82 | - <text x="486.255" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C3'</text> | |
| 83 | - </g> | |
| 84 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 85 | - <circle r="15" clip-path="url(#clipPath2)" cx="557.1464" cy="-496.8418" stroke="none"/> | |
| 86 | - </g> | |
| 87 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 88 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="557.1464" cy="-496.8418"/> | |
| 89 | - <text x="547.827" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C5'</text> | |
| 90 | - <path fill="none" d="M233.5 -450.668 L257.0721 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 91 | - <path d="M265.0721 -450.668 L253.0721 -455.668 L256.0721 -450.668 L253.0721 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 92 | - <path fill="none" d="M295.0721 -450.668 L318.6441 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 93 | - <path d="M326.6441 -450.668 L314.6441 -455.668 L317.6441 -450.668 L314.6441 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 94 | - <path fill="none" d="M356.6441 -450.668 L380.2162 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 95 | - <path d="M388.2162 -450.668 L376.2162 -455.668 L379.2162 -450.668 L376.2162 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 96 | - <path fill="none" d="M418.2162 -450.668 L441.7883 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 97 | - <path d="M449.7883 -450.668 L437.7883 -455.668 L440.7883 -450.668 L437.7883 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 98 | - <path fill="none" d="M349.9653 -463.1483 L359.6711 -477.7054" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 99 | - <path d="M364.109 -484.3615 L353.292 -477.151 L359.1163 -476.8734 L361.6122 -471.6036 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 100 | - <path fill="none" d="M387.4302 -496.8418 L411.0022 -496.8418" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 101 | - <path d="M419.0022 -496.8418 L407.0022 -501.8418 L410.0022 -496.8418 L407.0022 -491.8418 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 102 | - <path fill="none" d="M473.1094 -463.1483 L482.8152 -477.7054" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 103 | - <path d="M487.2531 -484.3615 L476.4361 -477.151 L482.2605 -476.8734 L484.7563 -471.6036 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 104 | - <path fill="none" d="M510.5743 -496.8418 L534.1464 -496.8418" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 105 | - <path d="M542.1464 -496.8418 L530.1464 -501.8418 L533.1464 -496.8418 L530.1464 -491.8418 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 106 | - </g> | |
| 107 | - </g> | |
| 108 | -</svg> |
| --- a/www/rebase04.svg | |
| +++ b/www/rebase04.svg | |
| @@ -1,108 +0,0 @@ | |
| 1 | <?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="424" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="113" font-family="'Dialog'" font-style="normal" stroke-linejoin="miter" font-size="12px" stroke-dashoffset="0" image-rendering="auto"> |
| 2 | <!--Generated by ySVG 2.5--> |
| 3 | <defs id="genericDefs"/> |
| 4 | <g> |
| 5 | <defs id="defs1"> |
| 6 | <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"> |
| 7 | <path d="M0 0 L424 0 L424 113 L0 113 L0 0 Z"/> |
| 8 | </clipPath> |
| 9 | <clipPath clipPathUnits="userSpaceOnUse" id="clipPath2"> |
| 10 | <path d="M180 -530 L604 -530 L604 -417 L180 -417 L180 -530 Z"/> |
| 11 | </clipPath> |
| 12 | </defs> |
| 13 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="translate(-180,530)" stroke="white"> |
| 14 | <rect x="180" width="424" height="113" y="-530" clip-path="url(#clipPath2)" stroke="none"/> |
| 15 | </g> |
| 16 | <g fill="rgb(198,226,255)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="rgb(198,226,255)"> |
| 17 | <rect x="190.2647" width="402.9305" height="46" y="-473.8418" clip-path="url(#clipPath2)" stroke="none"/> |
| 18 | </g> |
| 19 | <g stroke-linecap="butt" transform="matrix(1,0,0,1,-180,530)" fill="rgb(124,165,204)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" stroke="rgb(124,165,204)" stroke-miterlimit="1.45"> |
| 20 | <rect fill="none" x="190.2647" width="402.9305" height="46" y="-473.8418" clip-path="url(#clipPath2)"/> |
| 21 | </g> |
| 22 | <g fill="rgb(154,204,252)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="rgb(154,204,252)"> |
| 23 | <rect x="337.1353" width="256.0599" height="46" y="-519.8418" clip-path="url(#clipPath2)" stroke="none"/> |
| 24 | </g> |
| 25 | <g stroke-linecap="butt" transform="matrix(1,0,0,1,-180,530)" fill="rgb(124,165,204)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" stroke="rgb(124,165,204)" stroke-miterlimit="1.45"> |
| 26 | <rect fill="none" x="337.1353" width="256.0599" height="46" y="-519.8418" clip-path="url(#clipPath2)"/> |
| 27 | </g> |
| 28 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 29 | <circle r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668" stroke="none"/> |
| 30 | </g> |
| 31 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 32 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668"/> |
| 33 | <text x="210.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C0</text> |
| 34 | </g> |
| 35 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 36 | <circle r="15" clip-path="url(#clipPath2)" cx="280.0721" cy="-450.668" stroke="none"/> |
| 37 | </g> |
| 38 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 39 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="280.0721" cy="-450.668"/> |
| 40 | <text x="272.1268" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C1</text> |
| 41 | </g> |
| 42 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 43 | <circle r="15" clip-path="url(#clipPath2)" cx="341.6441" cy="-450.668" stroke="none"/> |
| 44 | </g> |
| 45 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 46 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="341.6441" cy="-450.668"/> |
| 47 | <text x="333.6988" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C2</text> |
| 48 | </g> |
| 49 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 50 | <circle r="15" clip-path="url(#clipPath2)" cx="464.7883" cy="-450.668" stroke="none"/> |
| 51 | </g> |
| 52 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 53 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="464.7883" cy="-450.668"/> |
| 54 | <text x="456.843" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C6</text> |
| 55 | </g> |
| 56 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 57 | <circle r="15" clip-path="url(#clipPath2)" cx="403.2162" cy="-450.668" stroke="none"/> |
| 58 | </g> |
| 59 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 60 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="403.2162" cy="-450.668"/> |
| 61 | <text x="395.2709" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C4</text> |
| 62 | </g> |
| 63 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 64 | <circle r="15" clip-path="url(#clipPath2)" cx="372.4302" cy="-496.8418" stroke="none"/> |
| 65 | </g> |
| 66 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 67 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="372.4302" cy="-496.8418"/> |
| 68 | <text x="364.4849" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C3</text> |
| 69 | </g> |
| 70 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 71 | <circle r="15" clip-path="url(#clipPath2)" cx="434.0022" cy="-496.8418" stroke="none"/> |
| 72 | </g> |
| 73 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 74 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="434.0022" cy="-496.8418"/> |
| 75 | <text x="426.0569" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C5</text> |
| 76 | </g> |
| 77 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 78 | <circle r="15" clip-path="url(#clipPath2)" cx="495.5743" cy="-496.8418" stroke="none"/> |
| 79 | </g> |
| 80 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 81 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="495.5743" cy="-496.8418"/> |
| 82 | <text x="486.255" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C3'</text> |
| 83 | </g> |
| 84 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 85 | <circle r="15" clip-path="url(#clipPath2)" cx="557.1464" cy="-496.8418" stroke="none"/> |
| 86 | </g> |
| 87 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 88 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="557.1464" cy="-496.8418"/> |
| 89 | <text x="547.827" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C5'</text> |
| 90 | <path fill="none" d="M233.5 -450.668 L257.0721 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 91 | <path d="M265.0721 -450.668 L253.0721 -455.668 L256.0721 -450.668 L253.0721 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 92 | <path fill="none" d="M295.0721 -450.668 L318.6441 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 93 | <path d="M326.6441 -450.668 L314.6441 -455.668 L317.6441 -450.668 L314.6441 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 94 | <path fill="none" d="M356.6441 -450.668 L380.2162 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 95 | <path d="M388.2162 -450.668 L376.2162 -455.668 L379.2162 -450.668 L376.2162 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 96 | <path fill="none" d="M418.2162 -450.668 L441.7883 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 97 | <path d="M449.7883 -450.668 L437.7883 -455.668 L440.7883 -450.668 L437.7883 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 98 | <path fill="none" d="M349.9653 -463.1483 L359.6711 -477.7054" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 99 | <path d="M364.109 -484.3615 L353.292 -477.151 L359.1163 -476.8734 L361.6122 -471.6036 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 100 | <path fill="none" d="M387.4302 -496.8418 L411.0022 -496.8418" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 101 | <path d="M419.0022 -496.8418 L407.0022 -501.8418 L410.0022 -496.8418 L407.0022 -491.8418 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 102 | <path fill="none" d="M473.1094 -463.1483 L482.8152 -477.7054" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 103 | <path d="M487.2531 -484.3615 L476.4361 -477.151 L482.2605 -476.8734 L484.7563 -471.6036 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 104 | <path fill="none" d="M510.5743 -496.8418 L534.1464 -496.8418" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 105 | <path d="M542.1464 -496.8418 L530.1464 -501.8418 L533.1464 -496.8418 L530.1464 -491.8418 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 106 | </g> |
| 107 | </g> |
| 108 | </svg> |
| --- a/www/rebase04.svg | |
| +++ b/www/rebase04.svg | |
| @@ -1,108 +0,0 @@ | |
D
www/rebase05.svg
-101
| --- a/www/rebase05.svg | ||
| +++ b/www/rebase05.svg | ||
| @@ -1,101 +0,0 @@ | ||
| 1 | -<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="361" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="113" font-family="'Dialog'" font-style="normal" stroke-linejoin="miter" font-size="12px" stroke-dashoffset="0" image-rendering="auto"> | |
| 2 | - <!--Generated by ySVG 2.5--> | |
| 3 | - <defs id="genericDefs"/> | |
| 4 | - <g> | |
| 5 | - <defs id="defs1"> | |
| 6 | - <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"> | |
| 7 | - <path d="M0 0 L361 0 L361 113 L0 113 L0 0 Z"/> | |
| 8 | - </clipPath> | |
| 9 | - <clipPath clipPathUnits="userSpaceOnUse" id="clipPath2"> | |
| 10 | - <path d="M180 -530 L541 -530 L541 -417 L180 -417 L180 -530 Z"/> | |
| 11 | - </clipPath> | |
| 12 | - </defs> | |
| 13 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="translate(-180,530)" stroke="white"> | |
| 14 | - <rect x="180" width="361" height="113" y="-530" clip-path="url(#clipPath2)" stroke="none"/> | |
| 15 | - </g> | |
| 16 | - <g fill="rgb(198,226,255)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="rgb(198,226,255)"> | |
| 17 | - <rect x="190.2647" width="340.406" height="46" y="-473.8418" clip-path="url(#clipPath2)" stroke="none"/> | |
| 18 | - </g> | |
| 19 | - <g stroke-linecap="butt" transform="matrix(1,0,0,1,-180,530)" fill="rgb(124,165,204)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" stroke="rgb(124,165,204)" stroke-miterlimit="1.45"> | |
| 20 | - <rect fill="none" x="190.2647" width="340.406" height="46" y="-473.8418" clip-path="url(#clipPath2)"/> | |
| 21 | - </g> | |
| 22 | - <g fill="rgb(154,204,252)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="rgb(154,204,252)"> | |
| 23 | - <rect x="337.1353" width="193.5354" height="46" y="-519.8418" clip-path="url(#clipPath2)" stroke="none"/> | |
| 24 | - </g> | |
| 25 | - <g stroke-linecap="butt" transform="matrix(1,0,0,1,-180,530)" fill="rgb(124,165,204)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" stroke="rgb(124,165,204)" stroke-miterlimit="1.45"> | |
| 26 | - <rect fill="none" x="337.1353" width="193.5354" height="46" y="-519.8418" clip-path="url(#clipPath2)"/> | |
| 27 | - </g> | |
| 28 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 29 | - <circle r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668" stroke="none"/> | |
| 30 | - </g> | |
| 31 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 32 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668"/> | |
| 33 | - <text x="210.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C0</text> | |
| 34 | - </g> | |
| 35 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 36 | - <circle r="15" clip-path="url(#clipPath2)" cx="280.0721" cy="-450.668" stroke="none"/> | |
| 37 | - </g> | |
| 38 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 39 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="280.0721" cy="-450.668"/> | |
| 40 | - <text x="272.1268" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C1</text> | |
| 41 | - </g> | |
| 42 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 43 | - <circle r="15" clip-path="url(#clipPath2)" cx="341.6441" cy="-450.668" stroke="none"/> | |
| 44 | - </g> | |
| 45 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 46 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="341.6441" cy="-450.668"/> | |
| 47 | - <text x="333.6988" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C2</text> | |
| 48 | - </g> | |
| 49 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 50 | - <circle r="15" clip-path="url(#clipPath2)" cx="464.7883" cy="-450.668" stroke="none"/> | |
| 51 | - </g> | |
| 52 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 53 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="464.7883" cy="-450.668"/> | |
| 54 | - <text x="456.843" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C6</text> | |
| 55 | - </g> | |
| 56 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 57 | - <circle r="15" clip-path="url(#clipPath2)" cx="403.2162" cy="-450.668" stroke="none"/> | |
| 58 | - </g> | |
| 59 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 60 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="403.2162" cy="-450.668"/> | |
| 61 | - <text x="395.2709" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C4</text> | |
| 62 | - </g> | |
| 63 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 64 | - <circle r="15" clip-path="url(#clipPath2)" cx="372.4302" cy="-496.8418" stroke="none"/> | |
| 65 | - </g> | |
| 66 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 67 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="372.4302" cy="-496.8418"/> | |
| 68 | - <text x="364.4849" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C3</text> | |
| 69 | - </g> | |
| 70 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 71 | - <circle r="15" clip-path="url(#clipPath2)" cx="434.0022" cy="-496.8418" stroke="none"/> | |
| 72 | - </g> | |
| 73 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 74 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="434.0022" cy="-496.8418"/> | |
| 75 | - <text x="426.0569" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C5</text> | |
| 76 | - </g> | |
| 77 | - <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> | |
| 78 | - <circle r="15" clip-path="url(#clipPath2)" cx="495.5743" cy="-496.8418" stroke="none"/> | |
| 79 | - </g> | |
| 80 | - <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> | |
| 81 | - <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="495.5743" cy="-496.8418"/> | |
| 82 | - <text x="487.629" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C7</text> | |
| 83 | - <path fill="none" d="M233.5 -450.668 L257.0721 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 84 | - <path d="M265.0721 -450.668 L253.0721 -455.668 L256.0721 -450.668 L253.0721 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 85 | - <path fill="none" d="M295.0721 -450.668 L318.6441 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 86 | - <path d="M326.6441 -450.668 L314.6441 -455.668 L317.6441 -450.668 L314.6441 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 87 | - <path fill="none" d="M356.6441 -450.668 L380.2162 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 88 | - <path d="M388.2162 -450.668 L376.2162 -455.668 L379.2162 -450.668 L376.2162 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 89 | - <path fill="none" d="M418.2162 -450.668 L441.7883 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 90 | - <path d="M449.7883 -450.668 L437.7883 -455.668 L440.7883 -450.668 L437.7883 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 91 | - <path fill="none" d="M349.9653 -463.1483 L359.6711 -477.7054" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 92 | - <path d="M364.109 -484.3615 L353.292 -477.151 L359.1163 -476.8734 L361.6122 -471.6036 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 93 | - <path fill="none" d="M387.4302 -496.8418 L411.0022 -496.8418" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 94 | - <path d="M419.0022 -496.8418 L407.0022 -501.8418 L410.0022 -496.8418 L407.0022 -491.8418 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 95 | - <path fill="none" d="M473.1094 -463.1483 L482.8152 -477.7054" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 96 | - <path d="M487.2531 -484.3615 L476.4361 -477.151 L482.2605 -476.8734 L484.7563 -471.6036 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 97 | - <path fill="none" d="M449.0022 -496.8418 L472.5743 -496.8418" stroke-width="1" clip-path="url(#clipPath2)"/> | |
| 98 | - <path d="M480.5743 -496.8418 L468.5743 -501.8418 L471.5743 -496.8418 L468.5743 -491.8418 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> | |
| 99 | - </g> | |
| 100 | - </g> | |
| 101 | -</svg> |
| --- a/www/rebase05.svg | |
| +++ b/www/rebase05.svg | |
| @@ -1,101 +0,0 @@ | |
| 1 | <?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill-opacity="1" color-rendering="auto" color-interpolation="auto" text-rendering="auto" stroke="black" stroke-linecap="square" width="361" stroke-miterlimit="10" shape-rendering="auto" stroke-opacity="1" fill="black" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="113" font-family="'Dialog'" font-style="normal" stroke-linejoin="miter" font-size="12px" stroke-dashoffset="0" image-rendering="auto"> |
| 2 | <!--Generated by ySVG 2.5--> |
| 3 | <defs id="genericDefs"/> |
| 4 | <g> |
| 5 | <defs id="defs1"> |
| 6 | <clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"> |
| 7 | <path d="M0 0 L361 0 L361 113 L0 113 L0 0 Z"/> |
| 8 | </clipPath> |
| 9 | <clipPath clipPathUnits="userSpaceOnUse" id="clipPath2"> |
| 10 | <path d="M180 -530 L541 -530 L541 -417 L180 -417 L180 -530 Z"/> |
| 11 | </clipPath> |
| 12 | </defs> |
| 13 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="translate(-180,530)" stroke="white"> |
| 14 | <rect x="180" width="361" height="113" y="-530" clip-path="url(#clipPath2)" stroke="none"/> |
| 15 | </g> |
| 16 | <g fill="rgb(198,226,255)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="rgb(198,226,255)"> |
| 17 | <rect x="190.2647" width="340.406" height="46" y="-473.8418" clip-path="url(#clipPath2)" stroke="none"/> |
| 18 | </g> |
| 19 | <g stroke-linecap="butt" transform="matrix(1,0,0,1,-180,530)" fill="rgb(124,165,204)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" stroke="rgb(124,165,204)" stroke-miterlimit="1.45"> |
| 20 | <rect fill="none" x="190.2647" width="340.406" height="46" y="-473.8418" clip-path="url(#clipPath2)"/> |
| 21 | </g> |
| 22 | <g fill="rgb(154,204,252)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="rgb(154,204,252)"> |
| 23 | <rect x="337.1353" width="193.5354" height="46" y="-519.8418" clip-path="url(#clipPath2)" stroke="none"/> |
| 24 | </g> |
| 25 | <g stroke-linecap="butt" transform="matrix(1,0,0,1,-180,530)" fill="rgb(124,165,204)" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" stroke="rgb(124,165,204)" stroke-miterlimit="1.45"> |
| 26 | <rect fill="none" x="337.1353" width="193.5354" height="46" y="-519.8418" clip-path="url(#clipPath2)"/> |
| 27 | </g> |
| 28 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 29 | <circle r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668" stroke="none"/> |
| 30 | </g> |
| 31 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 32 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="218.5" cy="-450.668"/> |
| 33 | <text x="210.5547" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C0</text> |
| 34 | </g> |
| 35 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 36 | <circle r="15" clip-path="url(#clipPath2)" cx="280.0721" cy="-450.668" stroke="none"/> |
| 37 | </g> |
| 38 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 39 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="280.0721" cy="-450.668"/> |
| 40 | <text x="272.1268" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C1</text> |
| 41 | </g> |
| 42 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 43 | <circle r="15" clip-path="url(#clipPath2)" cx="341.6441" cy="-450.668" stroke="none"/> |
| 44 | </g> |
| 45 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 46 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="341.6441" cy="-450.668"/> |
| 47 | <text x="333.6988" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C2</text> |
| 48 | </g> |
| 49 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 50 | <circle r="15" clip-path="url(#clipPath2)" cx="464.7883" cy="-450.668" stroke="none"/> |
| 51 | </g> |
| 52 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 53 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="464.7883" cy="-450.668"/> |
| 54 | <text x="456.843" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C6</text> |
| 55 | </g> |
| 56 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 57 | <circle r="15" clip-path="url(#clipPath2)" cx="403.2162" cy="-450.668" stroke="none"/> |
| 58 | </g> |
| 59 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 60 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="403.2162" cy="-450.668"/> |
| 61 | <text x="395.2709" y="-446.1328" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C4</text> |
| 62 | </g> |
| 63 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 64 | <circle r="15" clip-path="url(#clipPath2)" cx="372.4302" cy="-496.8418" stroke="none"/> |
| 65 | </g> |
| 66 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 67 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="372.4302" cy="-496.8418"/> |
| 68 | <text x="364.4849" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C3</text> |
| 69 | </g> |
| 70 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 71 | <circle r="15" clip-path="url(#clipPath2)" cx="434.0022" cy="-496.8418" stroke="none"/> |
| 72 | </g> |
| 73 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 74 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="434.0022" cy="-496.8418"/> |
| 75 | <text x="426.0569" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C5</text> |
| 76 | </g> |
| 77 | <g fill="white" text-rendering="geometricPrecision" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke="white"> |
| 78 | <circle r="15" clip-path="url(#clipPath2)" cx="495.5743" cy="-496.8418" stroke="none"/> |
| 79 | </g> |
| 80 | <g text-rendering="geometricPrecision" stroke-miterlimit="1.45" stroke-width="2" shape-rendering="geometricPrecision" transform="matrix(1,0,0,1,-180,530)" stroke-linecap="butt"> |
| 81 | <circle fill="none" r="15" clip-path="url(#clipPath2)" cx="495.5743" cy="-496.8418"/> |
| 82 | <text x="487.629" y="-492.3067" clip-path="url(#clipPath2)" font-family="sans-serif" stroke="none" stroke-width="1" xml:space="preserve">C7</text> |
| 83 | <path fill="none" d="M233.5 -450.668 L257.0721 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 84 | <path d="M265.0721 -450.668 L253.0721 -455.668 L256.0721 -450.668 L253.0721 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 85 | <path fill="none" d="M295.0721 -450.668 L318.6441 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 86 | <path d="M326.6441 -450.668 L314.6441 -455.668 L317.6441 -450.668 L314.6441 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 87 | <path fill="none" d="M356.6441 -450.668 L380.2162 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 88 | <path d="M388.2162 -450.668 L376.2162 -455.668 L379.2162 -450.668 L376.2162 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 89 | <path fill="none" d="M418.2162 -450.668 L441.7883 -450.668" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 90 | <path d="M449.7883 -450.668 L437.7883 -455.668 L440.7883 -450.668 L437.7883 -445.668 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 91 | <path fill="none" d="M349.9653 -463.1483 L359.6711 -477.7054" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 92 | <path d="M364.109 -484.3615 L353.292 -477.151 L359.1163 -476.8734 L361.6122 -471.6036 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 93 | <path fill="none" d="M387.4302 -496.8418 L411.0022 -496.8418" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 94 | <path d="M419.0022 -496.8418 L407.0022 -501.8418 L410.0022 -496.8418 L407.0022 -491.8418 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 95 | <path fill="none" d="M473.1094 -463.1483 L482.8152 -477.7054" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 96 | <path d="M487.2531 -484.3615 L476.4361 -477.151 L482.2605 -476.8734 L484.7563 -471.6036 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 97 | <path fill="none" d="M449.0022 -496.8418 L472.5743 -496.8418" stroke-width="1" clip-path="url(#clipPath2)"/> |
| 98 | <path d="M480.5743 -496.8418 L468.5743 -501.8418 L471.5743 -496.8418 L468.5743 -491.8418 Z" stroke-width="1" clip-path="url(#clipPath2)" stroke="none"/> |
| 99 | </g> |
| 100 | </g> |
| 101 | </svg> |
| --- a/www/rebase05.svg | |
| +++ b/www/rebase05.svg | |
| @@ -1,101 +0,0 @@ | |
+101
-5
| --- www/rebaseharm.md | ||
| +++ www/rebaseharm.md | ||
| @@ -30,15 +30,42 @@ | ||
| 30 | 30 | that deliberately forgets one of the parents of each merge step. |
| 31 | 31 | To help illustrate this fact, |
| 32 | 32 | consider the first rebase example from the |
| 33 | 33 | [Git documentation][gitrebase]. The merge looks like this: |
| 34 | 34 | |
| 35 | - | |
| 35 | +~~~ pikchr | |
| 36 | +scale = 0.8 | |
| 37 | +circle "C0" fit | |
| 38 | +arrow right 50% | |
| 39 | +circle same "C1" | |
| 40 | +arrow same | |
| 41 | +circle same "C2" | |
| 42 | +arrow same | |
| 43 | +circle same "C3" | |
| 44 | +arrow same | |
| 45 | +circle same "C5" | |
| 46 | +circle same "C4" at 1cm above C3 | |
| 47 | +arrow from C2 to C4 chop | |
| 48 | +arrow from C4 to C5 chop | |
| 49 | +~~~ | |
| 36 | 50 | |
| 37 | 51 | And the rebase looks like this: |
| 38 | 52 | |
| 39 | - | |
| 53 | +~~~ pikchr | |
| 54 | +scale = 0.8 | |
| 55 | +circle "C0" fit | |
| 56 | +arrow right 50% | |
| 57 | +circle same "C1" | |
| 58 | +arrow same | |
| 59 | +circle same "C2" | |
| 60 | +arrow same | |
| 61 | +circle same "C3" | |
| 62 | +arrow same | |
| 63 | +circle same "C4'" | |
| 64 | +circle same "C4" at 1cm above C3 | |
| 65 | +arrow from C2 to C4 chop | |
| 66 | +~~~ | |
| 40 | 67 | |
| 41 | 68 | As the [Git documentation][gitrebase] points out, check-ins C4\' and C5 |
| 42 | 69 | are identical. The only difference between C4\' and C5 is that C5 |
| 43 | 70 | records the fact that C4 is its merge parent but C4\' does not. |
| 44 | 71 | |
| @@ -68,28 +95,97 @@ | ||
| 68 | 95 | Another argument, often cited, is that rebasing a feature branch |
| 69 | 96 | allows one to see just the changes in the feature branch without |
| 70 | 97 | the concurrent changes in the main line of development. |
| 71 | 98 | Consider a hypothetical case: |
| 72 | 99 | |
| 73 | - | |
| 100 | +~~~ pikchr | |
| 101 | +scale = 0.8 | |
| 102 | +circle "C0" fit fill white | |
| 103 | +arrow right 50% | |
| 104 | +circle same "C1" | |
| 105 | +arrow same | |
| 106 | +circle same "C2" | |
| 107 | +arrow same | |
| 108 | +circle same "C4" | |
| 109 | +arrow same | |
| 110 | +circle same "C6" | |
| 111 | +circle same "C3" at last arrow.width + C0.rad*2 heading 30 from C2 | |
| 112 | +arrow right 50% | |
| 113 | +circle same "C5" | |
| 114 | +arrow from C2 to C3 chop | |
| 115 | +box ht C3.y-C2.y wid C6.e.x-C0.w.x+1.5*C1.rad at C2 behind C0 fill 0xc6e2ff color 0xaac5df | |
| 116 | +box ht previous.ht wid previous.wid*0.55 with .se at previous.ne \ | |
| 117 | + behind C0 fill 0x9accfc color 0xaac5df | |
| 118 | +text "feature" with .s at previous.n | |
| 119 | +text "main" with .n at first box.s | |
| 120 | +~~~ | |
| 74 | 121 | |
| 75 | 122 | In the above, a feature branch consisting of check-ins C3 and C5 is |
| 76 | 123 | run concurrently with the main line in check-ins C4 and C6. Advocates |
| 77 | 124 | for rebase say that you should rebase the feature branch to the tip |
| 78 | 125 | of main in order to remove main-line development differences from |
| 79 | 126 | the feature branch's history: |
| 80 | 127 | |
| 81 | - | |
| 128 | +~~~ pikchr | |
| 129 | +scale = 0.8 | |
| 130 | +circle "C0" fit fill white | |
| 131 | +arrow right 50% | |
| 132 | +circle same "C1" | |
| 133 | +arrow same | |
| 134 | +circle same "C2" | |
| 135 | +arrow same | |
| 136 | +circle same "C4" | |
| 137 | +arrow same | |
| 138 | +circle same "C6" | |
| 139 | +circle same "C3" at last arrow.width + C0.rad*2 heading 30 from C2 | |
| 140 | +arrow right 50% | |
| 141 | +circle same "C5" | |
| 142 | +arrow from C2 to C3 chop | |
| 143 | +C3P: circle same "C3'" at first arrow.width + C0.rad*2 heading 30 from C6 | |
| 144 | +arrow right 50% from C3P.e | |
| 145 | +C5P: circle same "C5'" | |
| 146 | +arrow from C6 to C3P chop | |
| 147 | + | |
| 148 | +box ht C3.y-C2.y wid C5P.e.x-C0.w.x+1.5*C1.rad with .w at 0.5*(first arrow.wid) west of C0.w \ | |
| 149 | + behind C0 fill 0xc6e2ff color 0xaac5df | |
| 150 | +box ht previous.ht wid previous.e.x - C2.w.x with .se at previous.ne \ | |
| 151 | + behind C0 fill 0x9accfc color 0xaac5df | |
| 152 | +~~~ | |
| 153 | + | |
| 82 | 154 | |
| 83 | 155 | You could choose to collapse C3\' and C5\' into a single check-in |
| 84 | 156 | as part of this rebase, but that's a side issue we'll deal with |
| 85 | 157 | [separately](#collapsing). |
| 86 | 158 | |
| 87 | 159 | Because Fossil purposefully lacks rebase, the closest you can get to this same check-in |
| 88 | 160 | history is the following merge: |
| 89 | 161 | |
| 90 | - | |
| 162 | +~~~ pikchr | |
| 163 | +scale = 0.8 | |
| 164 | +circle "C0" fit fill white | |
| 165 | +arrow right 50% | |
| 166 | +circle same "C1" | |
| 167 | +arrow same | |
| 168 | +circle same "C2" | |
| 169 | +arrow same | |
| 170 | +circle same "C4" | |
| 171 | +arrow same | |
| 172 | +circle same "C6" | |
| 173 | +circle same "C3" at last arrow.width + C0.rad*2 heading 30 from C2 | |
| 174 | +arrow right 50% | |
| 175 | +circle same "C5" | |
| 176 | +arrow same | |
| 177 | +circle same "C7" | |
| 178 | +arrow from C2 to C3 chop | |
| 179 | +arrow from C6 to C7 chop | |
| 180 | + | |
| 181 | +box ht C3.y-C2.y wid C7.e.x-C0.w.x+1.5*C1.rad with .w at 0.5*(first arrow.wid) west of C0.w \ | |
| 182 | + behind C0 fill 0xc6e2ff color 0xaac5df | |
| 183 | +box ht previous.ht wid previous.e.x - C2.w.x with .se at previous.ne \ | |
| 184 | + behind C0 fill 0x9accfc color 0xaac5df | |
| 185 | +~~~ | |
| 186 | + | |
| 91 | 187 | |
| 92 | 188 | Check-ins C5\' and C7 check-ins hold identical code. The only |
| 93 | 189 | difference is in their history. |
| 94 | 190 | |
| 95 | 191 | The argument from rebase advocates |
| 96 | 192 |
| --- www/rebaseharm.md | |
| +++ www/rebaseharm.md | |
| @@ -30,15 +30,42 @@ | |
| 30 | that deliberately forgets one of the parents of each merge step. |
| 31 | To help illustrate this fact, |
| 32 | consider the first rebase example from the |
| 33 | [Git documentation][gitrebase]. The merge looks like this: |
| 34 | |
| 35 |  |
| 36 | |
| 37 | And the rebase looks like this: |
| 38 | |
| 39 |  |
| 40 | |
| 41 | As the [Git documentation][gitrebase] points out, check-ins C4\' and C5 |
| 42 | are identical. The only difference between C4\' and C5 is that C5 |
| 43 | records the fact that C4 is its merge parent but C4\' does not. |
| 44 | |
| @@ -68,28 +95,97 @@ | |
| 68 | Another argument, often cited, is that rebasing a feature branch |
| 69 | allows one to see just the changes in the feature branch without |
| 70 | the concurrent changes in the main line of development. |
| 71 | Consider a hypothetical case: |
| 72 | |
| 73 |  |
| 74 | |
| 75 | In the above, a feature branch consisting of check-ins C3 and C5 is |
| 76 | run concurrently with the main line in check-ins C4 and C6. Advocates |
| 77 | for rebase say that you should rebase the feature branch to the tip |
| 78 | of main in order to remove main-line development differences from |
| 79 | the feature branch's history: |
| 80 | |
| 81 |  |
| 82 | |
| 83 | You could choose to collapse C3\' and C5\' into a single check-in |
| 84 | as part of this rebase, but that's a side issue we'll deal with |
| 85 | [separately](#collapsing). |
| 86 | |
| 87 | Because Fossil purposefully lacks rebase, the closest you can get to this same check-in |
| 88 | history is the following merge: |
| 89 | |
| 90 |  |
| 91 | |
| 92 | Check-ins C5\' and C7 check-ins hold identical code. The only |
| 93 | difference is in their history. |
| 94 | |
| 95 | The argument from rebase advocates |
| 96 |
| --- www/rebaseharm.md | |
| +++ www/rebaseharm.md | |
| @@ -30,15 +30,42 @@ | |
| 30 | that deliberately forgets one of the parents of each merge step. |
| 31 | To help illustrate this fact, |
| 32 | consider the first rebase example from the |
| 33 | [Git documentation][gitrebase]. The merge looks like this: |
| 34 | |
| 35 | ~~~ pikchr |
| 36 | scale = 0.8 |
| 37 | circle "C0" fit |
| 38 | arrow right 50% |
| 39 | circle same "C1" |
| 40 | arrow same |
| 41 | circle same "C2" |
| 42 | arrow same |
| 43 | circle same "C3" |
| 44 | arrow same |
| 45 | circle same "C5" |
| 46 | circle same "C4" at 1cm above C3 |
| 47 | arrow from C2 to C4 chop |
| 48 | arrow from C4 to C5 chop |
| 49 | ~~~ |
| 50 | |
| 51 | And the rebase looks like this: |
| 52 | |
| 53 | ~~~ pikchr |
| 54 | scale = 0.8 |
| 55 | circle "C0" fit |
| 56 | arrow right 50% |
| 57 | circle same "C1" |
| 58 | arrow same |
| 59 | circle same "C2" |
| 60 | arrow same |
| 61 | circle same "C3" |
| 62 | arrow same |
| 63 | circle same "C4'" |
| 64 | circle same "C4" at 1cm above C3 |
| 65 | arrow from C2 to C4 chop |
| 66 | ~~~ |
| 67 | |
| 68 | As the [Git documentation][gitrebase] points out, check-ins C4\' and C5 |
| 69 | are identical. The only difference between C4\' and C5 is that C5 |
| 70 | records the fact that C4 is its merge parent but C4\' does not. |
| 71 | |
| @@ -68,28 +95,97 @@ | |
| 95 | Another argument, often cited, is that rebasing a feature branch |
| 96 | allows one to see just the changes in the feature branch without |
| 97 | the concurrent changes in the main line of development. |
| 98 | Consider a hypothetical case: |
| 99 | |
| 100 | ~~~ pikchr |
| 101 | scale = 0.8 |
| 102 | circle "C0" fit fill white |
| 103 | arrow right 50% |
| 104 | circle same "C1" |
| 105 | arrow same |
| 106 | circle same "C2" |
| 107 | arrow same |
| 108 | circle same "C4" |
| 109 | arrow same |
| 110 | circle same "C6" |
| 111 | circle same "C3" at last arrow.width + C0.rad*2 heading 30 from C2 |
| 112 | arrow right 50% |
| 113 | circle same "C5" |
| 114 | arrow from C2 to C3 chop |
| 115 | box ht C3.y-C2.y wid C6.e.x-C0.w.x+1.5*C1.rad at C2 behind C0 fill 0xc6e2ff color 0xaac5df |
| 116 | box ht previous.ht wid previous.wid*0.55 with .se at previous.ne \ |
| 117 | behind C0 fill 0x9accfc color 0xaac5df |
| 118 | text "feature" with .s at previous.n |
| 119 | text "main" with .n at first box.s |
| 120 | ~~~ |
| 121 | |
| 122 | In the above, a feature branch consisting of check-ins C3 and C5 is |
| 123 | run concurrently with the main line in check-ins C4 and C6. Advocates |
| 124 | for rebase say that you should rebase the feature branch to the tip |
| 125 | of main in order to remove main-line development differences from |
| 126 | the feature branch's history: |
| 127 | |
| 128 | ~~~ pikchr |
| 129 | scale = 0.8 |
| 130 | circle "C0" fit fill white |
| 131 | arrow right 50% |
| 132 | circle same "C1" |
| 133 | arrow same |
| 134 | circle same "C2" |
| 135 | arrow same |
| 136 | circle same "C4" |
| 137 | arrow same |
| 138 | circle same "C6" |
| 139 | circle same "C3" at last arrow.width + C0.rad*2 heading 30 from C2 |
| 140 | arrow right 50% |
| 141 | circle same "C5" |
| 142 | arrow from C2 to C3 chop |
| 143 | C3P: circle same "C3'" at first arrow.width + C0.rad*2 heading 30 from C6 |
| 144 | arrow right 50% from C3P.e |
| 145 | C5P: circle same "C5'" |
| 146 | arrow from C6 to C3P chop |
| 147 | |
| 148 | box ht C3.y-C2.y wid C5P.e.x-C0.w.x+1.5*C1.rad with .w at 0.5*(first arrow.wid) west of C0.w \ |
| 149 | behind C0 fill 0xc6e2ff color 0xaac5df |
| 150 | box ht previous.ht wid previous.e.x - C2.w.x with .se at previous.ne \ |
| 151 | behind C0 fill 0x9accfc color 0xaac5df |
| 152 | ~~~ |
| 153 | |
| 154 | |
| 155 | You could choose to collapse C3\' and C5\' into a single check-in |
| 156 | as part of this rebase, but that's a side issue we'll deal with |
| 157 | [separately](#collapsing). |
| 158 | |
| 159 | Because Fossil purposefully lacks rebase, the closest you can get to this same check-in |
| 160 | history is the following merge: |
| 161 | |
| 162 | ~~~ pikchr |
| 163 | scale = 0.8 |
| 164 | circle "C0" fit fill white |
| 165 | arrow right 50% |
| 166 | circle same "C1" |
| 167 | arrow same |
| 168 | circle same "C2" |
| 169 | arrow same |
| 170 | circle same "C4" |
| 171 | arrow same |
| 172 | circle same "C6" |
| 173 | circle same "C3" at last arrow.width + C0.rad*2 heading 30 from C2 |
| 174 | arrow right 50% |
| 175 | circle same "C5" |
| 176 | arrow same |
| 177 | circle same "C7" |
| 178 | arrow from C2 to C3 chop |
| 179 | arrow from C6 to C7 chop |
| 180 | |
| 181 | box ht C3.y-C2.y wid C7.e.x-C0.w.x+1.5*C1.rad with .w at 0.5*(first arrow.wid) west of C0.w \ |
| 182 | behind C0 fill 0xc6e2ff color 0xaac5df |
| 183 | box ht previous.ht wid previous.e.x - C2.w.x with .se at previous.ne \ |
| 184 | behind C0 fill 0x9accfc color 0xaac5df |
| 185 | ~~~ |
| 186 | |
| 187 | |
| 188 | Check-ins C5\' and C7 check-ins hold identical code. The only |
| 189 | difference is in their history. |
| 190 | |
| 191 | The argument from rebase advocates |
| 192 |