more work on pdf fonts, more to come

experimental/PdfViewer/autogen/pdfspec_autogen.py

 import datatypes
 
 def buildPdfSpec(pdfspec):
   pdfspec.addClass('StreamCommonDictionary', 'Dictionary', 'Entries common to all stream dictionaries')\
       .required('NULL')\
           .field('Length')\
           .name('Length')\
           .type('integer')\
           .comment('(Required) The number of bytes from the beginning of the line fol-\nlowing the keyword stream to the last byte just before the keyword\nendstream. (There may be an additional EOL marker, preceding\nendstream, that is not included in the count and is not logically part\nof the stream data.) See "Stream Extent," above, for further discus-\nsion.')\
           .done().done()\
@@ skipping 1754 matching lines @@
           .done().done()\
       .optional()\
           .field('Widths')\
           .name('Widths')\
           .type('array')\
           .comment('(Required except for the standard 14 fonts; indirect reference preferred) An array\nof (LastChar - FirstChar + 1) widths, each element being the glyph width for\nthe character whose code is FirstChar plus the array index. For character\ncodes outside the range FirstChar to LastChar, the value of MissingWidth from\nthe FontDescriptor entry for this font is used. The glyph widths are measured\nin units in which 1000 units corresponds to 1 unit in text space. These widths\nmust be consistent with the actual widths given in the font program itself.\n(See implementation note 43 in Appendix H.) For more information on\nglyph widths and other glyph metrics, see Section 5.1.3, "Glyph Positioning\nand Metrics."')\
           .done().done()\
       .optional()\
           .field('FontDescriptor')\
           .name('FontDescriptor')\
-          .type('dictionary')\
+          .type('FontDescriptorDictionary')\
           .comment('(Required except for the standard 14 fonts; must be an indirect reference) A font\ndescriptor describing the font\'s metrics other than its glyph widths (see Sec-\ntion 5.7, "Font Descriptors").\n   Note: For the standard 14 fonts, the entries FirstChar, LastChar, Widths, and\n   FontDescriptor must either all be present or all absent. Ordinarily, they are ab-\n   sent; specifying them enables a standard font to be overridden (see "Standard\n   Type 1 Fonts," below).')\
           .done().done()\
       .optional()\
           .field('Encoding')\
           .name('Encoding')\
           .type('name or dictionary')\
           .comment('(Optional) A specification of the font\'s character encoding, if different from\nits built-in encoding. The value of Encoding may be either the name of a pre-\ndefined encoding (MacRomanEncoding, MacExpertEncoding, or WinAnsi-\nEncoding, as described in Appendix D) or an encoding dictionary that\nspecifies differences from the font\'s built-in encoding or from a specified pre-\ndefined encoding (see Section 5.5.5, "Character Encoding").')\
           .done().done()\
       .optional()\
           .field('ToUnicode')\
@@ skipping 114 matching lines @@
           .comment('(Required) A string that uniquely names the character collection within the speci-\nfied registry-for example, Japan1.')\
           .done().done()\
       .required('NULL')\
           .field('Supplement')\
           .name('Supplement')\
           .type('integer')\
           .comment('(Required) The supplement number of the character collection. An original charac-\nter collection has a supplement number of 0. Whenever additional CIDs are\nassigned in a character collection, the supplement number is increased. Supple-\nments do not alter the ordering of existing CIDs in the character collection. This\nvalue is not used in determining compatibility between character collections.')\
           .done().done()\
       .done()
 
-  pdfspec.addClass('CIDFontDictionary', 'FontDictionary', 'Entries in a CIDFont dictionary')\
+  pdfspec.addClass('CIDFontDictionary', 'Dictionary', 'Entries in a CIDFont dictionary')\
       .required('NULL')\
           .field('Type')\
           .name('Type')\
           .type('name')\
           .comment('(Required) The type of PDF object that this dictionary describes; must be\nFont for a CIDFont dictionary.')\
           .done().done()\
       .required('NULL')\
           .field('Subtype')\
           .name('Subtype')\
           .type('name')\
           .comment('(Required) The type of CIDFont; CIDFontType0 or CIDFontType2.')\
           .must([datatypes.PdfName('CIDFontType0'), datatypes.PdfName('CIDFontType2')])\
           .done().done()\
       .required('NULL')\
           .field('BaseFont')\
           .name('BaseFont')\
           .type('name')\
           .comment('(Required) The PostScript name of the CIDFont. For Type 0 CIDFonts, this\nis usually the value of the CIDFontName entry in the CIDFont program. For\nType 2 CIDFonts, it is derived the same way as for a simple TrueType font;\nsee Section 5.5.2, "TrueType Fonts." In either case, the name can have a sub-\nset prefix if appropriate; see Section 5.5.3, "Font Subsets."')\
           .done().done()\
       .required('NULL')\
           .field('CIDSystemInfo')\
           .name('CIDSystemInfo')\
           .type('dictionary')\
           .comment('(Required) A dictionary containing entries that define the character collec-\ntion of the CIDFont. See Table 5.12 on page 337.')\
           .done().done()\
       .optional()\
           .field('FontDescriptor')\
           .name('FontDescriptor')\
-          .type('dictionary')\
+          .type('FontDescriptorDictionary')\
           .comment('(Required; must be an indirect reference) A font descriptor describing the\nCIDFont\'s default metrics other than its glyph widths (see Section 5.7,\n"Font Descriptors").')\
           .done().done()\
       .optional()\
           .field('DW')\
           .name('DW')\
           .type('integer')\
           .comment('(Optional) The default width for glyphs in the CIDFont (see "Glyph Met-\nrics in CIDFonts" on page 340). Default value: 1000.')\
           .done().done()\
       .optional()\
           .field('W')\
@@ skipping 3621 matching lines @@
   knowTypes['FreeTextAnnotationDictionary'] = ['SkPdfFreeTextAnnotationDictionary*', 'FreeTextAnnotationDictionaryFromDictionary', datatypes.CppNull(), 'ret->podofo()->GetDataType() == ePdfDataType_Dictionary']
   knowTypes['ALinkAnnotationDictionary'] = ['SkPdfALinkAnnotationDictionary*', 'ALinkAnnotationDictionaryFromDictionary', datatypes.CppNull(), 'ret->podofo()->GetDataType() == ePdfDataType_Dictionary']
   knowTypes['TextAnnotationDictionary'] = ['SkPdfTextAnnotationDictionary*', 'TextAnnotationDictionaryFromDictionary', datatypes.CppNull(), 'ret->podofo()->GetDataType() == ePdfDataType_Dictionary']
   knowTypes['WebCapturePageSetDictionary'] = ['SkPdfWebCapturePageSetDictionary*', 'WebCapturePageSetDictionaryFromDictionary', datatypes.CppNull(), 'ret->podofo()->GetDataType() == ePdfDataType_Dictionary']
   knowTypes['AppearanceDictionary'] = ['SkPdfAppearanceDictionary*', 'AppearanceDictionaryFromDictionary', datatypes.CppNull(), 'ret->podofo()->GetDataType() == ePdfDataType_Dictionary']
   knowTypes['CIDFontDescriptorDictionary'] = ['SkPdfCIDFontDescriptorDictionary*', 'CIDFontDescriptorDictionaryFromDictionary', datatypes.CppNull(), 'ret->podofo()->GetDataType() == ePdfDataType_Dictionary']
   knowTypes['EmbeddedFontStreamDictionary'] = ['SkPdfEmbeddedFontStreamDictionary*', 'EmbeddedFontStreamDictionaryFromDictionary', datatypes.CppNull(), 'ret->podofo()->GetDataType() == ePdfDataType_Dictionary']
   knowTypes['AnnotationDictionary'] = ['SkPdfAnnotationDictionary*', 'AnnotationDictionaryFromDictionary', datatypes.CppNull(), 'ret->podofo()->GetDataType() == ePdfDataType_Dictionary']