Changeset 1939 for www


Ignore:
Timestamp:
Nov 11, 2007, 10:16:21 PM (13 years ago)
Author:
Sam Hocevar
Message:
  • Two-row Sierra.
  • Sierra’s Filter Lite.
  • Added Stevenson-Arce but kept it disabled because it’s supposed to be for hexagonal displays.
Location:
www/study
Files:
8 added
6 edited
4 copied

Legend:

Unmodified
Added
Removed
  • www/study/fig3-2-6.svg

    r1938 r1939  
    3333     inkscape:pageshadow="2"
    3434     inkscape:zoom="1.979899"
    35      inkscape:cx="125.8091"
    36      inkscape:cy="897.19423"
     35     inkscape:cx="141.06081"
     36     inkscape:cy="928.96807"
    3737     inkscape:document-units="px"
    3838     inkscape:current-layer="layer1"
     
    6666    <path
    6767       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
    68        d="M 75,257.34936 L 314.98718,257.34936 L 314.98718,17.362184 L 75,17.36218 L 75,257.34936 z "
     68       d="M 15,197.34936 L 314.98718,197.34936 L 314.98718,17.362184 L 15,17.36218 L 15,197.34936 z "
    6969       id="rect2160"
    7070       sodipodi:nodetypes="ccccc" />
    7171    <path
    7272       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
    73        d="M 75.407851,77.65386 L 314.52036,77.2725"
     73       d="M 15.519458,77.363681 L 314.48879,77.35931 M 75.004048,17.8526 L 74.997953,196.8724"
    7474       id="rect4103"
    75        sodipodi:nodetypes="cc" />
     75       sodipodi:nodetypes="cccc" />
    7676    <path
    7777       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
    78        d="M 314.52036,137.14368 L 75.407857,137.52504 M 195.00309,256.94494 L 194.50058,17.8526"
     78       d="M 314.50458,137.36465 L 15.519464,137.36321 M 194.99751,196.88356 L 194.98987,17.868384"
    7979       id="path3143"
    8080       sodipodi:nodetypes="cccc" />
     
    8383       style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    8484       x="165.37863"
    85        y="113.62473"
     85       y="116.1515"
    8686       id="text3153"
    8787       sodipodi:linespacing="125%"><tspan
    8888         sodipodi:role="line"
    8989         x="165.37863"
    90          y="113.62473"
     90         y="116.1515"
    9191         id="tspan3157">0</tspan></text>
    9292    <text
    9393       sodipodi:linespacing="125%"
    9494       id="text2225"
    95        y="113.62473"
     95       y="116.1515"
    9696       x="105.37863"
    9797       style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    9898       xml:space="preserve"><tspan
    9999         id="tspan2227"
    100          y="113.62473"
     100         y="116.1515"
    101101         x="105.37863"
    102102         sodipodi:role="line">0</tspan></text>
     
    105105       style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    106106       x="105.37863"
    107        y="53.624733"
     107       y="56.151508"
    108108       id="text2229"
    109109       sodipodi:linespacing="125%"><tspan
    110110         sodipodi:role="line"
    111111         x="105.37863"
    112          y="53.624733"
     112         y="56.151508"
    113113         id="tspan2231">0</tspan></text>
    114114    <text
    115115       sodipodi:linespacing="125%"
    116116       id="text2233"
    117        y="53.624733"
     117       y="56.151508"
    118118       x="165.37863"
    119119       style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    120120       xml:space="preserve"><tspan
    121121         id="tspan2235"
    122          y="53.624733"
     122         y="56.151508"
    123123         x="165.37863"
    124124         sodipodi:role="line">0</tspan></text>
     
    126126       sodipodi:nodetypes="cc"
    127127       id="path2187"
    128        d="M 134.92513,17.8526 L 135.42764,256.94494"
     128       d="M 134.99616,17.860492 L 134.99237,196.8724"
    129129       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
    130130    <text
     131       sodipodi:linespacing="125%"
     132       id="text2189"
     133       y="56.151508"
     134       x="45.378632"
     135       style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
     136       xml:space="preserve"><tspan
     137         id="tspan2191"
     138         y="56.151508"
     139         x="45.378632"
     140         sodipodi:role="line">0</tspan></text>
     141    <text
     142       xml:space="preserve"
     143       style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
     144       x="45.378632"
     145       y="116.1515"
     146       id="text2193"
     147       sodipodi:linespacing="125%"><tspan
     148         sodipodi:role="line"
     149         x="45.378632"
     150         y="116.1515"
     151         id="tspan2195">0</tspan></text>
     152    <text
    131153       xml:space="preserve"
    132154       style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    133155       x="285.37863"
    134        y="53.624733"
     156       y="56.151508"
    135157       id="text2197"
    136158       sodipodi:linespacing="125%"><tspan
    137159         sodipodi:role="line"
    138160         x="285.37863"
    139          y="53.624733"
     161         y="56.151508"
    140162         id="tspan2199">0</tspan></text>
    141163    <path
    142        sodipodi:nodetypes="cc"
    143        id="path2194"
    144        d="M 75.407851,197.65386 L 314.52036,197.2725"
    145        style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
    146     <path
    147164       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
    148        d="M 254.92513,17.8526 L 255.42764,256.94494"
     165       d="M 255.00405,17.876275 L 255.00148,196.85418"
    149166       id="path2196"
    150167       sodipodi:nodetypes="cc" />
    151168    <text
     169       xml:space="preserve"
     170       style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
     171       x="283.37863"
     172       y="102.1515"
     173       id="text2198"
     174       sodipodi:linespacing="125%"><tspan
     175         sodipodi:role="line"
     176         id="tspan2200"
     177         x="283.37863"
     178         y="102.1515">3</tspan><tspan
     179         sodipodi:role="line"
     180         x="283.37863"
     181         y="128.74404"
     182         id="tspan2202">16</tspan></text>
     183    <path
     184       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
     185       d="M 267.67857,107.88895 L 302.5,107.88895"
     186       id="path2204"
     187       sodipodi:nodetypes="cc" />
     188    <text
    152189       sodipodi:linespacing="125%"
    153190       id="text2206"
    154        y="53.624733"
     191       y="56.151508"
    155192       x="225.37863"
    156193       style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    157194       xml:space="preserve"><tspan
    158195         id="tspan2208"
    159          y="53.624733"
     196         y="56.151508"
    160197         x="225.37863"
    161198         sodipodi:role="line">0</tspan></text>
     
    164201       style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    165202       x="225.37863"
    166        y="53.624733"
     203       y="56.151508"
    167204       id="text2210"
    168205       sodipodi:linespacing="125%"><tspan
    169206         sodipodi:role="line"
    170207         x="225.37863"
    171          y="53.624733"
     208         y="56.151508"
    172209         id="tspan2212">0</tspan></text>
    173210    <text
    174211       sodipodi:linespacing="125%"
    175212       id="text2214"
    176        y="99.624733"
     213       y="102.1515"
    177214       x="223.37863"
    178215       style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    179216       xml:space="preserve"><tspan
    180          y="99.624733"
     217         y="102.1515"
    181218         x="223.37863"
    182219         id="tspan2216"
     220         sodipodi:role="line">4</tspan><tspan
     221         id="tspan2218"
     222         y="128.74404"
     223         x="223.37863"
     224         sodipodi:role="line">16</tspan></text>
     225    <path
     226       sodipodi:nodetypes="cc"
     227       id="path2220"
     228       d="M 207.67857,107.88895 L 242.5,107.88895"
     229       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     230    <text
     231       xml:space="preserve"
     232       style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
     233       x="223.37863"
     234       y="162.1515"
     235       id="text2222"
     236       sodipodi:linespacing="125%"><tspan
     237         sodipodi:role="line"
     238         id="tspan2224"
     239         x="223.37863"
     240         y="162.1515">2</tspan><tspan
     241         sodipodi:role="line"
     242         x="223.37863"
     243         y="188.74405"
     244         id="tspan2226">16</tspan></text>
     245    <path
     246       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
     247       d="M 207.67857,167.88895 L 242.5,167.88895"
     248       id="path2228"
     249       sodipodi:nodetypes="cc" />
     250    <text
     251       sodipodi:linespacing="125%"
     252       id="text2230"
     253       y="162.1515"
     254       x="283.37863"
     255       style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
     256       xml:space="preserve"><tspan
     257         y="162.1515"
     258         x="283.37863"
     259         id="tspan2232"
    183260         sodipodi:role="line">1</tspan><tspan
    184          id="tspan2218"
    185          y="126.21728"
    186          x="223.37863"
    187          sodipodi:role="line">8</tspan></text>
    188     <path
    189        sodipodi:nodetypes="cc"
    190        id="path2220"
    191        d="M 207.67857,105.36218 L 242.5,105.36218"
     261         id="tspan2234"
     262         y="188.74405"
     263         x="283.37863"
     264         sodipodi:role="line">16</tspan></text>
     265    <path
     266       sodipodi:nodetypes="cc"
     267       id="path2236"
     268       d="M 267.67857,167.88895 L 302.5,167.88895"
    192269       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
    193270    <text
    194        xml:space="preserve"
    195        style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    196        x="285.37863"
    197        y="233.62473"
    198        id="text2235"
    199        sodipodi:linespacing="125%"><tspan
    200          sodipodi:role="line"
    201          x="285.37863"
    202          y="233.62473"
    203          id="tspan2237">0</tspan></text>
    204     <text
    205        xml:space="preserve"
    206        style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    207        x="283.37863"
    208        y="99.624733"
    209        id="text2234"
    210        sodipodi:linespacing="125%"><tspan
    211          sodipodi:role="line"
    212          id="tspan2236"
    213          x="283.37863"
    214          y="99.624733">1</tspan><tspan
    215          sodipodi:role="line"
    216          x="283.37863"
    217          y="126.21728"
    218          id="tspan2238">8</tspan></text>
     271       sodipodi:linespacing="125%"
     272       id="text2294"
     273       y="162.1515"
     274       x="43.378632"
     275       style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
     276       xml:space="preserve"><tspan
     277         y="162.1515"
     278         x="43.378632"
     279         id="tspan2296"
     280         sodipodi:role="line">1</tspan><tspan
     281         id="tspan2298"
     282         y="188.74405"
     283         x="43.378632"
     284         sodipodi:role="line">16</tspan></text>
     285    <path
     286       sodipodi:nodetypes="cc"
     287       id="path2300"
     288       d="M 27.67857,167.88895 L 62.5,167.88895"
     289       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     290    <text
     291       xml:space="preserve"
     292       style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
     293       x="103.37863"
     294       y="162.1515"
     295       id="text2302"
     296       sodipodi:linespacing="125%"><tspan
     297         sodipodi:role="line"
     298         id="tspan2304"
     299         x="103.37863"
     300         y="162.1515">2</tspan><tspan
     301         sodipodi:role="line"
     302         x="103.37863"
     303         y="188.74405"
     304         id="tspan2306">16</tspan></text>
    219305    <path
    220306       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    221        d="M 267.67857,105.36218 L 302.5,105.36218"
    222        id="path2240"
     307       d="M 87.67857,167.88895 L 122.5,167.88895"
     308       id="path2308"
    223309       sodipodi:nodetypes="cc" />
    224310    <text
    225311       sodipodi:linespacing="125%"
    226        id="text2242"
    227        y="159.62473"
    228        x="223.37863"
    229        style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    230        xml:space="preserve"><tspan
    231          y="159.62473"
    232          x="223.37863"
    233          id="tspan2244"
    234          sodipodi:role="line">1</tspan><tspan
    235          id="tspan2246"
    236          y="186.21727"
    237          x="223.37863"
    238          sodipodi:role="line">8</tspan></text>
    239     <path
    240        sodipodi:nodetypes="cc"
    241        id="path2248"
    242        d="M 207.67857,165.36218 L 242.5,165.36218"
     312       id="text2310"
     313       y="162.1515"
     314       x="163.37863"
     315       style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
     316       xml:space="preserve"><tspan
     317         y="162.1515"
     318         x="163.37863"
     319         id="tspan2312"
     320         sodipodi:role="line">3</tspan><tspan
     321         id="tspan2314"
     322         y="188.74405"
     323         x="163.37863"
     324         sodipodi:role="line">16</tspan></text>
     325    <path
     326       sodipodi:nodetypes="cc"
     327       id="path2316"
     328       d="M 147.67857,167.88895 L 182.5,167.88895"
    243329       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
    244     <text
    245        xml:space="preserve"
    246        style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    247        x="163.37863"
    248        y="159.62473"
    249        id="text2250"
    250        sodipodi:linespacing="125%"><tspan
    251          sodipodi:role="line"
    252          id="tspan2252"
    253          x="163.37863"
    254          y="159.62473">1</tspan><tspan
    255          sodipodi:role="line"
    256          x="163.37863"
    257          y="186.21727"
    258          id="tspan2254">8</tspan></text>
    259     <path
    260        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    261        d="M 147.67857,165.36218 L 182.5,165.36218"
    262        id="path2256"
    263        sodipodi:nodetypes="cc" />
    264     <text
    265        sodipodi:linespacing="125%"
    266        id="text2258"
    267        y="159.62473"
    268        x="103.37863"
    269        style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    270        xml:space="preserve"><tspan
    271          y="159.62473"
    272          x="103.37863"
    273          id="tspan2260"
    274          sodipodi:role="line">1</tspan><tspan
    275          id="tspan2262"
    276          y="186.21727"
    277          x="103.37863"
    278          sodipodi:role="line">8</tspan></text>
    279     <path
    280        sodipodi:nodetypes="cc"
    281        id="path2264"
    282        d="M 87.67857,165.36218 L 122.5,165.36218"
    283        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
    284     <text
    285        xml:space="preserve"
    286        style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    287        x="163.37863"
    288        y="219.62473"
    289        id="text2266"
    290        sodipodi:linespacing="125%"><tspan
    291          sodipodi:role="line"
    292          id="tspan2268"
    293          x="163.37863"
    294          y="219.62473">1</tspan><tspan
    295          sodipodi:role="line"
    296          x="163.37863"
    297          y="246.21727"
    298          id="tspan2270">8</tspan></text>
    299     <path
    300        style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    301        d="M 147.67857,225.36218 L 182.5,225.36218"
    302        id="path2272"
    303        sodipodi:nodetypes="cc" />
    304     <text
    305        sodipodi:linespacing="125%"
    306        id="text2274"
    307        y="173.62473"
    308        x="285.37863"
    309        style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    310        xml:space="preserve"><tspan
    311          id="tspan2276"
    312          y="173.62473"
    313          x="285.37863"
    314          sodipodi:role="line">0</tspan></text>
    315     <text
    316        xml:space="preserve"
    317        style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    318        x="225.37863"
    319        y="233.62473"
    320        id="text2278"
    321        sodipodi:linespacing="125%"><tspan
    322          sodipodi:role="line"
    323          x="225.37863"
    324          y="233.62473"
    325          id="tspan2280">0</tspan></text>
    326     <text
    327        sodipodi:linespacing="125%"
    328        id="text2282"
    329        y="233.62473"
    330        x="105.37863"
    331        style="font-size:21.27403641px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Serif"
    332        xml:space="preserve"><tspan
    333          id="tspan2284"
    334          y="233.62473"
    335          x="105.37863"
    336          sodipodi:role="line">0</tspan></text>
    337330  </g>
    338331</svg>
  • www/study/fig3-2-8.svg

    r1938 r1939  
    1515   inkscape:version="0.45.1"
    1616   sodipodi:docbase="/home/sam/debian/pkg-misc/unstable/libcaca/www/study"
    17    sodipodi:docname="fig3-2-6.svg"
     17   sodipodi:docname="fig3-2-8.svg"
    1818   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    19    inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig3-2-6.png"
     19   inkscape:export-filename="/home/sam/debian/pkg-misc/unstable/libcaca/www/study/fig3-2-8.png"
    2020   inkscape:export-xdpi="59.509998"
    2121   inkscape:export-ydpi="59.509998">
  • www/study/index.html

    r1938 r1939  
    360360</p>
    361361
    362 <p> <b>Sierra dithering</b> is a variation of Stucki that is slightly faster
    363 because it propagates to fewer pixels: </p>
     362<p> Frankie Sierra came up with a few error diffusion matrices: <b>Sierra
     363dithering</b> is a variation of Jarvis that is slightly faster because it
     364propagates to fewer pixels, <b>Two-row Sierra</b> is a simplified version
     365thereof, and <b>Filter Lite</b> is one of the simplest Floyd-Steinberg
     366derivatives: </p>
    364367
    365368<p style="text-align: center;">
     
    372375</p>
    373376
     377<p style="text-align: center;">
     378  <img src="fig3-2-6.png" width="200" height="120"
     379       style="margin-right: 30px;" alt="Sierra" />
     380  <img src="out3-2-6.png" width="256" height="256"
     381       class="inline" alt="Sierra error diffusion" />
     382  <img src="grad3-2-6.png" width="32" height="256"
     383       class="inline" alt="Sierra error diffusion gradient" />
     384</p>
     385
     386<p style="text-align: center;">
     387  <img src="fig3-2-7.png" width="120" height="120"
     388       style="margin-right: 30px;" alt="Sierra" />
     389  <img src="out3-2-7.png" width="256" height="256"
     390       class="inline" alt="Sierra error diffusion" />
     391  <img src="grad3-2-7.png" width="32" height="256"
     392       class="inline" alt="Sierra error diffusion gradient" />
     393</p>
     394
    374395<p> <b>Atkinson dithering</b> only propagates 75% of the error, leading to a
    375396loss of contrast around black and white areas, but better contrast in the
     
    377398
    378399<p style="text-align: center;">
    379   <img src="fig3-2-6.png" width="160" height="160"
     400  <img src="fig3-2-8.png" width="160" height="160"
    380401       style="margin-right: 30px;" alt="Atkinson" />
    381   <img src="out3-2-6.png" width="256" height="256"
     402  <img src="out3-2-8.png" width="256" height="256"
    382403       class="inline" alt="Atkinson error diffusion" />
    383   <img src="grad3-2-6.png" width="32" height="256"
     404  <img src="grad3-2-8.png" width="32" height="256"
    384405       class="inline" alt="Atkinson error diffusion gradient" />
    385406</p>
     407
     408<!-- XXX: Stevenson-Arce is for hexagonal cells!
     409<p> <b>Stevenson-Arce dithering</b>: </p>
     410
     411<p style="text-align: center;">
     412  <img src="fig3-2-9.png" width="280" height="200"
     413       style="margin-right: 30px;" alt="Stevenson-Arce" />
     414  <img src="out3-2-9.png" width="256" height="256"
     415       class="inline" alt="Stevenson-Arce error diffusion" />
     416  <img src="grad3-2-9.png" width="32" height="256"
     417       class="inline" alt="Stevenson-Arce error diffusion gradient" />
     418</p>
     419-->
    386420
    387421<!--
  • www/study/study.py

    r1938 r1939  
    441441test325(gradient256bw, "grad3-2-5.png")
    442442
    443 # Output 3-2-6: Atkinson
     443# Output 3.2.6: Two-line Sierra
     444def test326(src, name):
     445    (w, h) = src.size()
     446    dest = Image((w, h))
     447    ep = [0.] * (w + 4)
     448    for y in range(h):
     449        ey = [0.] * (w + 4)
     450        ex = 0
     451        ex2 = 0
     452        for x in range(w):
     453            c = src.getGray(x, y) + ex + ep[x + 2]
     454            d = c > 0.5
     455            dest.setGray(x, y, d)
     456            error = c - d
     457            ex = ex2 + error * 4. / 16.
     458            ex2 = error * 3. / 16.
     459            ey[x] += error * 1. / 16.
     460            ey[x + 1] += error * 2. / 16.
     461            ey[x + 2] += error * 3. / 16.
     462            ey[x + 3] += error * 2. / 16.
     463            ey[x + 4] += error * 1. / 16.
     464        ep = ey
     465    dest.writePng(name)
     466
     467test326(lenna256bw, "out3-2-6.png")
     468test326(gradient256bw, "grad3-2-6.png")
     469
     470# Output 3.2.7: Sierra's Filter Lite
     471def test327(src, name):
     472    (w, h) = src.size()
     473    dest = Image((w, h))
     474    ep = [0.] * (w + 1)
     475    for y in range(h):
     476        ey = [0.] * (w + 1)
     477        ex = 0
     478        for x in range(w):
     479            c = src.getGray(x, y) + ex + ep[x + 1]
     480            d = c > 0.5
     481            dest.setGray(x, y, d)
     482            error = c - d
     483            ex = error * 2. / 4.
     484            ey[x] += error * 1. / 4.
     485            ey[x + 1] += error * 1. / 4.
     486        ep = ey
     487    dest.writePng(name)
     488
     489test327(lenna256bw, "out3-2-7.png")
     490test327(gradient256bw, "grad3-2-7.png")
     491
     492# Output 3-2-8: Atkinson
    444493# TODO: merge with Jarvis-Judice-Ninke, Stucki etc.
    445 def test326(src, name):
     494def test328(src, name):
    446495    (w, h) = src.size()
    447496    dest = Image((w, h))
     
    467516    dest.writePng(name)
    468517
    469 test326(lenna256bw, "out3-2-6.png")
    470 test326(gradient256bw, "grad3-2-6.png")
     518test328(lenna256bw, "out3-2-8.png")
     519test328(gradient256bw, "grad3-2-8.png")
     520
     521# Output 3-2-9: Stevenson-Arce
     522# TODO: merge with Jarvis-Judice-Ninke, Stucki etc.
     523def test329(src, name):
     524    (w, h) = src.size()
     525    dest = Image((w, h))
     526    ep = [0.] * (w + 6)
     527    ey = [0.] * (w + 6)
     528    ey2 = [0.] * (w + 6)
     529    for y in range(h):
     530        ey3 = [0.] * (w + 6)
     531        ex = 0
     532        ex2 = 0
     533        for x in range(w):
     534            c = src.getGray(x, y) + ex + ep[x + 3]
     535            d = c > 0.5
     536            dest.setGray(x, y, d)
     537            error = c - d
     538            ex = ex2
     539            ex2 = error * 32. / 200.
     540            ey[x] += error * 12. / 200.
     541            ey[x + 2] += error * 26. / 200.
     542            ey[x + 4] += error * 30. / 200.
     543            ey[x + 6] += error * 16. / 200.
     544            ey2[x + 1] += error * 12. / 200.
     545            ey2[x + 3] += error * 26. / 200.
     546            ey2[x + 5] += error * 12. / 200.
     547            ey3[x] += error * 5. / 200.
     548            ey3[x + 2] += error * 12. / 200.
     549            ey3[x + 4] += error * 12. / 200.
     550            ey3[x + 6] += error * 5. / 200.
     551        ep = ey
     552        ey = ey2
     553        ey2 = ey3
     554    dest.writePng(name)
     555
     556test329(lenna256bw, "out3-2-9.png")
     557test329(gradient256bw, "grad3-2-9.png")
    471558
    472559##############################################################################
Note: See TracChangeset for help on using the changeset viewer.