scaling for html image maps

simonegli8 · Jun 3, 2013 · 2c370e2 · 2c370e2
1 parent e4b25a4
commit 2c370e2
Show file tree

Hide file tree

Showing 26 changed files with 44 additions and 35 deletions.
diff --git a/XamlImageConverter.Awesomium/Properties/AssemblyInfo.cs b/XamlImageConverter.Awesomium/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.9.0.0")]
-[assembly: AssemblyFileVersion("3.9.0.0")]
+[assembly: AssemblyVersion("3.10.0.0")]
+[assembly: AssemblyFileVersion("3.10.0.0")]
diff --git a/XamlImageConverter.Exe/Program.cs b/XamlImageConverter.Exe/Program.cs
@@ -22,7 +22,7 @@ public static void Main(string[] args) {
  }
 
  if (a.Count == 0 || new[] { "-h", "help", "-help", "?", "/?", "-?" }.Any(s => a.Any(at => s == at.Trim().ToLower()))) {
- Console.WriteLine("XamlImageConverter 3.9 by Chris Cavanagh & David Egli");
+ Console.WriteLine("XamlImageConverter 3.10 by Chris Cavanagh & David Egli");
  Console.WriteLine("Creates snapshots, gif animations or html image maps from XAML, SVG & PSD images\n\r");
  Console.Error.WriteLine("XamlImageConverter [-x] [-w] [-1] [-s [running time]] [-r] [-v]");
  Console.Error.WriteLine(" [-l librarypath] [-p projectpath] configFile { configFile }");

diff --git a/XamlImageConverter.Exe/Properties/AssemblyInfo.cs b/XamlImageConverter.Exe/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "3.9.0.0" )]
-[assembly: AssemblyFileVersion( "3.9.0.0" )]
+[assembly: AssemblyVersion( "3.10.0.0" )]
+[assembly: AssemblyFileVersion( "3.10.0.0" )]
diff --git a/XamlImageConverter.ItemWizard/ItemWizard.cs b/XamlImageConverter.ItemWizard/ItemWizard.cs
@@ -325,7 +325,7 @@ public void ModifyWebConfig() {
  if (configSections == null) webconfig.AddFirst(configSections = new XElement("configSections"));
 
  //configSections.Elements().Where(x => ((string)x.Attribute("type") ?? "").Contains("PublicKeyToken=60c2ec984bc1bb45")).Remove();
- configSections.Add(XElement.Parse("<section name='XamlImageConverter' type='XamlImageConverter.Configuration, XamlImageConverters.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
+ configSections.Add(XElement.Parse("<section name='XamlImageConverter' type='XamlImageConverter.Configuration, XamlImageConverters.Web, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
  // XamlImageConverter section
  if (webconfig.Element("XamlImageConverter") == null) configSections.AddAfterSelf(XElement.Parse("<XamlImageConverter Log='true' Cache='~/Images/Cache' />"));
  }
@@ -336,11 +336,11 @@ public void ModifyWebConfig() {
  var handlers = server.Element("handlers");
  if (handlers == null) server.Add(handlers = new XElement("handlers"));
  handlers.Elements().Where(x => ((string)x.Attribute("type") ?? "").Contains("PublicKeyToken=60c2ec984bc1bb45")).Remove();
- handlers.Add(XElement.Parse("<add name='XamlImageConverter.Xaml' verb='*' path='*.xaml' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
- XElement.Parse("<add name='XamlImageConverter.Svg' verb='*' path='*.svg' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
- XElement.Parse("<add name='XamlImageConverter.Svgz' verb='*' path='*.svgz' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
- XElement.Parse("<add name='XamlImageConverter.Psd' verb='*' path='*.psd' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
- XElement.Parse("<add name='XamlImageConverter.Dynamic' verb='*' path='xic.axd' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
+ handlers.Add(XElement.Parse("<add name='XamlImageConverter.Xaml' verb='*' path='*.xaml' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
+ XElement.Parse("<add name='XamlImageConverter.Svg' verb='*' path='*.svg' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
+ XElement.Parse("<add name='XamlImageConverter.Svgz' verb='*' path='*.svgz' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
+ XElement.Parse("<add name='XamlImageConverter.Psd' verb='*' path='*.psd' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"),
+ XElement.Parse("<add name='XamlImageConverter.Dynamic' verb='*' path='xic.axd' preCondition='integratedMode' type='XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
 
  // system.web
  var web = webconfig.Element("system.web");
@@ -352,15 +352,15 @@ public void ModifyWebConfig() {
  var assemblies = comp.Element("assemblies");
  if (assemblies == null) comp.Add(assemblies = new XElement("assemblies"));
  assemblies.Elements().Where(x => ((string)x.Attribute("assembly") ?? "").Contains("PublicKeyToken=60c2ec984bc1bb45")).Remove();
- assemblies.Add(XElement.Parse("<add assembly='XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45'/>"));
+ assemblies.Add(XElement.Parse("<add assembly='XamlImageConverter.Web, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45'/>"));
 
  // pages
  var pages = web.Element("pages");
  if (pages == null) comp.AddAfterSelf(pages = new XElement("pages"));
  var controls = pages.Element("controls");
  if (controls == null) pages.Add(controls = new XElement("controls"));
  controls.Elements().Where(x => ((string)x.Attribute("assembly") ?? "").Contains("PublicKeyToken=60c2ec984bc1bb45")).Remove();
- controls.Add(XElement.Parse("<add tagPrefix='xic' namespace='XamlImageConverter.Web.UI' assembly='XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
+ controls.Add(XElement.Parse("<add tagPrefix='xic' namespace='XamlImageConverter.Web.UI' assembly='XamlImageConverter.Web, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45' />"));
 
  /*
  // httpHandlers

diff --git a/XamlImageConverter.Test.Web/Web.config b/XamlImageConverter.Test.Web/Web.config
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
  <configSections>
- <section name="XamlImageConverter" type="XamlImageConverter.Configuration, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <section name="XamlImageConverter" type="XamlImageConverter.Configuration, XamlImageConverter.Web, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
  </configSections>
  <XamlImageConverter log="true" cache="~/Images/Cache" separateDomain="false"/>
  <appSettings/>
@@ -23,12 +23,12 @@
  -->
  <compilation debug="true" targetFramework="4.5">
  <assemblies>
- <add assembly="XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add assembly="XamlImageConverter.Web, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
  </assemblies>
  </compilation>
  <pages controlRenderingCompatibilityVersion="4.0">
  <controls>
- <add tagPrefix="xic" namespace="XamlImageConverter.Web.UI" assembly="XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add tagPrefix="xic" namespace="XamlImageConverter.Web.UI" assembly="XamlImageConverter.Web, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
  </controls>
  </pages>
  <!--
@@ -46,11 +46,11 @@
  -->
  <system.webServer>
  <handlers>
- <add name="XamlImageConverterXaml" verb="*" path="*.xaml" preCondition="integratedMode" type="XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
- <add name="XamlImageConverterPsd" verb="*" path="*.svg" preCondition="integratedMode" type="XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
- <add name="XamlImageConverterSvg" verb="*" path="*.svgz" preCondition="integratedMode" type="XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
- <add name="XamlImageConverterSvgz" verb="*" path="*.psd" preCondition="integratedMode" type="XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
- <add name="XamlImageConverterDynamic" verb="*" path="xic.axd" preCondition="integratedMode" type="XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add name="XamlImageConverterXaml" verb="*" path="*.xaml" preCondition="integratedMode" type="XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add name="XamlImageConverterPsd" verb="*" path="*.svg" preCondition="integratedMode" type="XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add name="XamlImageConverterSvg" verb="*" path="*.svgz" preCondition="integratedMode" type="XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add name="XamlImageConverterSvgz" verb="*" path="*.psd" preCondition="integratedMode" type="XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
+ <add name="XamlImageConverterDynamic" verb="*" path="xic.axd" preCondition="integratedMode" type="XamlImageConverter.Web.XamlImageHandler, XamlImageConverter.Web, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45"/>
  </handlers>
  <validation validateIntegratedModeConfiguration="false" />
  </system.webServer>

diff --git a/XamlImageConverter.Test.Web/XamlImageConverter.Demo/Readme.aspx b/XamlImageConverter.Test.Web/XamlImageConverter.Demo/Readme.aspx
@@ -41,7 +41,7 @@
  and in CreateImages.xic.xaml:
  <pre><code>&lt;xic:Snapshot Image="Usa.Map.png" &gt;
 &lt;xic:ImageMap ID="usamap" Image="Usa.Map.png" File="Readme.aspx" &gt;
- &lt;HotSpots Elements="WA,OR,CA,AK,ID,NV,AZ,UT,MT,WY,CO,NM,TX,OK,KS,NE,SD,ND,MN,IA,MO,AR,LA,WI,IL,TN,MS,MI,IN,KY,AL,FL,GA,SC,NC,VA,WV,OH,PA,MD,NJ,NY,CT,MA,VT,NH,ME,RI,DE,HI" HotSpotMode="PostBack" PostBackValue="%ID%"/&gt;
+ &lt;xic:HotSpots Elements="WA,OR,CA,AK,ID,NV,AZ,UT,MT,WY,CO,NM,TX,OK,KS,NE,SD,ND,MN,IA,MO,AR,LA,WI,IL,TN,MS,MI,IN,KY,AL,FL,GA,SC,NC,VA,WV,OH,PA,MD,NJ,NY,CT,MA,VT,NH,ME,RI,DE,HI" HotSpotMode="PostBack" PostBackValue="%ID%"/&gt;
 &lt;/xic:ImageMap&gt
  </code></pre>
 
@@ -175,13 +175,13 @@
  <h3>Map Element for a selectable map:</h3>
 
  <pre><code>
- &lt;xic:Map runat="server" Source="Usa.Map.svg" Scale="0.5" Mode="Select" CssClass="map" Legend="true" RepeatColumns="2" SubmitText="Submit" 
+ &lt;xic:Map runat="server" Source="Usa.Map.svg" Scale="0.5" Mode="Select" CssClass="map" Legend="true" RepeatColumns="3" SubmitText="Submit" 
  IDs="WA,OR,CA,AK,ID,NV,AZ,UT,MT,WY,CO,NM,TX,OK,KS,NE,SD,ND,MN,IA,MO,AR,LA,WI,IL,TN,MS,MI,IN,KY,AL,FL,GA,SC,NC,VA,WV,OH,PA,MD,NJ,NY,CT,MA,VT,NH,ME,RI,DE,HI"
  Regions="Washington,Oregon,California,Arkansas,Utah,Montana,Wyoming,Colorado,New Mexico,Texas,Oklahoma,Kansas,Nebraska,South Dakota,North Dakota,Minnesota,Iowa,Mississippi,Michigan,Indiana,Kentucky,Alabama,Florida,Georgia,South Carolina,North Carolina,Virginia,West Virginia,Ohio,Pennsylvania,Maryland,New Jersey,New York,Connecticut,Massachusetts,Vermont,New Hampshire,Maine,Rhode Island, Delaware,Hawaii" /&gt;
 
  </code></pre>
 
- <xic:Map runat="server" Source="Usa.Map.svg" Scale="0.5" Mode="Select" CssClass="map" Legend="true" RepeatColumns="2" SubmitText="Submit" 
+ <xic:Map runat="server" Source="Usa.Map.svg" Scale="0.5" Mode="Select" CssClass="map" Legend="true" RepeatColumns="3" SubmitText="Submit" 
  IDs="WA,OR,CA,AK,ID,NV,AZ,UT,MT,WY,CO,NM,TX,OK,KS,NE,SD,ND,MN,IA,MO,AR,LA,WI,IL,TN,MS,MI,IN,KY,AL,FL,GA,SC,NC,VA,WV,OH,PA,MD,NJ,NY,CT,MA,VT,NH,ME,RI,DE,HI"
  Regions="Washington,Oregon,California,Arkansas,Utah,Montana,Wyoming,Colorado,New Mexico,Texas,Oklahoma,Kansas,Nebraska,South Dakota,North Dakota,Minnesota,Iowa,Mississippi,Michigan,Indiana,Kentucky,Alabama,Florida,Georgia,South Carolina,North Carolina,Virginia,West Virginia,Ohio,Pennsylvania,Maryland,New Jersey,New York,Connecticut,Massachusetts,Vermont,New Hampshire,Maine,Rhode Island, Delaware,Hawaii" />
 

diff --git a/XamlImageConverter.Test.Web/XamlImageConverter.Test.Web.csproj b/XamlImageConverter.Test.Web/XamlImageConverter.Test.Web.csproj
@@ -70,6 +70,8 @@
  <SubType>ASPXCodeBehind</SubType>
  </Content>
  <Content Include="XamlImageConverter.Demo\blog-banner.jpg" />
+ <Content Include="XamlImageConverter.Demo\jquery.js" />
+ <Content Include="XamlImageConverter.Demo\jquery.maphilight.min.js" />
  <Content Include="XamlImageConverter.Demo\Kaxaml.gif" />
  <Content Include="XamlImageConverter.Demo\Readme.aspx" />
  <Content Include="XamlImageConverter.Demo\generic-lines.png" />

diff --git a/XamlImageConverter.VSIX/Lazy/Awesomium/XamlImageConverter.Awesomium.dll b/XamlImageConverter.VSIX/Lazy/Awesomium/XamlImageConverter.Awesomium.dll
diff --git a/XamlImageConverter.VSIX/Lazy/Awesomium/XamlImageConverter.Awesomium.pdb b/XamlImageConverter.VSIX/Lazy/Awesomium/XamlImageConverter.Awesomium.pdb
diff --git a/XamlImageConverter.VSIX/XamlImageConverter.ItemWizard.dll b/XamlImageConverter.VSIX/XamlImageConverter.ItemWizard.dll
diff --git a/XamlImageConverter.VSIX/XamlImageConverter.ItemWizard.pdb b/XamlImageConverter.VSIX/XamlImageConverter.ItemWizard.pdb
diff --git a/XamlImageConverter.VSIX/XamlImageConverter.Web.dll b/XamlImageConverter.VSIX/XamlImageConverter.Web.dll
diff --git a/XamlImageConverter.VSIX/XamlImageConverter.Web.pdb b/XamlImageConverter.VSIX/XamlImageConverter.Web.pdb
diff --git a/XamlImageConverter.VSIX/XamlImageConverter.dll b/XamlImageConverter.VSIX/XamlImageConverter.dll
diff --git a/XamlImageConverter.VSIX/XamlImageConverter.pdb b/XamlImageConverter.VSIX/XamlImageConverter.pdb
diff --git a/XamlImageConverter.VSIX/source.extension.vsixmanifest b/XamlImageConverter.VSIX/source.extension.vsixmanifest
@@ -3,18 +3,19 @@
  <Identifier Id="XamlImageConverter.2c5e9477-428f-4362-a5b5-d8c2d6ec2605">
  <Name>Xaml Image Converter</Name>
  <Author>David Egli</Author>
- <Version>3.9</Version>
+ <Version>3.10</Version>
  <AllUsers>true</AllUsers>
  <Description xml:space="preserve">Renders images, animations, html image maps &amp; pdf's from Xaml, SVG &amp; Photoshop files.
 
 Features:
-- Input Formats: Xaml, SVG &amp; PSD (Photoshop).
+- Input Formats: Xaml, SVG &amp; PSD (Photoshop), HTML.
 - Output Formats: png, gif, jgp, bmp, tif, xps, pdf, xaml.
 - Images with localized text.
 - Dynamic modification of the xaml before rendering.
 - GIF &amp; CSS filmstrips from Storyboards.
 - HttpHandler for on the fly image creation.
-- Html image map creation from Xaml &amp; SVG Geometries.</Description>
+- Html image map creation from Xaml &amp; SVG Geometries.
+- Conversion of HTML to PDF.</Description>
  <Locale>1033</Locale>
  <MoreInfoUrl>https://xamlimageconverter.codeplex.com</MoreInfoUrl>
  <License>license.rtf</License>

diff --git a/XamlImageConverter.VSIX/xiconvert.exe b/XamlImageConverter.VSIX/xiconvert.exe
diff --git a/XamlImageConverter.VSIX/xiconvert.pdb b/XamlImageConverter.VSIX/xiconvert.pdb
diff --git a/XamlImageConverter.Web/Properties/AssemblyInfo.cs b/XamlImageConverter.Web/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.9.0.0")]
-[assembly: AssemblyFileVersion("3.9.0.0")]
+[assembly: AssemblyVersion("3.10.0.0")]
+[assembly: AssemblyFileVersion("3.10.0.0")]
diff --git a/XamlImageConverter.v11.suo b/XamlImageConverter.v11.suo
diff --git a/XamlImageConverter/Lazy/Awesomium/XamlImageConverter.Awesomium.dll b/XamlImageConverter/Lazy/Awesomium/XamlImageConverter.Awesomium.dll
diff --git a/XamlImageConverter/Lazy/Awesomium/XamlImageConverter.Awesomium.pdb b/XamlImageConverter/Lazy/Awesomium/XamlImageConverter.Awesomium.pdb
diff --git a/XamlImageConverter/Properties/AssemblyInfo.cs b/XamlImageConverter/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.9.0.0")]
-[assembly: AssemblyFileVersion("3.9.0.0")]
+[assembly: AssemblyVersion("3.10.0.0")]
+[assembly: AssemblyFileVersion("3.10.0.0")]
diff --git a/XamlImageConverter/XamlCapture/Compiler.cs b/XamlImageConverter/XamlCapture/Compiler.cs
@@ -278,7 +278,7 @@ bool CheckNeedsBuilding(IEnumerable<Group> scenes) {
  /* void Init() {
  if (!init) {
  init = true;
- Errors.Message("XamlImageConverter 3.9 by Chris Cavanagh & David Egli");
+ Errors.Message("XamlImageConverter 3.10 by Chris Cavanagh & David Egli");
  Cpus = Parallel ? Environment.ProcessorCount : 1;
  Errors.Message("Using {0} CPU Cores.", Cpus);
  }
@@ -339,7 +339,7 @@ void Compile(string filename) {
  root.Filename = filename;
  root.Compiler = this;
  if (!CheckBuilding) {
- root.Errors.Status("XamlImageConverter 3.9 by Chris Cavanagh & David Egli");
+ root.Errors.Status("XamlImageConverter 3.10 by Chris Cavanagh & David Egli");
  root.Errors.Status("{0:G}, using {1} CPU cores.", DateTime.Now, Cpus);
  root.Errors.Status(Path.GetFileName(filename) + ":");
  }

diff --git a/XamlImageConverter/XamlCapture/ImageMap.cs b/XamlImageConverter/XamlCapture/ImageMap.cs
@@ -167,7 +167,7 @@ private void AddGeometry(DrawingGroup group, Geometry g) {
  }
 
  ApplyTransform(group.Transform, g);
- ApplyTransform(Transform, g);
+ //ApplyTransform(Transform, g);
 
  Geometries.Add(g);
  }
@@ -330,11 +330,13 @@ public IEnumerable<Geometry> Areas() {
  var tg = new TransformGroup();
  tg.Children.Add((Transform)ta);
  tg.Children.Add(Snapshot.Transform);
+ tg.Children.Add(Transform);
  VisualTransform = tg;
  } else {
  var tg = new GeneralTransformGroup();
  tg.Children.Add(ta);
  tg.Children.Add(Snapshot.Transform);
+ tg.Children.Add(Transform);
  VisualTransform = tg;
  }
 
@@ -403,13 +405,17 @@ private void ProcessArea(DependencyObject element, XElement area, string name, r
  }
  if (g is PathGeometry) { // path geometry
  var path = (PathGeometry)g;
+ var tg = (TransformGroup)t;
+ //tg.Children.Remove((Transform)renderer.VisualTransform);
+ tg.Children.Remove(g.Transform);
  path = path.GetFlattenedPathGeometry(Flatness, ToleranceType.Relative);
  foreach (var figure in path.Figures) { // process all figures & segments
  var points = new PointCollection();
  foreach (var segment in figure.Segments) {
  if (segment is LineSegment) { // segment is a LineSegment
  var ls = (LineSegment)segment;
  points.Add(t.Transform(ls.Point)); // add point to points
+ //points.Add(ls.Point);
  } else if (segment is PolyLineSegment) { // segment is a PolyLineSegment
  var pls = (PolyLineSegment)segment;
  foreach (var point in pls.Points) points.Add(t.Transform(point)); // add point to points 

diff --git a/XamlImageConverter/XamlCapture/Snapshot.cs b/XamlImageConverter/XamlCapture/Snapshot.cs
@@ -287,7 +287,7 @@ public void SaveHtml() {
 
  if (Html2PDF == null) {
  var apath = Compiler.BinPath("Lazy\\Awesomium\\");
- var aname = new System.Reflection.AssemblyName("XamlImageConverter.Awesomium, Version=3.9.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45");
+ var aname = new System.Reflection.AssemblyName("XamlImageConverter.Awesomium, Version=3.10.0.0, Culture=neutral, PublicKeyToken=60c2ec984bc1bb45");
  aname.CodeBase = apath + "XamlImageConverter.Awesomium.dll";
  var a = System.Reflection.Assembly.Load(aname);
  var Html2PDFType = a.GetType("XamlImageConverter.Html2PDF");