diff --git a/.gitattributes b/.gitattributes
index 575a63b76e..654d2a2fb2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5006,6 +5006,11 @@ components/tachart/aggpas/taguiconnectoraggpas.pas svneol=native#text/pascal
 components/tachart/aggpas/tchartguiconnectoraggpas.png -text
 components/tachart/aggpas/tchartguiconnectoraggpas_150.png -text
 components/tachart/aggpas/tchartguiconnectoraggpas_200.png -text
+components/tachart/bgra/tabgrautils.pas svneol=native#text/pascal
+components/tachart/bgra/tachartbgra.lpk svneol=native#text/pascal
+components/tachart/bgra/tachartbgra.pas svneol=native#text/pascal
+components/tachart/bgra/tadrawerbgra.pas svneol=native#text/pascal
+components/tachart/bgra/taguiconnectorbgra.pas svneol=native#text/pascal
 components/tachart/demo/3d/main.lfm svneol=native#text/plain
 components/tachart/demo/3d/main.pas svneol=native#text/plain
 components/tachart/demo/3d/zdemo.lpi svneol=native#text/plain
@@ -5341,13 +5346,13 @@ components/tachart/languages/tachartstrconsts.uk.po svneol=native#text/plain
 components/tachart/languages/tachartstrconsts.zh_CN.po svneol=native#text/plain
 components/tachart/numlib_fix/direct.inc svneol=native#text/pascal
 components/tachart/numlib_fix/ipf_fix.pas svneol=native#text/plain
+components/tachart/print/tachartprint.lpk svneol=native#text/xml
+components/tachart/print/tachartprint.pas svneol=native#text/pascal
+components/tachart/print/taprint.pas svneol=native#text/pascal
 components/tachart/taanimatedsource.pas svneol=native#text/pascal
 components/tachart/taaxissource.pas svneol=native#text/pascal
-components/tachart/tabgrautils.pas svneol=native#text/pascal
 components/tachart/tachartaxis.pas svneol=native#text/pascal
 components/tachart/tachartaxisutils.pas svneol=native#text/pascal
-components/tachart/tachartbgra.lpk svneol=native#text/pascal
-components/tachart/tachartbgra.pas svneol=native#text/pascal
 components/tachart/tachartcombos.pas svneol=native#text/plain
 components/tachart/tachartextentlink.pas svneol=native#text/pascal
 components/tachart/tachartimagelist.pas svneol=native#text/pascal
@@ -5359,8 +5364,6 @@ components/tachart/tachartprint.pas svneol=native#text/pascal
 components/tachart/tachartstrconsts.pas svneol=native#text/plain
 components/tachart/tachartteechart.pas svneol=native#text/pascal
 components/tachart/tachartutils.pas svneol=native#text/plain
-components/tachart/tachartwmf.lpk svneol=native#text/plain
-components/tachart/tachartwmf.pas svneol=native#text/pascal
 components/tachart/tacustomfuncseries.pas svneol=native#text/pascal
 components/tachart/tacustomseries.pas svneol=native#text/plain
 components/tachart/tacustomsource.pas svneol=native#text/pascal
@@ -5371,12 +5374,10 @@ components/tachart/tadbsource.pas svneol=native#text/pascal
 components/tachart/tadiagram.pas svneol=native#text/pascal
 components/tachart/tadiagramdrawing.pas svneol=native#text/pascal
 components/tachart/tadiagramlayout.pas svneol=native#text/pascal
-components/tachart/tadrawerbgra.pas svneol=native#text/pascal
 components/tachart/tadrawercanvas.pas svneol=native#text/pascal
 components/tachart/tadrawerfpcanvas.pas svneol=native#text/pascal
 components/tachart/tadraweropengl.pas svneol=native#text/pascal
 components/tachart/tadrawersvg.pas svneol=native#text/pascal
-components/tachart/tadrawerwmf.pas svneol=native#text/pascal
 components/tachart/tadrawutils.pas svneol=native#text/pascal
 components/tachart/taenumerators.pas svneol=native#text/pascal
 components/tachart/taexpressionseries.pas svneol=native#text/plain
@@ -5388,7 +5389,6 @@ components/tachart/tageometry.pas svneol=native#text/pascal
 components/tachart/tagraph.pas svneol=native#text/plain
 components/tachart/tagraph.res -text
 components/tachart/taguiconnector.pas svneol=native#text/pascal
-components/tachart/taguiconnectorbgra.pas svneol=native#text/pascal
 components/tachart/tahtml.pas svneol=native#text/plain
 components/tachart/taintervalsources.pas svneol=native#text/pascal
 components/tachart/talegend.pas svneol=native#text/plain
@@ -5441,6 +5441,9 @@ components/tachart/tutorials/moores_law/main.pas svneol=native#text/pascal
 components/tachart/tutorials/moores_law/moore.lpi svneol=native#text/plain
 components/tachart/tutorials/moores_law/moore.lpr svneol=native#text/pascal
 components/tachart/tutorials/readme.txt svneol=native#text/plain
+components/tachart/wmf/tachartwmf.lpk svneol=native#text/plain
+components/tachart/wmf/tachartwmf.pas svneol=native#text/pascal
+components/tachart/wmf/tadrawerwmf.pas svneol=native#text/pascal
 components/tdbf/Makefile svneol=native#text/plain
 components/tdbf/Makefile.compiled svneol=native#text/plain
 components/tdbf/Makefile.fpc svneol=native#text/plain
diff --git a/components/tachart/tabgrautils.pas b/components/tachart/bgra/tabgrautils.pas
similarity index 100%
rename from components/tachart/tabgrautils.pas
rename to components/tachart/bgra/tabgrautils.pas
diff --git a/components/tachart/tachartbgra.lpk b/components/tachart/bgra/tachartbgra.lpk
similarity index 100%
rename from components/tachart/tachartbgra.lpk
rename to components/tachart/bgra/tachartbgra.lpk
diff --git a/components/tachart/tachartbgra.pas b/components/tachart/bgra/tachartbgra.pas
similarity index 100%
rename from components/tachart/tachartbgra.pas
rename to components/tachart/bgra/tachartbgra.pas
diff --git a/components/tachart/tadrawerbgra.pas b/components/tachart/bgra/tadrawerbgra.pas
similarity index 100%
rename from components/tachart/tadrawerbgra.pas
rename to components/tachart/bgra/tadrawerbgra.pas
diff --git a/components/tachart/taguiconnectorbgra.pas b/components/tachart/bgra/taguiconnectorbgra.pas
similarity index 100%
rename from components/tachart/taguiconnectorbgra.pas
rename to components/tachart/bgra/taguiconnectorbgra.pas
diff --git a/components/tachart/print/tachartprint.lpk b/components/tachart/print/tachartprint.lpk
new file mode 100644
index 0000000000..0fadade45f
--- /dev/null
+++ b/components/tachart/print/tachartprint.lpk
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<CONFIG>
+  <Package Version="3">
+    <PathDelim Value="\"/>
+    <Name Value="TAChartPrint"/>
+    <Author Value="Alexander Klenin"/>
+    <CompilerOptions>
+      <Version Value="10"/>
+      <PathDelim Value="\"/>
+      <SearchPaths>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\$(LCLWidgetType)"/>
+      </SearchPaths>
+      <Other>
+        <CompilerMessages>
+          <UseMsgFile Value="True"/>
+        </CompilerMessages>
+        <CompilerPath Value="$(CompPath)"/>
+      </Other>
+    </CompilerOptions>
+    <Description Value="Printing back-end for TAChart"/>
+    <Version Major="1"/>
+    <Files Count="1">
+      <Item1>
+        <Filename Value="taprint.pas"/>
+        <UnitName Value="TAPrint"/>
+      </Item1>
+    </Files>
+    <Type Value="RunAndDesignTime"/>
+    <RequiredPkgs Count="3">
+      <Item1>
+        <PackageName Value="TAChartLazarusPkg"/>
+      </Item1>
+      <Item2>
+        <PackageName Value="Printer4Lazarus"/>
+      </Item2>
+      <Item3>
+        <PackageName Value="FCL"/>
+        <MinVersion Major="1" Release="1" Valid="True"/>
+      </Item3>
+    </RequiredPkgs>
+    <UsageOptions>
+      <UnitPath Value="$(PkgOutDir)"/>
+    </UsageOptions>
+    <PublishOptions>
+      <Version Value="2"/>
+    </PublishOptions>
+  </Package>
+</CONFIG>
diff --git a/components/tachart/print/tachartprint.pas b/components/tachart/print/tachartprint.pas
new file mode 100644
index 0000000000..6cfe3a5c7b
--- /dev/null
+++ b/components/tachart/print/tachartprint.pas
@@ -0,0 +1,21 @@
+{ This file was automatically created by Lazarus. Do not edit!
+  This source is only used to compile and install the package.
+ }
+
+unit TAChartPrint;
+
+{$warn 5023 off : no warning about unused units}
+interface
+
+uses
+  TAPrint, LazarusPackageIntf;
+
+implementation
+
+procedure Register;
+begin
+end;
+
+initialization
+  RegisterPackage('TAChartPrint', @Register);
+end.
diff --git a/components/tachart/print/taprint.pas b/components/tachart/print/taprint.pas
new file mode 100644
index 0000000000..ce13acb7d7
--- /dev/null
+++ b/components/tachart/print/taprint.pas
@@ -0,0 +1,50 @@
+{
+ *****************************************************************************
+  See the file COPYING.modifiedLGPL.txt, included in this distribution,
+  for details about the license.
+ *****************************************************************************
+
+  Authors: Alexander Klenin
+
+}
+unit TAPrint;
+
+{$H+}
+
+interface
+
+uses
+  Printers, TADrawerCanvas;
+
+type
+
+  { TPrinterDrawer }
+
+  TPrinterDrawer = class(TScaledCanvasDrawer)
+  private
+    FPrinter: TPrinter;
+  public
+    constructor Create(APrinter: TPrinter; AScalePens: Boolean = false);
+  end;
+
+implementation
+
+uses
+  Forms, Math, TADrawUtils;
+
+{ TPrinterDrawer }
+
+constructor TPrinterDrawer.Create(APrinter: TPrinter;
+  AScalePens: Boolean = false);
+var
+  f: Double;
+  si: TScaleItems;
+begin
+  FPrinter := APrinter;
+  f := Max(FPrinter.XDPI, FPrinter.YDPI) / Screen.PixelsPerInch;
+  if AScalePens then si := [scalePen] else si := [];
+  inherited Create(FPrinter.Canvas, f, si);
+end;
+
+end.
+
diff --git a/components/tachart/tachartwmf.lpk b/components/tachart/wmf/tachartwmf.lpk
similarity index 100%
rename from components/tachart/tachartwmf.lpk
rename to components/tachart/wmf/tachartwmf.lpk
diff --git a/components/tachart/tachartwmf.pas b/components/tachart/wmf/tachartwmf.pas
similarity index 100%
rename from components/tachart/tachartwmf.pas
rename to components/tachart/wmf/tachartwmf.pas
diff --git a/components/tachart/tadrawerwmf.pas b/components/tachart/wmf/tadrawerwmf.pas
similarity index 100%
rename from components/tachart/tadrawerwmf.pas
rename to components/tachart/wmf/tadrawerwmf.pas