David PHAM-VAN

Move files

Showing 46 changed files with 137 additions and 133 deletions
1 # Changelog 1 # Changelog
2 2
  3 +## 3.7.0
  4 +
  5 +- Move files
  6 +
3 ## 3.6.6 7 ## 3.6.6
4 8
5 - Fix imports for Dart 2.15 9 - Fix imports for Dart 2.15
@@ -14,30 +14,30 @@ @@ -14,30 +14,30 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -export 'src/pdf/annotation.dart';  
18 -export 'src/pdf/border.dart';  
19 export 'src/pdf/color.dart'; 17 export 'src/pdf/color.dart';
20 export 'src/pdf/colors.dart'; 18 export 'src/pdf/colors.dart';
21 export 'src/pdf/document.dart'; 19 export 'src/pdf/document.dart';
22 export 'src/pdf/document_parser.dart'; 20 export 'src/pdf/document_parser.dart';
23 -export 'src/pdf/encryption.dart';  
24 export 'src/pdf/exif.dart'; 21 export 'src/pdf/exif.dart';
25 -export 'src/pdf/font.dart';  
26 -export 'src/pdf/font_metrics.dart';  
27 -export 'src/pdf/function.dart'; 22 +export 'src/pdf/font/font_metrics.dart';
  23 +export 'src/pdf/font/ttf_parser.dart';
28 export 'src/pdf/graphic_state.dart'; 24 export 'src/pdf/graphic_state.dart';
29 export 'src/pdf/graphics.dart'; 25 export 'src/pdf/graphics.dart';
30 -export 'src/pdf/image.dart';  
31 -export 'src/pdf/info.dart';  
32 -export 'src/pdf/metadata.dart';  
33 -export 'src/pdf/outline.dart';  
34 -export 'src/pdf/page.dart'; 26 +export 'src/pdf/obj/annotation.dart';
  27 +export 'src/pdf/obj/border.dart';
  28 +export 'src/pdf/obj/encryption.dart';
  29 +export 'src/pdf/obj/font.dart';
  30 +export 'src/pdf/obj/function.dart';
  31 +export 'src/pdf/obj/image.dart';
  32 +export 'src/pdf/obj/info.dart';
  33 +export 'src/pdf/obj/metadata.dart';
  34 +export 'src/pdf/obj/outline.dart';
  35 +export 'src/pdf/obj/page.dart';
  36 +export 'src/pdf/obj/pattern.dart';
  37 +export 'src/pdf/obj/shading.dart';
  38 +export 'src/pdf/obj/signature.dart';
  39 +export 'src/pdf/obj/smask.dart';
  40 +export 'src/pdf/obj/ttffont.dart';
35 export 'src/pdf/page_format.dart'; 41 export 'src/pdf/page_format.dart';
36 -export 'src/pdf/pattern.dart';  
37 export 'src/pdf/point.dart'; 42 export 'src/pdf/point.dart';
38 export 'src/pdf/rect.dart'; 43 export 'src/pdf/rect.dart';
39 -export 'src/pdf/shading.dart';  
40 -export 'src/pdf/signature.dart';  
41 -export 'src/pdf/smask.dart';  
42 -export 'src/pdf/ttf_parser.dart';  
43 -export 'src/pdf/ttffont.dart';  
@@ -22,7 +22,7 @@ import 'package:meta/meta.dart'; @@ -22,7 +22,7 @@ import 'package:meta/meta.dart';
22 22
23 import 'ascii85.dart'; 23 import 'ascii85.dart';
24 import 'color.dart'; 24 import 'color.dart';
25 -import 'object.dart'; 25 +import 'obj/object.dart';
26 import 'stream.dart'; 26 import 'stream.dart';
27 27
28 abstract class PdfDataType { 28 abstract class PdfDataType {
@@ -19,20 +19,20 @@ import 'dart:typed_data'; @@ -19,20 +19,20 @@ import 'dart:typed_data';
19 19
20 import 'package:crypto/crypto.dart'; 20 import 'package:crypto/crypto.dart';
21 21
22 -import 'catalog.dart';  
23 import 'document_parser.dart'; 22 import 'document_parser.dart';
24 -import 'encryption.dart';  
25 -import 'font.dart';  
26 import 'graphic_state.dart'; 23 import 'graphic_state.dart';
27 -import 'info.dart';  
28 import 'io/vm.dart' if (dart.library.js) 'io/js.dart'; 24 import 'io/vm.dart' if (dart.library.js) 'io/js.dart';
29 -import 'names.dart';  
30 -import 'object.dart';  
31 -import 'outline.dart'; 25 +import 'obj/catalog.dart';
  26 +import 'obj/encryption.dart';
  27 +import 'obj/font.dart';
  28 +import 'obj/info.dart';
  29 +import 'obj/names.dart';
  30 +import 'obj/object.dart';
  31 +import 'obj/outline.dart';
  32 +import 'obj/page.dart';
  33 +import 'obj/page_list.dart';
  34 +import 'obj/signature.dart';
32 import 'output.dart'; 35 import 'output.dart';
33 -import 'page.dart';  
34 -import 'page_list.dart';  
35 -import 'signature.dart';  
36 import 'stream.dart'; 36 import 'stream.dart';
37 37
38 /// PDF version to generate 38 /// PDF version to generate
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 import 'dart:convert'; 17 import 'dart:convert';
18 import 'dart:typed_data'; 18 import 'dart:typed_data';
19 19
20 -import 'image.dart'; 20 +import 'obj/image.dart';
21 21
22 /// Jpeg metadata extraction 22 /// Jpeg metadata extraction
23 class PdfJpegInfo { 23 class PdfJpegInfo {
@@ -18,7 +18,7 @@ import 'dart:math' as math; @@ -18,7 +18,7 @@ import 'dart:math' as math;
18 18
19 import 'package:meta/meta.dart'; 19 import 'package:meta/meta.dart';
20 20
21 -import 'rect.dart'; 21 +import '../rect.dart';
22 22
23 /// Describe dimensions for glyphs in a font 23 /// Describe dimensions for glyphs in a font
24 @immutable 24 @immutable
@@ -20,9 +20,9 @@ import 'package:meta/meta.dart'; @@ -20,9 +20,9 @@ import 'package:meta/meta.dart';
20 20
21 import 'data_types.dart'; 21 import 'data_types.dart';
22 import 'document.dart'; 22 import 'document.dart';
23 -import 'function.dart';  
24 -import 'object_dict.dart';  
25 -import 'smask.dart'; 23 +import 'obj/function.dart';
  24 +import 'obj/object_dict.dart';
  25 +import 'obj/smask.dart';
26 26
27 enum PdfBlendMode { 27 enum PdfBlendMode {
28 /// Selects the source colour, ignoring the backdrop 28 /// Selects the source colour, ignoring the backdrop
@@ -23,14 +23,14 @@ import 'package:vector_math/vector_math_64.dart'; @@ -23,14 +23,14 @@ import 'package:vector_math/vector_math_64.dart';
23 23
24 import 'color.dart'; 24 import 'color.dart';
25 import 'data_types.dart'; 25 import 'data_types.dart';
26 -import 'font.dart';  
27 import 'graphic_state.dart'; 26 import 'graphic_state.dart';
28 -import 'graphic_stream.dart';  
29 -import 'image.dart';  
30 -import 'page.dart';  
31 -import 'pattern.dart'; 27 +import 'obj/font.dart';
  28 +import 'obj/graphic_stream.dart';
  29 +import 'obj/image.dart';
  30 +import 'obj/page.dart';
  31 +import 'obj/pattern.dart';
  32 +import 'obj/shading.dart';
32 import 'rect.dart'; 33 import 'rect.dart';
33 -import 'shading.dart';  
34 import 'stream.dart'; 34 import 'stream.dart';
35 35
36 /// Shape to be used at the corners of paths that are stroked 36 /// Shape to be used at the corners of paths that are stroked
@@ -17,19 +17,19 @@ @@ -17,19 +17,19 @@
17 import 'package:meta/meta.dart'; 17 import 'package:meta/meta.dart';
18 import 'package:vector_math/vector_math_64.dart'; 18 import 'package:vector_math/vector_math_64.dart';
19 19
  20 +import '../color.dart';
  21 +import '../data_types.dart';
  22 +import '../document.dart';
  23 +import '../graphics.dart';
  24 +import '../point.dart';
  25 +import '../rect.dart';
  26 +import '../stream.dart';
20 import 'border.dart'; 27 import 'border.dart';
21 -import 'color.dart';  
22 -import 'data_types.dart';  
23 -import 'document.dart';  
24 import 'font.dart'; 28 import 'font.dart';
25 import 'graphic_stream.dart'; 29 import 'graphic_stream.dart';
26 -import 'graphics.dart';  
27 import 'object.dart'; 30 import 'object.dart';
28 import 'object_dict.dart'; 31 import 'object_dict.dart';
29 import 'page.dart'; 32 import 'page.dart';
30 -import 'point.dart';  
31 -import 'rect.dart';  
32 -import 'stream.dart';  
33 33
34 class PdfAnnot extends PdfObjectDict { 34 class PdfAnnot extends PdfObjectDict {
35 PdfAnnot(this.pdfPage, this.annot) 35 PdfAnnot(this.pdfPage, this.annot)
@@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -import 'data_types.dart';  
18 -import 'document.dart'; 17 +import '../data_types.dart';
  18 +import '../document.dart';
19 import 'object.dart'; 19 import 'object.dart';
20 20
21 /// An array object 21 /// An array object
@@ -14,9 +14,9 @@ @@ -14,9 +14,9 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
  17 +import '../data_types.dart';
  18 +import '../document.dart';
17 import 'annotation.dart'; 19 import 'annotation.dart';
18 -import 'data_types.dart';  
19 -import 'document.dart';  
20 import 'object_dict.dart'; 20 import 'object_dict.dart';
21 21
22 /// Border style 22 /// Border style
@@ -14,9 +14,9 @@ @@ -14,9 +14,9 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
  17 +import '../data_types.dart';
  18 +import '../document.dart';
17 import 'annotation.dart'; 19 import 'annotation.dart';
18 -import 'data_types.dart';  
19 -import 'document.dart';  
20 import 'metadata.dart'; 20 import 'metadata.dart';
21 import 'names.dart'; 21 import 'names.dart';
22 import 'object_dict.dart'; 22 import 'object_dict.dart';
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 16
17 import 'dart:typed_data'; 17 import 'dart:typed_data';
18 18
19 -import 'document.dart'; 19 +import '../document.dart';
20 import 'object.dart'; 20 import 'object.dart';
21 import 'object_dict.dart'; 21 import 'object_dict.dart';
22 22
@@ -16,14 +16,14 @@ @@ -16,14 +16,14 @@
16 16
17 import 'dart:convert'; 17 import 'dart:convert';
18 18
19 -import 'data_types.dart';  
20 -import 'document.dart';  
21 -import 'font_metrics.dart'; 19 +import '../data_types.dart';
  20 +import '../document.dart';
  21 +import '../font/font_metrics.dart';
  22 +import '../font/type1_fonts.dart';
  23 +import '../point.dart';
  24 +import '../stream.dart';
22 import 'object_dict.dart'; 25 import 'object_dict.dart';
23 -import 'point.dart';  
24 -import 'stream.dart';  
25 import 'type1_font.dart'; 26 import 'type1_font.dart';
26 -import 'type1_fonts.dart';  
27 27
28 /// Pdf font object 28 /// Pdf font object
29 abstract class PdfFont extends PdfObjectDict { 29 abstract class PdfFont extends PdfObjectDict {
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -import 'data_types.dart'; 17 +import '../data_types.dart';
18 import 'object_dict.dart'; 18 import 'object_dict.dart';
19 import 'object_stream.dart'; 19 import 'object_stream.dart';
20 import 'ttffont.dart'; 20 import 'ttffont.dart';
@@ -16,8 +16,8 @@ @@ -16,8 +16,8 @@
16 16
17 import 'package:vector_math/vector_math_64.dart'; 17 import 'package:vector_math/vector_math_64.dart';
18 18
19 -import 'data_types.dart';  
20 -import 'document.dart'; 19 +import '../data_types.dart';
  20 +import '../document.dart';
21 import 'font.dart'; 21 import 'font.dart';
22 import 'xobject.dart'; 22 import 'xobject.dart';
23 23
@@ -14,9 +14,9 @@ @@ -14,9 +14,9 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -import 'color.dart';  
18 -import 'data_types.dart';  
19 -import 'document.dart'; 17 +import '../color.dart';
  18 +import '../data_types.dart';
  19 +import '../document.dart';
20 import 'object_dict.dart'; 20 import 'object_dict.dart';
21 import 'object_stream.dart'; 21 import 'object_stream.dart';
22 22
@@ -14,10 +14,10 @@ @@ -14,10 +14,10 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -import 'data_types.dart';  
18 -import 'document.dart'; 17 +import '../data_types.dart';
  18 +import '../document.dart';
  19 +import '../graphic_state.dart';
19 import 'font.dart'; 20 import 'font.dart';
20 -import 'graphic_state.dart';  
21 import 'object_dict.dart'; 21 import 'object_dict.dart';
22 import 'pattern.dart'; 22 import 'pattern.dart';
23 import 'shading.dart'; 23 import 'shading.dart';
@@ -18,9 +18,9 @@ import 'dart:typed_data'; @@ -18,9 +18,9 @@ import 'dart:typed_data';
18 18
19 import 'package:image/image.dart' as im; 19 import 'package:image/image.dart' as im;
20 20
21 -import 'data_types.dart';  
22 -import 'document.dart';  
23 -import 'exif.dart'; 21 +import '../data_types.dart';
  22 +import '../document.dart';
  23 +import '../exif.dart';
24 import 'xobject.dart'; 24 import 'xobject.dart';
25 25
26 /// Represents the position of the first pixel in the data stream 26 /// Represents the position of the first pixel in the data stream
@@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -import 'data_types.dart';  
18 -import 'document.dart'; 17 +import '../data_types.dart';
  18 +import '../document.dart';
19 import 'object_dict.dart'; 19 import 'object_dict.dart';
20 20
21 /// Information object 21 /// Information object
@@ -19,8 +19,8 @@ import 'dart:typed_data'; @@ -19,8 +19,8 @@ import 'dart:typed_data';
19 19
20 import 'package:xml/xml.dart'; 20 import 'package:xml/xml.dart';
21 21
22 -import 'data_types.dart';  
23 -import 'document.dart'; 22 +import '../data_types.dart';
  23 +import '../document.dart';
24 import 'object.dart'; 24 import 'object.dart';
25 25
26 /// Pdf Metadata 26 /// Pdf Metadata
@@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -import 'data_types.dart';  
18 -import 'document.dart'; 17 +import '../data_types.dart';
  18 +import '../document.dart';
19 import 'object_dict.dart'; 19 import 'object_dict.dart';
20 import 'page.dart'; 20 import 'page.dart';
21 21
@@ -16,9 +16,9 @@ @@ -16,9 +16,9 @@
16 16
17 import 'package:meta/meta.dart'; 17 import 'package:meta/meta.dart';
18 18
19 -import 'data_types.dart';  
20 -import 'document.dart';  
21 -import 'stream.dart'; 19 +import '../data_types.dart';
  20 +import '../document.dart';
  21 +import '../stream.dart';
22 22
23 /// Base Object used in the PDF file 23 /// Base Object used in the PDF file
24 abstract class PdfObject<T extends PdfDataType> { 24 abstract class PdfObject<T extends PdfDataType> {
@@ -14,10 +14,10 @@ @@ -14,10 +14,10 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -import 'data_types.dart';  
18 -import 'document.dart'; 17 +import '../data_types.dart';
  18 +import '../document.dart';
  19 +import '../stream.dart';
19 import 'object.dart'; 20 import 'object.dart';
20 -import 'stream.dart';  
21 21
22 /// Object with a PdfDict used in the PDF file 22 /// Object with a PdfDict used in the PDF file
23 class PdfObjectDict extends PdfObject<PdfDict> { 23 class PdfObjectDict extends PdfObject<PdfDict> {
@@ -14,10 +14,10 @@ @@ -14,10 +14,10 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -import 'data_types.dart';  
18 -import 'document.dart'; 17 +import '../data_types.dart';
  18 +import '../document.dart';
  19 +import '../stream.dart';
19 import 'object_dict.dart'; 20 import 'object_dict.dart';
20 -import 'stream.dart';  
21 21
22 /// Stream Object 22 /// Stream Object
23 class PdfObjectStream extends PdfObjectDict { 23 class PdfObjectStream extends PdfObjectDict {
@@ -14,12 +14,12 @@ @@ -14,12 +14,12 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -import 'color.dart';  
18 -import 'data_types.dart';  
19 -import 'document.dart'; 17 +import '../color.dart';
  18 +import '../data_types.dart';
  19 +import '../document.dart';
  20 +import '../rect.dart';
20 import 'object_dict.dart'; 21 import 'object_dict.dart';
21 import 'page.dart'; 22 import 'page.dart';
22 -import 'rect.dart';  
23 23
24 /// Outline mode 24 /// Outline mode
25 enum PdfOutlineMode { 25 enum PdfOutlineMode {
@@ -14,14 +14,14 @@ @@ -14,14 +14,14 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
  17 +import '../data_types.dart';
  18 +import '../document.dart';
  19 +import '../graphics.dart';
  20 +import '../page_format.dart';
17 import 'annotation.dart'; 21 import 'annotation.dart';
18 -import 'data_types.dart';  
19 -import 'document.dart';  
20 import 'graphic_stream.dart'; 22 import 'graphic_stream.dart';
21 -import 'graphics.dart';  
22 import 'object_dict.dart'; 23 import 'object_dict.dart';
23 import 'object_stream.dart'; 24 import 'object_stream.dart';
24 -import 'page_format.dart';  
25 25
26 /// Page rotation 26 /// Page rotation
27 enum PdfPageRotation { 27 enum PdfPageRotation {
@@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -import 'data_types.dart';  
18 -import 'document.dart'; 17 +import '../data_types.dart';
  18 +import '../document.dart';
19 import 'object_dict.dart'; 19 import 'object_dict.dart';
20 import 'page.dart'; 20 import 'page.dart';
21 21
@@ -16,9 +16,9 @@ @@ -16,9 +16,9 @@
16 16
17 import 'package:vector_math/vector_math_64.dart'; 17 import 'package:vector_math/vector_math_64.dart';
18 18
19 -import 'data_types.dart';  
20 -import 'document.dart';  
21 -import 'graphic_state.dart'; 19 +import '../data_types.dart';
  20 +import '../document.dart';
  21 +import '../graphic_state.dart';
22 import 'object_dict.dart'; 22 import 'object_dict.dart';
23 import 'shading.dart'; 23 import 'shading.dart';
24 24
@@ -14,12 +14,12 @@ @@ -14,12 +14,12 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -import 'data_types.dart';  
18 -import 'document.dart'; 17 +import '../data_types.dart';
  18 +import '../document.dart';
  19 +import '../point.dart';
  20 +import '../rect.dart';
19 import 'function.dart'; 21 import 'function.dart';
20 import 'object_dict.dart'; 22 import 'object_dict.dart';
21 -import 'point.dart';  
22 -import 'rect.dart';  
23 23
24 enum PdfShadingType { axial, radial } 24 enum PdfShadingType { axial, radial }
25 25
@@ -16,12 +16,12 @@ @@ -16,12 +16,12 @@
16 16
17 import 'dart:typed_data'; 17 import 'dart:typed_data';
18 18
19 -import 'data_types.dart';  
20 -import 'document.dart'; 19 +import '../data_types.dart';
  20 +import '../document.dart';
  21 +import '../stream.dart';
21 import 'object.dart'; 22 import 'object.dart';
22 import 'object_dict.dart'; 23 import 'object_dict.dart';
23 import 'object_stream.dart'; 24 import 'object_stream.dart';
24 -import 'stream.dart';  
25 25
26 /// Signature flags 26 /// Signature flags
27 enum PdfSigFlags { 27 enum PdfSigFlags {
@@ -16,12 +16,12 @@ @@ -16,12 +16,12 @@
16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17 */ 17 */
18 18
19 -import 'data_types.dart';  
20 -import 'document.dart'; 19 +import '../data_types.dart';
  20 +import '../document.dart';
  21 +import '../graphics.dart';
  22 +import '../rect.dart';
21 import 'function.dart'; 23 import 'function.dart';
22 import 'graphic_stream.dart'; 24 import 'graphic_stream.dart';
23 -import 'graphics.dart';  
24 -import 'rect.dart';  
25 25
26 class PdfSoftMask { 26 class PdfSoftMask {
27 PdfSoftMask(this.document, 27 PdfSoftMask(this.document,
@@ -17,17 +17,17 @@ @@ -17,17 +17,17 @@
17 import 'dart:convert'; 17 import 'dart:convert';
18 import 'dart:typed_data'; 18 import 'dart:typed_data';
19 19
20 -import 'arabic.dart' as arabic; 20 +import '../data_types.dart';
  21 +import '../document.dart';
  22 +import '../font/arabic.dart' as arabic;
  23 +import '../font/font_metrics.dart';
  24 +import '../font/ttf_parser.dart';
  25 +import '../font/ttf_writer.dart';
  26 +import '../stream.dart';
21 import 'array.dart'; 27 import 'array.dart';
22 -import 'data_types.dart';  
23 -import 'document.dart';  
24 import 'font.dart'; 28 import 'font.dart';
25 import 'font_descriptor.dart'; 29 import 'font_descriptor.dart';
26 -import 'font_metrics.dart';  
27 import 'object_stream.dart'; 30 import 'object_stream.dart';
28 -import 'stream.dart';  
29 -import 'ttf_parser.dart';  
30 -import 'ttf_writer.dart';  
31 import 'unicode_cmap.dart'; 31 import 'unicode_cmap.dart';
32 32
33 class PdfTtfFont extends PdfFont { 33 class PdfTtfFont extends PdfFont {
@@ -14,10 +14,10 @@ @@ -14,10 +14,10 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -import 'data_types.dart';  
18 -import 'document.dart'; 17 +import '../data_types.dart';
  18 +import '../document.dart';
  19 +import '../font/font_metrics.dart';
19 import 'font.dart'; 20 import 'font.dart';
20 -import 'font_metrics.dart';  
21 import 'ttffont.dart'; 21 import 'ttffont.dart';
22 22
23 /// Type 1 font object. 23 /// Type 1 font object.
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -import 'document.dart'; 17 +import '../document.dart';
18 import 'object_stream.dart'; 18 import 'object_stream.dart';
19 19
20 /// Unicode character map object 20 /// Unicode character map object
@@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -import 'data_types.dart';  
18 -import 'document.dart'; 17 +import '../data_types.dart';
  18 +import '../document.dart';
19 import 'object_stream.dart'; 19 import 'object_stream.dart';
20 20
21 class PdfXObject extends PdfObjectStream { 21 class PdfXObject extends PdfObjectStream {
@@ -14,13 +14,13 @@ @@ -14,13 +14,13 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -import 'catalog.dart';  
18 import 'data_types.dart'; 17 import 'data_types.dart';
19 import 'document.dart'; 18 import 'document.dart';
20 -import 'encryption.dart';  
21 -import 'info.dart';  
22 -import 'object.dart';  
23 -import 'signature.dart'; 19 +import 'obj/catalog.dart';
  20 +import 'obj/encryption.dart';
  21 +import 'obj/info.dart';
  22 +import 'obj/object.dart';
  23 +import 'obj/signature.dart';
24 import 'stream.dart'; 24 import 'stream.dart';
25 import 'xref.dart'; 25 import 'xref.dart';
26 26
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 import 'dart:typed_data'; 17 import 'dart:typed_data';
18 18
19 import 'data_types.dart'; 19 import 'data_types.dart';
20 -import 'object.dart'; 20 +import 'obj/object.dart';
21 import 'stream.dart'; 21 import 'stream.dart';
22 22
23 enum PdfCrossRefEntryType { free, inUse } 23 enum PdfCrossRefEntryType { free, inUse }
@@ -18,7 +18,7 @@ import 'dart:math' as math; @@ -18,7 +18,7 @@ import 'dart:math' as math;
18 18
19 import 'package:meta/meta.dart'; 19 import 'package:meta/meta.dart';
20 import 'package:pdf/pdf.dart'; 20 import 'package:pdf/pdf.dart';
21 -import 'package:pdf/src/pdf/arabic.dart' as arabic; 21 +import 'package:pdf/src/pdf/font/arabic.dart' as arabic;
22 22
23 import 'annotations.dart'; 23 import 'annotations.dart';
24 import 'document.dart'; 24 import 'document.dart';
@@ -3,7 +3,7 @@ description: A pdf producer for Dart. It can create pdf files for both web or fl @@ -3,7 +3,7 @@ description: A pdf producer for Dart. It can create pdf files for both web or fl
3 homepage: https://github.com/DavBfr/dart_pdf/tree/master/pdf 3 homepage: https://github.com/DavBfr/dart_pdf/tree/master/pdf
4 repository: https://github.com/DavBfr/dart_pdf 4 repository: https://github.com/DavBfr/dart_pdf
5 issue_tracker: https://github.com/DavBfr/dart_pdf/issues 5 issue_tracker: https://github.com/DavBfr/dart_pdf/issues
6 -version: 3.6.6 6 +version: 3.7.0
7 7
8 environment: 8 environment:
9 sdk: ">=2.12.0 <3.0.0" 9 sdk: ">=2.12.0 <3.0.0"
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 16
17 import 'dart:io'; 17 import 'dart:io';
18 18
19 -import 'package:pdf/src/pdf/arabic.dart' as arabic; 19 +import 'package:pdf/src/pdf/font/arabic.dart' as arabic;
20 import 'package:pdf/widgets.dart'; 20 import 'package:pdf/widgets.dart';
21 import 'package:test/test.dart'; 21 import 'package:test/test.dart';
22 22
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 import 'dart:io'; 17 import 'dart:io';
18 18
19 import 'package:pdf/pdf.dart'; 19 import 'package:pdf/pdf.dart';
20 -import 'package:pdf/src/pdf/ttf_writer.dart'; 20 +import 'package:pdf/src/pdf/font/ttf_writer.dart';
21 import 'package:test/test.dart'; 21 import 'package:test/test.dart';
22 22
23 void printText( 23 void printText(