Move files

 # Changelog
 
+## 3.7.0
+
+- Move files
+
 ## 3.6.6
 
 - Fix imports for Dart 2.15

@@ -14,30 +14,30 @@
  * limitations under the License.
  */
 
-export 'src/pdf/annotation.dart';
-export 'src/pdf/border.dart';
 export 'src/pdf/color.dart';
 export 'src/pdf/colors.dart';
 export 'src/pdf/document.dart';
 export 'src/pdf/document_parser.dart';
-export 'src/pdf/encryption.dart';
 export 'src/pdf/exif.dart';
-export 'src/pdf/font.dart';
-export 'src/pdf/font_metrics.dart';
-export 'src/pdf/function.dart';
+export 'src/pdf/font/font_metrics.dart';
+export 'src/pdf/font/ttf_parser.dart';
 export 'src/pdf/graphic_state.dart';
 export 'src/pdf/graphics.dart';
-export 'src/pdf/image.dart';
-export 'src/pdf/info.dart';
-export 'src/pdf/metadata.dart';
-export 'src/pdf/outline.dart';
-export 'src/pdf/page.dart';
+export 'src/pdf/obj/annotation.dart';
+export 'src/pdf/obj/border.dart';
+export 'src/pdf/obj/encryption.dart';
+export 'src/pdf/obj/font.dart';
+export 'src/pdf/obj/function.dart';
+export 'src/pdf/obj/image.dart';
+export 'src/pdf/obj/info.dart';
+export 'src/pdf/obj/metadata.dart';
+export 'src/pdf/obj/outline.dart';
+export 'src/pdf/obj/page.dart';
+export 'src/pdf/obj/pattern.dart';
+export 'src/pdf/obj/shading.dart';
+export 'src/pdf/obj/signature.dart';
+export 'src/pdf/obj/smask.dart';
+export 'src/pdf/obj/ttffont.dart';
 export 'src/pdf/page_format.dart';
-export 'src/pdf/pattern.dart';
 export 'src/pdf/point.dart';
 export 'src/pdf/rect.dart';
-export 'src/pdf/shading.dart';
-export 'src/pdf/signature.dart';
-export 'src/pdf/smask.dart';
-export 'src/pdf/ttf_parser.dart';
-export 'src/pdf/ttffont.dart';

@@ -22,7 +22,7 @@ import 'package:meta/meta.dart';
 
 import 'ascii85.dart';
 import 'color.dart';
-import 'object.dart';
+import 'obj/object.dart';
 import 'stream.dart';
 
 abstract class PdfDataType {

@@ -19,20 +19,20 @@ import 'dart:typed_data';
 
 import 'package:crypto/crypto.dart';
 
-import 'catalog.dart';
 import 'document_parser.dart';
-import 'encryption.dart';
-import 'font.dart';
 import 'graphic_state.dart';
-import 'info.dart';
 import 'io/vm.dart' if (dart.library.js) 'io/js.dart';
-import 'names.dart';
-import 'object.dart';
-import 'outline.dart';
+import 'obj/catalog.dart';
+import 'obj/encryption.dart';
+import 'obj/font.dart';
+import 'obj/info.dart';
+import 'obj/names.dart';
+import 'obj/object.dart';
+import 'obj/outline.dart';
+import 'obj/page.dart';
+import 'obj/page_list.dart';
+import 'obj/signature.dart';
 import 'output.dart';
-import 'page.dart';
-import 'page_list.dart';
-import 'signature.dart';
 import 'stream.dart';
 
 /// PDF version to generate

@@ -17,7 +17,7 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'image.dart';
+import 'obj/image.dart';
 
 /// Jpeg metadata extraction
 class PdfJpegInfo {

@@ -18,7 +18,7 @@ import 'dart:math' as math;
 
 import 'package:meta/meta.dart';
 
-import 'rect.dart';
+import '../rect.dart';
 
 /// Describe dimensions for glyphs in a font
 @immutable

@@ -20,9 +20,9 @@ import 'package:meta/meta.dart';
 
 import 'data_types.dart';
 import 'document.dart';
-import 'function.dart';
-import 'object_dict.dart';
-import 'smask.dart';
+import 'obj/function.dart';
+import 'obj/object_dict.dart';
+import 'obj/smask.dart';
 
 enum PdfBlendMode {
   /// Selects the source colour, ignoring the backdrop

@@ -23,14 +23,14 @@ import 'package:vector_math/vector_math_64.dart';
 
 import 'color.dart';
 import 'data_types.dart';
-import 'font.dart';
 import 'graphic_state.dart';
-import 'graphic_stream.dart';
-import 'image.dart';
-import 'page.dart';
-import 'pattern.dart';
+import 'obj/font.dart';
+import 'obj/graphic_stream.dart';
+import 'obj/image.dart';
+import 'obj/page.dart';
+import 'obj/pattern.dart';
+import 'obj/shading.dart';
 import 'rect.dart';
-import 'shading.dart';
 import 'stream.dart';
 
 /// Shape to be used at the corners of paths that are stroked

@@ -17,19 +17,19 @@
 import 'package:meta/meta.dart';
 import 'package:vector_math/vector_math_64.dart';
 
+import '../color.dart';
+import '../data_types.dart';
+import '../document.dart';
+import '../graphics.dart';
+import '../point.dart';
+import '../rect.dart';
+import '../stream.dart';
 import 'border.dart';
-import 'color.dart';
-import 'data_types.dart';
-import 'document.dart';
 import 'font.dart';
 import 'graphic_stream.dart';
-import 'graphics.dart';
 import 'object.dart';
 import 'object_dict.dart';
 import 'page.dart';
-import 'point.dart';
-import 'rect.dart';
-import 'stream.dart';
 
 class PdfAnnot extends PdfObjectDict {
   PdfAnnot(this.pdfPage, this.annot)

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import 'data_types.dart';
-import 'document.dart';
+import '../data_types.dart';
+import '../document.dart';
 import 'object.dart';
 
 /// An array object

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+import '../data_types.dart';
+import '../document.dart';
 import 'annotation.dart';
-import 'data_types.dart';
-import 'document.dart';
 import 'object_dict.dart';
 
 /// Border style

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+import '../data_types.dart';
+import '../document.dart';
 import 'annotation.dart';
-import 'data_types.dart';
-import 'document.dart';
 import 'metadata.dart';
 import 'names.dart';
 import 'object_dict.dart';

@@ -16,7 +16,7 @@
 
 import 'dart:typed_data';
 
-import 'document.dart';
+import '../document.dart';
 import 'object.dart';
 import 'object_dict.dart';
 

@@ -16,14 +16,14 @@
 
 import 'dart:convert';
 
-import 'data_types.dart';
-import 'document.dart';
-import 'font_metrics.dart';
+import '../data_types.dart';
+import '../document.dart';
+import '../font/font_metrics.dart';
+import '../font/type1_fonts.dart';
+import '../point.dart';
+import '../stream.dart';
 import 'object_dict.dart';
-import 'point.dart';
-import 'stream.dart';
 import 'type1_font.dart';
-import 'type1_fonts.dart';
 
 /// Pdf font object
 abstract class PdfFont extends PdfObjectDict {

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import 'data_types.dart';
+import '../data_types.dart';
 import 'object_dict.dart';
 import 'object_stream.dart';
 import 'ttffont.dart';

@@ -16,8 +16,8 @@
 
 import 'package:vector_math/vector_math_64.dart';
 
-import 'data_types.dart';
-import 'document.dart';
+import '../data_types.dart';
+import '../document.dart';
 import 'font.dart';
 import 'xobject.dart';
 

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import 'color.dart';
-import 'data_types.dart';
-import 'document.dart';
+import '../color.dart';
+import '../data_types.dart';
+import '../document.dart';
 import 'object_dict.dart';
 import 'object_stream.dart';
 

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import 'data_types.dart';
-import 'document.dart';
+import '../data_types.dart';
+import '../document.dart';
+import '../graphic_state.dart';
 import 'font.dart';
-import 'graphic_state.dart';
 import 'object_dict.dart';
 import 'pattern.dart';
 import 'shading.dart';

@@ -18,9 +18,9 @@ import 'dart:typed_data';
 
 import 'package:image/image.dart' as im;
 
-import 'data_types.dart';
-import 'document.dart';
-import 'exif.dart';
+import '../data_types.dart';
+import '../document.dart';
+import '../exif.dart';
 import 'xobject.dart';
 
 /// Represents the position of the first pixel in the data stream

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import 'data_types.dart';
-import 'document.dart';
+import '../data_types.dart';
+import '../document.dart';
 import 'object_dict.dart';
 
 /// Information object

@@ -19,8 +19,8 @@ import 'dart:typed_data';
 
 import 'package:xml/xml.dart';
 
-import 'data_types.dart';
-import 'document.dart';
+import '../data_types.dart';
+import '../document.dart';
 import 'object.dart';
 
 /// Pdf Metadata

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import 'data_types.dart';
-import 'document.dart';
+import '../data_types.dart';
+import '../document.dart';
 import 'object_dict.dart';
 import 'page.dart';
 

@@ -16,9 +16,9 @@
 
 import 'package:meta/meta.dart';
 
-import 'data_types.dart';
-import 'document.dart';
-import 'stream.dart';
+import '../data_types.dart';
+import '../document.dart';
+import '../stream.dart';
 
 /// Base Object used in the PDF file
 abstract class PdfObject<T extends PdfDataType> {

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import 'data_types.dart';
-import 'document.dart';
+import '../data_types.dart';
+import '../document.dart';
+import '../stream.dart';
 import 'object.dart';
-import 'stream.dart';
 
 /// Object with a PdfDict used in the PDF file
 class PdfObjectDict extends PdfObject<PdfDict> {

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import 'data_types.dart';
-import 'document.dart';
+import '../data_types.dart';
+import '../document.dart';
+import '../stream.dart';
 import 'object_dict.dart';
-import 'stream.dart';
 
 /// Stream Object
 class PdfObjectStream extends PdfObjectDict {

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import 'color.dart';
-import 'data_types.dart';
-import 'document.dart';
+import '../color.dart';
+import '../data_types.dart';
+import '../document.dart';
+import '../rect.dart';
 import 'object_dict.dart';
 import 'page.dart';
-import 'rect.dart';
 
 /// Outline mode
 enum PdfOutlineMode {

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
+import '../data_types.dart';
+import '../document.dart';
+import '../graphics.dart';
+import '../page_format.dart';
 import 'annotation.dart';
-import 'data_types.dart';
-import 'document.dart';
 import 'graphic_stream.dart';
-import 'graphics.dart';
 import 'object_dict.dart';
 import 'object_stream.dart';
-import 'page_format.dart';
 
 /// Page rotation
 enum PdfPageRotation {

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import 'data_types.dart';
-import 'document.dart';
+import '../data_types.dart';
+import '../document.dart';
 import 'object_dict.dart';
 import 'page.dart';
 

@@ -16,9 +16,9 @@
 
 import 'package:vector_math/vector_math_64.dart';
 
-import 'data_types.dart';
-import 'document.dart';
-import 'graphic_state.dart';
+import '../data_types.dart';
+import '../document.dart';
+import '../graphic_state.dart';
 import 'object_dict.dart';
 import 'shading.dart';
 

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import 'data_types.dart';
-import 'document.dart';
+import '../data_types.dart';
+import '../document.dart';
+import '../point.dart';
+import '../rect.dart';
 import 'function.dart';
 import 'object_dict.dart';
-import 'point.dart';
-import 'rect.dart';
 
 enum PdfShadingType { axial, radial }
 

@@ -16,12 +16,12 @@
 
 import 'dart:typed_data';
 
-import 'data_types.dart';
-import 'document.dart';
+import '../data_types.dart';
+import '../document.dart';
+import '../stream.dart';
 import 'object.dart';
 import 'object_dict.dart';
 import 'object_stream.dart';
-import 'stream.dart';
 
 /// Signature flags
 enum PdfSigFlags {

@@ -16,12 +16,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-import 'data_types.dart';
-import 'document.dart';
+import '../data_types.dart';
+import '../document.dart';
+import '../graphics.dart';
+import '../rect.dart';
 import 'function.dart';
 import 'graphic_stream.dart';
-import 'graphics.dart';
-import 'rect.dart';
 
 class PdfSoftMask {
   PdfSoftMask(this.document,

@@ -17,17 +17,17 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'arabic.dart' as arabic;
+import '../data_types.dart';
+import '../document.dart';
+import '../font/arabic.dart' as arabic;
+import '../font/font_metrics.dart';
+import '../font/ttf_parser.dart';
+import '../font/ttf_writer.dart';
+import '../stream.dart';
 import 'array.dart';
-import 'data_types.dart';
-import 'document.dart';
 import 'font.dart';
 import 'font_descriptor.dart';
-import 'font_metrics.dart';
 import 'object_stream.dart';
-import 'stream.dart';
-import 'ttf_parser.dart';
-import 'ttf_writer.dart';
 import 'unicode_cmap.dart';
 
 class PdfTtfFont extends PdfFont {

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import 'data_types.dart';
-import 'document.dart';
+import '../data_types.dart';
+import '../document.dart';
+import '../font/font_metrics.dart';
 import 'font.dart';
-import 'font_metrics.dart';
 import 'ttffont.dart';
 
 /// Type 1 font object.

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import 'document.dart';
+import '../document.dart';
 import 'object_stream.dart';
 
 /// Unicode character map object

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import 'data_types.dart';
-import 'document.dart';
+import '../data_types.dart';
+import '../document.dart';
 import 'object_stream.dart';
 
 class PdfXObject extends PdfObjectStream {

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-import 'catalog.dart';
 import 'data_types.dart';
 import 'document.dart';
-import 'encryption.dart';
-import 'info.dart';
-import 'object.dart';
-import 'signature.dart';
+import 'obj/catalog.dart';
+import 'obj/encryption.dart';
+import 'obj/info.dart';
+import 'obj/object.dart';
+import 'obj/signature.dart';
 import 'stream.dart';
 import 'xref.dart';
 

@@ -17,7 +17,7 @@
 import 'dart:typed_data';
 
 import 'data_types.dart';
-import 'object.dart';
+import 'obj/object.dart';
 import 'stream.dart';
 
 enum PdfCrossRefEntryType { free, inUse }

@@ -18,7 +18,7 @@ import 'dart:math' as math;
 
 import 'package:meta/meta.dart';
 import 'package:pdf/pdf.dart';
-import 'package:pdf/src/pdf/arabic.dart' as arabic;
+import 'package:pdf/src/pdf/font/arabic.dart' as arabic;
 
 import 'annotations.dart';
 import 'document.dart';

@@ -3,7 +3,7 @@ description: A pdf producer for Dart. It can create pdf files for both web or fl
 homepage: https://github.com/DavBfr/dart_pdf/tree/master/pdf
 repository: https://github.com/DavBfr/dart_pdf
 issue_tracker: https://github.com/DavBfr/dart_pdf/issues
-version: 3.6.6
+version: 3.7.0
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

@@ -16,7 +16,7 @@
 
 import 'dart:io';
 
-import 'package:pdf/src/pdf/arabic.dart' as arabic;
+import 'package:pdf/src/pdf/font/arabic.dart' as arabic;
 import 'package:pdf/widgets.dart';
 import 'package:test/test.dart';
 

@@ -17,7 +17,7 @@
 import 'dart:io';
 
 import 'package:pdf/pdf.dart';
-import 'package:pdf/src/pdf/ttf_writer.dart';
+import 'package:pdf/src/pdf/font/ttf_writer.dart';
 import 'package:test/test.dart';
 
 void printText(