xmlgraphics-batik-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dewe...@apache.org
Subject cvs commit: xml-batik/xdocs extendingBatik.xml
Date Thu, 17 May 2001 23:06:39 GMT
deweese     01/05/17 16:06:39

  Modified:    resources/org/apache/batik/bridge BrokenLink.svg
               samples  batikLogo.svg
               sources/org/apache/batik/ext/awt/image/renderable
                        FilterResRable8Bit.java
               sources/org/apache/batik/gvt/renderer StaticRenderer.java
               xdocs    extendingBatik.xml
  Log:
  1) New broken link image from Vincent (much better thanks!)
  
  2) New ĘSimpler" squiggle art from Vincent integrated into batikLogo.svg.
     should look the same but a lot of redundent path data was removed.
  
  3) Retouched introduction of the three areas custom XML tag use is expected
     and anticipated in Batik in extendingBatik.xml.
  
  4) Fixed a bug in FilterResRable (requesting too much surround), but
     it hasn't fixed the tiling bug when zoomed in and panning around
     some images (seems to be triggered by use of filterRes).
  
  Revision  Changes    Path
  1.2       +35 -54    xml-batik/resources/org/apache/batik/bridge/BrokenLink.svg
  
  Index: BrokenLink.svg
  ===================================================================
  RCS file: /home/cvs/xml-batik/resources/org/apache/batik/bridge/BrokenLink.svg,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BrokenLink.svg	2001/05/15 13:54:44	1.1
  +++ BrokenLink.svg	2001/05/17 23:06:38	1.2
  @@ -1,54 +1,35 @@
  -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000802//EN"
  -"http://www.w3.org/TR/2000/CR-SVG-20000802/DTD/svg-20000802.dtd">
  -
  -<!-- ====================================================================== -->
  -<!-- Copyright (C) The Apache Software Foundation. All rights reserved.     -->
  -<!--                                                                        -->
  -<!-- This software is published under the terms of the Apache Software      -->
  -<!-- License version 1.1, a copy of which has been included with this       -->
  -<!-- distribution in the LICENSE file.                                      -->
  -<!-- ====================================================================== -->
  -
  -<svg  width="100" height="100" xml:space="preserve" viewBox="0 0 100 100">
  -  <defs>
  -    <g id="sadFace" x="0" y="0" width="50" height="50" 
  -         viewBox="0 0 50 50">
  -      <defs>
  -        <radialGradient id="face" gradientUnits="objectBoundingBox" 
  -                        fx="25%" fy="25%">
  -	    <stop offset="0%" style="stop-color:white" />
  -	    <stop offset="20%" style="stop-color:#ffff88" />
  -	    <stop offset="80%" style="stop-color:#BBBB33" />
  -	    <stop offset="100%" style="stop-color:#666600" />
  -        </radialGradient>
  -        <radialGradient id="eye" gradientUnits="objectBoundingBox" 
  -                        fx="25%" fy="25%">
  -	    <stop offset="0%" style="stop-color:#FFFFFF" />
  -	    <stop offset="20%" style="stop-color:#888888" />
  -	    <stop offset="100%" style="stop-color:#000000" />
  -        </radialGradient>
  -      </defs>
  -      <circle  cx="25" cy="25" r="25" fill="url(#face)"/>
  -      <ellipse cx="15" cy="18" rx="4" ry="6" fill="url(#eye)"/>
  -      <ellipse cx="35" cy="18" rx="4" ry="6" fill="url(#eye)"/>
  -      <path d="M 12,35 a 15,7 0 0,1 26,0 a 20,4 0 0,0 -26,0 z" fill="black"/>
  -    </g>
  -  </defs>
  -
  -  <rect x="1" y="1" width="98" height="98"
  -        fill="#8080FF" fill-opacity="0.8" stroke="black"/>
  -
  -
  -  <g transform="translate(10,40)">
  -    <g transform="rotate(-30)" >
  -      <text x="0" y="0" font-size="16">Broken</text>
  -    
  -      <text x="0" y="16" font-size="16">Link</text>
  -    </g>
  -  </g>
  -
  -  <g transform="translate(43,43)">
  -    <use xlink:href="#sadFace"/>
  -  </g>
  -
  -</svg>
  \ No newline at end of file
  +<?xml version="1.0" encoding="iso-8859-1"?>
  +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"   "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd">
  +<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
  +<svg  width="55.521pt" height="60.508pt" viewBox="0 0 55.521 60.508" xml:space="preserve">
  +	<g id="Layer_x0020_2" style="fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
  +		<g id="Broken_Squiggle" style="stroke:none;">
  +			<path id="Border" style="stroke:#000000;stroke-width:0.3;" d="M55.371,60.358H0.15V0.15h55.221v60.208z"/>
  +			<path id="Broken_Green_2" style="fill:#33CC33;" d="M21.198,37.293c-0.479,0.961-0.72,2.881,0.961,2.881c0.004,0.002,0.008,0,0.013,0.002c-0.304,0.807-0.617,1.613-0.974,2.398c-1.019,1.891-0.093,2.895,1.219,3.022l3.527-12.556
  +					c-1.904,1.104-3.428,2.277-4.746,4.252z"/>
  +			<path id="Broken_Green" style="fill:#33CC33;" d="M32.886,43.506c0.656-0.116,1.3-0.415,1.752-0.932c0.412-0.412,0.799-0.814,1.167-1.217c0.011,0.006,0.021,0.012,0.032,0.016c0.029-0.047,0.057-0.096,0.086-0.143c1.289-1.43,2.303-2.883,3.035-4.896
  +					c0.516-1.721-0.82-2.205-2.148-2.076c-0.212-1.113-1.281-1.869-2.893-1.283c-0.111,0.031-0.225,0.09-0.339,0.164c-0.809-0.396-2.029-0.135-2.78,0.314c-0.219,0.147-0.378,0.394-0.504,0.685l-0.282,2.9l2.874,6.468z"/>
  +			<path id="Broken_Blue" style="fill:#6666FF;" d="M24.734,21.065c-0.656-0.432-1.607-0.455-2.575,0.15c-0.065,0.047-0.132,0.104-0.197,0.161c-0.379-0.118-0.806-0.078-1.253,0.162c0.737-0.991,1.604-2.324,2.37-3.884l-2.566-3.949l0.096-0.35
  +					c-3.104,1.641-5.654,3.857-7.81,6.66c-0.72,0.96-1.92,2.88-0.96,4.319c0.619,1.034,2.126,0.464,2.993-0.327c-0.946,1.314-2.54,3.808-3.713,6.808c-0.96,2.4,0.479,4.799,2.88,3.119c1.376-0.951,2.7-1.955,3.942-3.023c0.134,0.188,0.406,0.115,0.857-0.336
  +					c0.221-0.221,0.44-0.445,0.661-0.668c0.672,0.652,1.843,0.77,2.938-0.053c0.061-0.09,0.136-0.168,0.203-0.252c0.35-0.127,0.725-0.373,1.088-0.665l-0.177-0.232l1.222-7.64z"/>
  +			<path id="Broken_Red" style="fill:#FF0000;" d="M31.054,17.17c0.061,0.173,0.13,0.331,0.21,0.468c-0.104,0.174-0.226,0.33-0.334,0.5l-0.585,4.567l0.073,1.644c0.423,0.282,0.97,0.352,1.579-0.015c0.227-0.129,0.439-0.273,0.658-0.412
  +					c0.451,0.664,1.158,1.001,1.982,0.412c0.153-0.092,0.306-0.176,0.459-0.266c-0.298,1.618-0.162,3.473,1.434,3.401c0.37,0.98,1.139,1.785,2.188,1.186c1.439-0.959,2.879-1.92,4.32-2.879c1.439-0.721,2.158-2.641,1.92-4.321c0-1.08-0.977-2.341-2.223-2.058
  +					c0.021-0.034,0.041-0.068,0.063-0.103c0.719-1.199,1.199-2.64,0.719-4.079c-0.24-0.96-1.439-1.921-2.398-1.2c-1.075,0.645-2.147,1.24-3.201,1.832c-0.16-0.339-0.371-0.642-0.618-0.871c0.073-0.16,0.144-0.32,0.218-0.481c0.48-1.2,0.721-6-1.92-4.56
  +					c-1.199,0.72-2.16,1.439-3.119,2.399c-0.829,0.829-1.417,2.001-1.551,3.201l0.251,0.669l-0.124,0.965z"/>
  +			<g id="Broken_Border" fill="none" 
  +                           stroke="#000000" stroke-width="0.2">
  +				<path d="M21.927,58.088l4.999-6.834l-4.999-4.166l0.404-1.441l3.526-12.556l0.235-0.837l-2.489-3.268l-0.177-0.232l1.222-7.64c-0.656-0.432-1.607-0.455-2.575,0.15c-0.065,0.047-0.132,0.104-0.197,0.161c-0.379-0.118-0.806-0.078-1.253,0.162
  +							c0.737-0.991,1.604-2.324,2.37-3.884l-2.566-3.949l0.096-0.35l1.404-5.15l-1.151-6.167H1.927v56.333h19.798l0.202-0.333z"/>
  +				<path d="M53.593,2.087h-24.11l-0.39,8.833l1.749,4.664l0.251,0.669l-0.124,0.965c0.061,0.173,0.13,0.331,0.21,0.468c-0.104,0.174-0.226,0.33-0.334,0.5l-0.585,4.567l0.072,1.644l0.261,5.856l-0.384,3.934l-0.283,2.9l2.875,6.468l0.459,1.032l-3.334,5.833l4,7.833l0.08,0.167h19.587V2.087z"/>
  +			</g>
  +		</g>
  +<!-- Commented out until we get the err info box up and running
  +		<g id="More_About">
  +			<path style="fill:#FFFF66;stroke-width:0.5934;" d="M52.014,53.504c0,1.968-1.595,3.563-3.563,3.563s-3.563-1.595-3.563-3.563s1.595-3.563,3.563-3.563s3.563,1.595,3.563,3.563z"/>
  +			<path style="fill:#000000;stroke:none;" d="M48.942,54.758c0,0.126,0,0.461,0.074,0.558c0.082,0.112,0.275,0.134,0.394,0.134v0.238c-0.297-0.007-0.602-0.022-0.914-0.029c-0.335,0.007-0.662,0.022-0.997,0.029v-0.238c0.119,0,0.313-0.022,0.395-0.134
  +				c0.074-0.097,0.074-0.431,0.074-0.558v-1.286c0-0.446-0.082-0.61-0.476-0.602v-0.246c0.483-0.037,0.959-0.104,1.45-0.223v2.356z
M47.805,51.212c0-0.313,0.253-0.565,0.565-0.565c0.32,0,0.55,0.253,0.55,0.565c0,0.319-0.26,0.55-0.572,0.55
  +				c-0.283,0-0.543-0.268-0.543-0.55z"/>
  +		</g>
  +        -->
  +	</g>
  +</svg>
  
  
  
  1.2       +16 -29    xml-batik/samples/batikLogo.svg
  
  Index: batikLogo.svg
  ===================================================================
  RCS file: /home/cvs/xml-batik/samples/batikLogo.svg,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- batikLogo.svg	2000/12/01 14:03:50	1.1
  +++ batikLogo.svg	2001/05/17 23:06:38	1.2
  @@ -13,7 +13,7 @@
   <!-- Test description here                                                     -->
   <!--                                                                           -->
   <!-- @author vincent.hardy@eng.sun.com                                         -->
  -<!-- @version $Id: batikLogo.svg,v 1.1 2000/12/01 14:03:50 deweese Exp $ -->
  +<!-- @version $Id: batikLogo.svg,v 1.2 2001/05/17 23:06:38 deweese Exp $ -->
   <!-- ========================================================================= -->
   
   <svg id="body" width="450" height="500" xml:space="preserve" viewBox="0 0 450 500">
  @@ -30,35 +30,22 @@
               </feComponentTransfer>
           </filter>
   
  -        <g id="Batik_Squiggle">  
  +        <g id="Batik_Squiggle" stroke="none" transform="scale(1.6, 1.6)">  
               <!-- The squiggle is defined as approx 54x57 units @ 0,0 -->
  -            <path id="Batik_Squiggle_Blue" style="fill:#6666FF;" 
  -                  d="M7,22c2.783-3.428,5.975-5.999,9.896-8.025c-1.157-1.682-2.313-3.363-3.47-5.045c-3.529,8.583-9.506,15.878-12.988,24.507c-1.424,3.528,1.087,7.368,4.788,4.606c4.628-3.453,9.209-6.988,12.807-11.548
  -                     c-1.737-1.683-3.474-3.367-5.21-5.05c-1.203,2.039-2.795,3.63-4.451,5.306c1.724,1.675,3.448,3.35,5.171,5.025c1.737-2.343,4.278-3.896,6.66-5.5c-1.726-1.112-3.452-2.225-5.177-3.337c-0.412,1.82-1.716,3.448-2.165,5.333c-0.819,3.436,2.431,5.561,5.228,3.37
  -                     c1.089-0.853,2.121-1.741,3.154-2.66c0.27-0.24,2.352-2.781,1.087-1.242c-1.901,0.256-3.802,0.513-5.703,0.769c-0.442-1.809-0.591-2.103-0.447-0.882c0.061,0.692,0.135,1.383,0.222,2.073c0.547,4.68,6.211-1.189,6.884-2.75c0.811-1.877,1.806-4.181,0.519-6.087
  -                     c-1.083-1.603-3.412-1.174-4.709-0.111c-1.155,0.947-2.154,2.039-3.312,2.981c1.743,1.123,3.485,2.247,5.228,3.37c0.401-1.833,1.678-3.476,2.114-5.365c0.839-3.633-2.323-5.241-5.177-3.337c-4.064,2.711-7.516,5.554-10.458,9.476
  -                     c-3.299,4.397,0.973,9.229,5.171,5.025c2.33-2.333,4.55-4.69,6.248-7.532c2.625-4.394-1.298-9.954-5.21-5.05c-3.095,3.878-6.791,6.867-10.729,9.847c1.596,1.536,3.192,3.071,4.788,4.606c3.412-8.649,9.323-16.011,12.686-24.702
  -                     c0.948-2.451,0.194-7.002-3.47-5.045c-5.309,2.836-9.933,6.46-13.639,11.23c-1.319,1.697-3.073,4.564-1.681,6.745c1.318,2.063,4.239,0.358,5.343-1.001z"/>
  -
  -            <path id="Batik_Squiggle_Red" style="fill:#FF0000;" 
  -                  d="M36,13c1.095-1.054,2.151-1.838,3.493-2.567c-0.949-2.375-1.897-4.749-2.846-7.124c-1.96,3.858-3.554,8.012-5.898,11.658c-1.202,1.87-1.95,4.149-1.307,6.371c0.461,1.592,2.045,2.92,3.719,1.958
  -                     c2.792-1.606,5.072-3.694,7.356-5.946c-1.631-1.296-3.263-2.592-4.895-3.888c0.423-2.181-0.838,1.04-1.041,1.472c-0.595,1.267-0.875,2.5-1.14,3.864c-0.396,2.038,1.298,6.281,4.05,4.513c3.503-2.25,7.211-4.155,10.708-6.416c-0.86-2.792-1.721-5.585-2.582-8.377
  -                     c-2.26,3.495-4.161,7.205-6.419,10.698c-1.166,1.803-3.031,9.546,1.622,8.659c2.694-0.513,5.223-2.283,7.228-4.094c-1.4-2.216-2.8-4.432-4.2-6.648c-1.777,2.892-3.42,4.527-4.006,8.079c-0.355,2.152,1.243,6.147,4.078,4.521c2.237-1.284,4.184-2.972,6.395-4.286
  -                     c2.267-1.346,3.457-4.071,3.249-6.675c-0.157-1.958-1.758-4.435-4.029-3.175c-2.268,1.258-4.202,2.985-6.443,4.271c1.359,1.507,2.719,3.014,4.078,4.521c-0.546,1.443-0.411,1.566,0.405,0.371c0.791-0.92,1.374-1.96,2.007-2.989
  -                     c1.776-2.889-0.048-10.398-4.2-6.648c-0.903,0.816-2.232,2.09-3.469,2.326c0.541,2.886,1.081,5.772,1.622,8.659c2.26-3.495,4.161-7.205,6.419-10.698c1.215-1.88,1.976-4.14,1.287-6.376c-0.469-1.523-2.212-3.072-3.869-2.001
  -                     c-3.493,2.259-7.202,4.153-10.688,6.422c1.35,1.504,2.7,3.008,4.05,4.513c-0.386,2.161,0.771-1.038,0.976-1.492c0.577-1.276,0.878-2.497,1.123-3.869c0.493-2.755-2.1-6.696-4.895-3.888c-1.704,1.712-3.375,3.525-5.479,4.751c0.804,2.776,1.608,5.553,2.413,8.329
  -                     c2.776-4.455,4.699-9.286,6.938-14.016c0.902-1.905,1.375-9.486-2.846-7.124c-1.896,1.062-3.539,2.305-5.063,3.851c-1.783,1.808-2.738,4.762-2.12,7.262c0.545,2.203,2.574,2.816,4.221,1.232z"/>
  -            <path id="Batik_Squiggle_Green" style="fill:#33CC33;" 
  -                  d="M24,44c0.783-0.504,1.606-0.938,2.469-1.301c-1.583-1.209-3.166-2.419-4.748-3.628c-2.467,3.958-3.438,8.551-5.454,12.714c-2.352,4.856,3.013,5.929,6.132,3.061c3.375-3.103,7.41-5.351,10.752-8.495
  -                     c-2.078-1.06-4.155-2.12-6.233-3.18c-1.059,2.217-1.887,4.529-3.542,6.382c-3.302,3.697,0.169,7.709,4.344,5.127c4.005-2.478,8.331-4.002,11.861-7.246c-2.243-0.696-4.485-1.393-6.728-2.089c-0.215,1.156-1.024,2.195-1.661,3.168
  -                     c-3.016,4.607,3.391,6.075,6.246,3.195c2.925-2.951,5.072-5.702,6.501-9.646c1.441-3.978-3.187-4.057-5.543-2.891c-1.383,0.685-2.487,1.158-4.03,1.306c1.048,1.237,2.097,2.475,3.145,3.712c0.125-0.477,1.471-1.594,1.964-2.097
  -                     c2.829-2.878,1.002-6.963-3.061-5.589c-2.886,0.976-5.777,1.933-8.535,3.236c0.28,2.457,0.561,4.913,0.841,7.369c0.352-0.233,0.71-0.457,1.068-0.681c0.451-0.278,0.911-0.541,1.379-0.791c-0.923,0.3-0.715,0.262,0.625-0.115c2.553-0.935,4.935-3.57,5.073-6.385
  -                     c0.154-3.138-3.764-2.988-5.619-1.686c-2.035,1.429-3.433,2.693-4.696,4.823c0.983-0.965,1.966-1.93,2.949-2.895c-0.115,0.083-0.23,0.167-0.345,0.25c-1.448,1.045-2.816,2.212-3.498,3.921c-0.501,1.257-0.279,3.353,1.588,3.168
  -                     c1.579-0.156,3.114-0.367,4.511-1.194c-0.039,0.023,3.256-2.522,1.495-1.309c-1.873-0.562-3.745-1.124-5.618-1.687c0.139-0.474,0.279-0.949,0.418-1.423c1.762-1.264,3.523-2.527,5.285-3.791c-2.419,0.446-4.606,1.661-6.651,2.991
  -                     c-1.733,1.126-3.506,2.876-3.606,5.088c-0.11,2.417,2.563,3.155,4.448,2.281c2.775-1.286,5.681-2.224,8.582-3.182c-0.685-2.2-1.37-4.401-2.055-6.601c-2.17,2.169-4.635,4.408-5.459,7.474c-0.627,2.334,0.756,3.929,3.145,3.712c3.196-0.29,5.958-1.573,8.806-2.973
  -                     c-1.848-0.963-3.695-1.927-5.543-2.891c-0.48,1.318-1.07,2.204-2.055,3.192c2.082,1.065,4.164,2.13,6.246,3.195c1.067-1.622,2.254-3.462,2.616-5.39c0.854-4.542-4.149-4.445-6.728-2.089c-2.762,2.523-6.394,3.631-9.534,5.592c1.448,1.709,2.896,3.418,4.344,5.127
  -                     c2.271-2.566,3.568-5.538,5.016-8.597c2.284-4.825-3.085-6.168-6.233-3.18c-3.328,3.158-7.349,5.426-10.644,8.623c2.044,1.02,4.088,2.041,6.132,3.061c1.928-4.203,2.889-8.988,5.245-12.96c2.417-4.074-1.607-5.273-4.748-3.628
  -                     c-3.403,1.783-6.204,3.945-8.23,7.255c-0.98,1.601-1.226,4.278,1.271,4.468c2.564,0.195,5.004-1.875,6.301-3.884z"/>
  +            <path id="Batik_Squiggle_Blue" fill="#6666FF" 
  +                  d="M14.88,13.024c-0.186-0.247-0.322-0.254-0.42-0.151c0.008-1.744-1.698-2.605-3.419-1.529c-0.065,0.047-0.131,0.104-0.197,0.161c-0.379-0.118-0.805-0.078-1.252,0.162
  +				c0.995-1.338,2.228-3.299,3.129-5.603c0.479-1.44,0-4.32-2.16-3.12c-3.6,1.68-6.48,4.08-8.88,7.2c-0.72,0.96-1.92,2.88-0.96,4.319c0.62,1.034,2.126,0.463,2.993-0.328C2.767,15.45,1.173,17.944,0,20.944c-0.96,2.4,0.479,4.8,2.88,3.12
  +				c1.376-0.953,2.701-1.957,3.942-3.023c0.134,0.188,0.406,0.114,0.857-0.337c0.221-0.221,0.441-0.445,0.661-0.668c0.672,0.652,1.843,0.769,2.938-0.052c0.061-0.091,0.136-0.169,0.204-0.253c1.212-0.44,2.762-2.248,2.917-2.867c0.72-1.2,1.2-2.64,0.48-3.84z"/>
  +            <path id="Batik_Squiggle_Red" fill="#FF0000" 
  +                  d="M33.84,11.583c0-1.08-0.976-2.341-2.222-2.058c0.021-0.034,0.041-0.068,0.062-0.103c0.72-1.199,1.2-2.64,0.72-4.079c-0.24-0.96-1.439-1.921-2.399-1.2c-1.075,0.645-2.147,1.24-3.2,1.832
  +				c-0.161-0.339-0.372-0.642-0.619-0.871c0.073-0.16,0.144-0.32,0.218-0.481c0.48-1.2,0.72-6-1.92-4.56c-1.2,0.72-2.16,1.439-3.12,2.399c-1.2,1.2-1.92,3.12-1.439,4.801c0.063,0.189,0.14,0.355,0.226,0.503c-0.293,0.494-0.602,0.973-0.947,1.417
  +				c-0.72,1.2-1.199,2.64-0.72,4.08c0.24,0.96,1.2,1.92,2.4,1.199c0.227-0.129,0.439-0.274,0.658-0.413c0.451,0.664,1.158,1.001,1.982,0.413c0.154-0.092,0.306-0.176,0.46-0.267c-0.298,1.618-0.163,3.473,1.433,3.402c0.371,0.98,1.139,1.784,2.188,1.185
  +				c1.44-0.96,2.88-1.92,4.32-2.88c1.439-0.72,2.159-2.64,1.92-4.32z"/>
  +            <path id="Batik_Squiggle_Green" fill="#33CC33" 
  +                  d="M25.692,24.387c-0.212-1.113-1.282-1.869-2.892-1.283c-0.112,0.032-0.226,0.09-0.339,0.164c-0.809-0.396-2.029-0.135-2.781,0.316c-0.238,0.159-0.412,0.428-0.541,0.755
  +				c-0.143,0.081-0.288,0.163-0.437,0.252c0.89-2.079-1.543-2.853-3.343-1.727c-2.16,1.2-3.84,2.4-5.28,4.56c-0.479,0.961-0.72,2.881,0.961,2.881c0.004,0,0.008,0,0.013,0c-0.304,0.808-0.617,1.614-0.974,2.399c-1.68,3.12,1.921,3.84,3.841,2.16
  +				c0.105-0.105,0.217-0.202,0.324-0.304c0.622,0.677,1.771,0.869,3.035,0.064c0.818-0.446,1.635-0.87,2.446-1.298c0.973,0.631,2.822,0.489,3.794-0.622c0.413-0.413,0.799-0.814,1.167-1.217c0.011,0.006,0.021,0.012,0.033,0.017c0.029-0.048,0.056-0.096,0.085-0.144
  +				c1.29-1.429,2.303-2.883,3.035-4.896c0.516-1.721-0.82-2.205-2.148-2.076z"/>
           </g> <!-- End Batik_Squiggle -->
   
   
  
  
  
  1.5       +20 -5     xml-batik/sources/org/apache/batik/ext/awt/image/renderable/FilterResRable8Bit.java
  
  Index: FilterResRable8Bit.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/ext/awt/image/renderable/FilterResRable8Bit.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FilterResRable8Bit.java	2001/04/30 22:01:03	1.4
  +++ FilterResRable8Bit.java	2001/05/17 23:06:38	1.5
  @@ -24,7 +24,7 @@
    * Interface for implementing filter resolution.
    *
    * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
  - * @version $Id: FilterResRable8Bit.java,v 1.4 2001/04/30 22:01:03 deweese Exp $
  + * @version $Id: FilterResRable8Bit.java,v 1.5 2001/05/17 23:06:38 deweese Exp $
    */
   public class FilterResRable8Bit extends AbstractRable 
       implements FilterResRable{
  @@ -162,6 +162,20 @@
                       
                       newUsr2Dev.concatenate(usr2dev);
                       
  +                    // This splits out the scale so we know how much to pad
  +                    // in user space so we have a pixel surround in device
  +                    // space for the affine.
  +                    double sx = newUsr2Dev.getScaleX();
  +                    double sy = newUsr2Dev.getScaleY();
  +
  +                    double shx = newUsr2Dev.getShearX();
  +                    double shy = newUsr2Dev.getShearY();
  +
  +                    // The Scale is roughly the "hypotonose" of the
  +                    // matrix vectors.
  +                    double devSX = Math.sqrt(sx*sx + shy*shy);
  +                    double devSY = Math.sqrt(sy*sy + shx*shx);
  +
                       //
                       // Create a new RenderingContext
                       //
  @@ -180,10 +194,10 @@
                       //
                       Rectangle2D newAOI = aoi.getBounds2D();
                       newAOI = new Rectangle2D.Double
  -                        (newAOI.getX()-1/scaleX,
  -                         newAOI.getY()-1/scaleY,
  -                         newAOI.getWidth()+2/scaleX,
  -                         newAOI.getHeight()+2/scaleY);
  +                        (newAOI.getX()-1/devSX,
  +                         newAOI.getY()-1/devSY,
  +                         newAOI.getWidth()+2/devSX,
  +                         newAOI.getHeight()+2/devSY);
   
                       newRenderContext.setAreaOfInterest(newAOI);
   
  @@ -196,6 +210,7 @@
                       
                       RenderedImage result = null;
                       result = localSource.createRendering(newRenderContext);
  +                    // org.ImageDisplay.showImage("AT: " + newUsr2Dev, result);
                       if (result != null)
                           result = new AffineRed
                               (GraphicsUtil.wrap(result),
  
  
  
  1.13      +13 -3     xml-batik/sources/org/apache/batik/gvt/renderer/StaticRenderer.java
  
  Index: StaticRenderer.java
  ===================================================================
  RCS file: /home/cvs/xml-batik/sources/org/apache/batik/gvt/renderer/StaticRenderer.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- StaticRenderer.java	2001/03/26 21:27:37	1.12
  +++ StaticRenderer.java	2001/05/17 23:06:39	1.13
  @@ -26,6 +26,7 @@
   import org.apache.batik.ext.awt.image.PadMode;
   import org.apache.batik.ext.awt.image.rendered.CachableRed;
   import org.apache.batik.ext.awt.image.rendered.PadRed;
  +import org.apache.batik.ext.awt.image.rendered.TranslateRed;
   
   import java.util.Iterator;
   import java.util.Stack;
  @@ -50,7 +51,7 @@
    * rendering in an offscreen buffer image.
    *
    * @author <a href="mailto:vincent.hardy@eng.sun.com>Vincent Hardy</a>
  - * @version $Id: StaticRenderer.java,v 1.12 2001/03/26 21:27:37 deweese Exp $
  + * @version $Id: StaticRenderer.java,v 1.13 2001/05/17 23:06:39 deweese Exp $
    */
   public class StaticRenderer implements ImageRenderer {
       /**
  @@ -403,9 +404,14 @@
               workingRaster     = null;
               workingOffScreen  = null;
   
  +            AffineTransform at, rcAT;
  +            at = nodeRenderContext.getTransform();
  +            rcAT = new AffineTransform(at.getScaleX(), at.getShearY(),
  +                                       at.getShearX(), at.getScaleY(),
  +                                       0, 0);
  +
               RenderContext rc = new RenderContext
  -                (nodeRenderContext.getTransform(),
  -                 null,
  +                (rcAT, null,
                    nodeRenderContext.getRenderingHints());
               
               RenderedImage ri = rootGNR.createRendering(rc);
  @@ -413,6 +419,10 @@
                   return;
   
               rootCR = GraphicsUtil.wrap(ri);
  +            int dx = Math.round((float)at.getTranslateX()+0.5f);
  +            int dy = Math.round((float)at.getTranslateY()+0.5f);
  +            rootCR = new TranslateRed(rootCR, rootCR.getMinX()+dx, 
  +                                      rootCR.getMinY()+dy);
               rootCR = GraphicsUtil.convertTosRGB(rootCR);
   
           }
  
  
  
  1.6       +45 -17    xml-batik/xdocs/extendingBatik.xml
  
  Index: extendingBatik.xml
  ===================================================================
  RCS file: /home/cvs/xml-batik/xdocs/extendingBatik.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- extendingBatik.xml	2001/05/16 23:50:43	1.5
  +++ extendingBatik.xml	2001/05/17 23:06:39	1.6
  @@ -11,7 +11,7 @@
   
   <!-- ====================================================================== -->
   <!-- author Thomas.DeWeese@kodak.com                                        -->
  -<!-- version $Id: extendingBatik.xml,v 1.5 2001/05/16 23:50:43 deweese Exp $ -->
  +<!-- version $Id: extendingBatik.xml,v 1.6 2001/05/17 23:06:39 deweese Exp $ -->
   <!-- ====================================================================== -->
   
   <document>
  @@ -75,32 +75,60 @@
               There are three basic options Batik considers:
               </p>
               <dl>
  -                <dt> Tags appear in the DOM tree. </dt>
  +                <dt> Having your tags appear in the DOM tree. </dt>
                   <dd><br/>
  -                If your only interest if for the custom tags to appear
  -                in the SVG DOM tree, you need do nothing more than
  -                provide appropriate namespacing and DTD(s) (ie. simply
  -                make your new content well formed and/or valid XML).
  -                Batik will ignore the branches of the DOM that it
  -                doesn't understand.
  +                As long as your custom tags are well formed (and
  +                preferably valid) XML they will appear in the SVG DOM
  +                tree.  When rendering Batik will skip branches of the
  +                tree that use a tag it doesn't know about (so even if
  +                standard SVG tags are child nodes they will not be
  +                displayed).
  +                <br/>
  +                It is strongly suggested that you make use of XML
  +                namespaces for your personal tags even if you are not
  +                planning on validating the XML.
  +                <br/>
  +                This can be useful if you want to add extra pieces of
  +                data into the standard SVG drawing.  These might be
  +                annotations, or other application specific data.  In
  +                general this wouldn't be particularly useful with the
  +                svgbrowser or rasterizer, but might be very useful if
  +                you were writing a custom browser, rasterizer, or
  +                pre/post processing tools.
                   </dd>
       
                   <dt> Tags use a custom element in  the DOM tree</dt>
                   <dd><br/>
  +
                   If you need your tags to use a custom element subclass
                   in the DOM tree (for behavioral or performance
  -                reasons) then you need to provide an 
  -                <link href="#domExtension"> extension to the Batik
  -                DOM.</link>
  +                reasons) then you need to provide an <link
  +                href="#domExtension"> extension to the Batik
  +                DOM.</link> <br/>
  +
  +                Doing this gives you the opportunity to override the
  +                standard methods on DOM elements, or to provide
  +                additional methods to your DOM elements.  For example
  +                all of the SVG elements in Batik implement the
  +                getAttribute methods to respect the CSS styling
  +                properties.  They also provide additional methods to
  +                implement the SVG DOM.
                   </dd>
       
  -                <dt> Tags affect rendering.</dt>
  +                <dt> Tags that get rendered.</dt>
                   <dd><br/>
  -                If your interest is in having the new tag participate
  -                in or affect the rendering or transcoding operations
  -                then you must provide an <link href="#bridgeExtension">
  -                extension to the Batik Bridge</link> (you may
  -                also need to write an extension to the DOM as well).
  +
  +                Probably the most common reason to develop custom tags
  +                is to add new rendering primitives to the SVG
  +                language.  In this case you must provide an <link
  +                href="#bridgeExtension"> extension to the Batik
  +                Bridge</link>.  The bridge extension is resposible for
  +                constructing the class(es) that will handle the
  +                rendering of the new primitive in Batik.  <br/>
  +
  +                In most cases it will also be necessary to write a DOM
  +                extension to make the tag behave like other SVG tags
  +                (most notably for support of styling).
                   </dd>
               </dl>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: batik-dev-unsubscribe@xml.apache.org
For additional commands, e-mail: batik-dev-help@xml.apache.org


Mime
View raw message