more work on pdf fonts, more to come

experimental/PdfViewer/generate_code.py

 
 
 import sys
 
 import datatypes
 from autogen.pdfspec_autogen import *
 
 knowTypes = {
 '(any)': ['SkPdfObject*', 'ObjectFromDictionary', datatypes.CppNull(), 'true'],
 '(undefined)': ['SkPdfObject*', 'ObjectFromDictionary', datatypes.CppNull(), 'true'],
@@ skipping 44 matching lines @@
     self.fEnumValues = enumValues
     return self
 
   def name(self, name):
     self.fCppName = name
     return self
     
   def type(self, types):
     # TODO (edisonn): if simple type, use it, otherwise set it to Dictionary, and set a mask for valid types, like array or name
     types = types.strip()
-    types = types.replace('or', ' ')
+    types = types.replace(' or ', ' ')
+    types = types.replace(' or,', ' ')
+    types = types.replace(',or ', ' ')
+    types = types.replace(',or,', ' ')
     types = types.replace(',', ' ')
     types = types.replace('text', ' ') # TODO(edisonn): what is the difference between 'text string' and 'string'?
     types = types.replace('file specification', 'file_specification')
     
     
     self.fTypes = types
     return self
 
   def comment(self, comment):
     self.fComment = comment
@@ skipping 541 matching lines @@
   
   fileHeaders.write('#endif  // __DEFINED__SkPdfHeaders\n')
   fileHeaders.close()
   fileHeadersCpp.close()
   
   return 1
 
 if '__main__' == __name__:
   sys.exit(generateCode())