Ignore:
Timestamp:
2021-02-26T19:39:51+13:00 (3 years ago)
Author:
anupama
Message:

Committing the improvements to EmbeddedMetaPlugin's processing of Keywords vs other metadata fields. Keywords were literally stored as arrays of words rather than phrases in PDFs (at least in Diego's sample PDF), whereas other meta fields like Subjects and Creators stored them as arrays of phrases. To get both to work, Kathy updated EXIF to a newer version, to retrieve the actual EXIF values stored in the PDF. And Kathy and Dr Bainbridge came up with a new option that I added called apply_join_before_split_to_metafields that's a regex which can list the metadata fields to apply the join_before_split to and whcih previously always got applied to all metadata fields. Now it's applied to any *Keywords metafields by default, as that's the metafield we have experience of that behaves differently to the others, as it stores by word instead of phrases. Tested on Diego's sample PDF. Diego has double-checked it to works on his sample PDF too, setting the split char to ; and turning on the join_before_split and leaving apply_join_before_split_to_metafields at its default of .*Keywords. File changes are strings.properties for the tooltip, the plugin introducing the option and working with it and Kathy's EXIF updates affecting cpan/File and cpan/Image.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/perllib/cpan/Image/ExifTool/Lang/en_ca.pm

    r24107 r34921  
    1212use vars qw($VERSION);
    1313
    14 $VERSION = '1.06';
     14$VERSION = '1.12';
    1515
    1616%Image::ExifTool::Lang::en_ca::Translate = (
     17   'AboveColor' => 'Above Colour',
     18   'AdvancedFilter' => {
     19      PrintConv => {
     20        'Partial Color Blue' => 'Partial Colour Blue',
     21        'Partial Color Green' => 'Partial Colour Green',
     22        'Partial Color Orange' => 'Partial Colour Orange',
     23        'Partial Color Purple' => 'Partial Colour Purple',
     24        'Partial Color Red' => 'Partial Colour Red',
     25        'Partial Color Yellow' => 'Partial Colour Yellow',
     26        'Pop Color' => 'Pop Colour',
     27      },
     28    },
     29   'AdvancedSceneMode' => {
     30      PrintConv => {
     31        'Color Select' => 'Colour Select',
     32      },
     33    },
     34   'AllColorFlatField1' => 'All Colour Flat Field 1',
     35   'AllColorFlatField2' => 'All Colour Flat Field 2',
     36   'AllColorFlatField3' => 'All Colour Flat Field 3',
     37   'Alpha' => {
     38      PrintConv => {
     39        'Alpha Exists (W color component)' => 'Alpha Exists (W colour component)',
     40        'Alpha Exists (color not premultiplied)' => 'Alpha Exists (colour not premultiplied)',
     41        'Alpha Exists (color premultiplied)' => 'Alpha Exists (colour premultiplied)',
     42      },
     43    },
    1744   'AlternateDuotoneColors' => 'Alternate Duotone Colours',
    1845   'AlternateSpotColors' => 'Alternate Spot Colours',
    … …  
    2047      PrintConv => {
    2148        'Pale & Light Color' => 'Pale & Light Colour',
    22       },
    23     },
     49        'Pale & Light Color II' => 'Pale & Light Colour II',
     50        'Partial Color' => 'Partial Colour',
     51        'Partial Color II' => 'Partial Colour II',
     52        'Partial Color III' => 'Partial Colour III',
     53        'Watercolor' => 'Watercolour',
     54        'Watercolor I' => 'Watercolour I',
     55        'Watercolor II' => 'Watercolour II',
     56      },
     57    },
     58   'ArtFilterEffect' => {
     59      PrintConv => {
     60        'Green Color Filter' => 'Green Colour Filter',
     61        'No Color Filter' => 'No Colour Filter',
     62        'Orange Color Filter' => 'Orange Colour Filter',
     63        'Pale & Light Color' => 'Pale & Light Colour',
     64        'Pale & Light Color II' => 'Pale & Light Colour II',
     65        'Partial Color' => 'Partial Colour',
     66        'Partial Color II' => 'Partial Colour II',
     67        'Partial Color III' => 'Partial Colour III',
     68        'Red Color Filter' => 'Red Colour Filter',
     69        'Watercolor' => 'Watercolour',
     70        'Watercolor I' => 'Watercolour I',
     71        'Watercolor II' => 'Watercolour II',
     72        'Yellow Color Filter' => 'Yellow Colour Filter',
     73      },
     74    },
     75   'AutoAFPointColorTracking' => 'Auto AF Point Colour Tracking',
    2476   'BackgroundColor' => 'Background Colour',
    2577   'BackgroundColorIndicator' => {
    … …  
    3284   'BackgroundColorValue' => 'Background Colour Value',
    3385   'BasicColorImageSequence' => 'Basic Colour Image Sequence',
     86   'BelowColor' => 'Below Colour',
     87   'BestShotMode' => {
     88      PrintConv => {
     89        'Water Color' => 'Water Colour',
     90      },
     91    },
    3492   'BkColor' => 'Background Colour',
    3593   'BluePaletteColorTableData' => 'Blue Palette Colour Table Data',
    … …  
    52110   'CameraColorCalibration14' => 'Camera Colour Calibration 14',
    53111   'CameraColorCalibration15' => 'Camera Colour Calibration 15',
     112   'CameraRawColorTone' => 'Camera Raw Colour Tone',
    54113   'CanonColorInfo1' => 'Canon Colour Info 1',
    55114   'CanonColorInfo2' => 'Canon Colour Info 2',
    56115   'ChromaticityColorant' => 'Chromaticity Colourant',
    57    'Color' => 'Colour',
     116   'CodingMethods' => {
     117      PrintConv => {
     118        'JBIG color' => 'JBIG colour',
     119      },
     120    },
     121   'Color' => {
     122      Description => 'Colour',
     123      PrintConv => {
     124        'Color' => 'Colour',
     125      },
     126    },
    58127   'ColorAberrationControl' => 'Colour Aberration Control',
    59128   'ColorAdjustment' => 'Colour Adjustment',
    … …  
    67136   'ColorBalanceRed' => 'Colour Balance Red',
    68137   'ColorBalanceUnknown' => 'Colour Balance Unknown',
     138   'ColorBalanceVersion' => 'Colour Balance Version',
    69139   'ColorBitDepth' => 'Colour Bit Depth',
    70140   'ColorBlur' => 'Colour Blur',
     141   'ColorBlurOn' => 'Colour Blur On',
    71142   'ColorBoostLevel' => 'Colour Boost Level',
    72143   'ColorBoostType' => 'Colour Boost Type',
    … …  
    77148   'ColorClass' => 'Colour Class',
    78149   'ColorCompensationFilter' => 'Colour Compensation Filter',
     150   'ColorCompensationFilterCustom' => 'Colour Compensation Filter Custom',
     151   'ColorCompensationFilterSet' => 'Colour Compensation Filter Set',
    79152   'ColorComponents' => 'Colour Components',
    80153   'ColorControl' => 'Colour Control',
    81154   'ColorCorrection' => 'Colour Correction',
     155   'ColorCreatorEffect' => 'Colour Creator Effect',
    82156   'ColorDataVersion' => 'Colour Data Version',
     157   'ColorDescriptor' => 'Colour Descriptor',
    83158   'ColorEffect' => 'Colour Effect',
     159   'ColorFieldCode' => 'Colour Field Code',
    84160   'ColorFilter' => 'Colour Filter',
    85161   'ColorGain' => 'Colour Gain',
    … …  
    88164   'ColorHue' => 'Colour Hue',
    89165   'ColorImagePrintingFlag' => 'Colour Image Printing Flag',
     166   'ColorLabel' => 'Colour Label',
    90167   'ColorMap' => 'Colour Map',
    91168   'ColorMatrix' => 'Colour Matrix',
    … …  
    93170   'ColorMatrix2' => 'Colour Matrix 2',
    94171   'ColorMatrixA' => 'Colour Matrix A',
     172   'ColorMatrixAdobeRGB' => 'Colour Matrix Adobe RGB',
    95173   'ColorMatrixB' => 'Colour Matrix B',
    96174   'ColorMatrixNumber' => 'Colour Matrix Number',
     175   'ColorMatrixSRGB' => 'Colour Matrix sRGB',
    97176   'ColorMode' => {
    98177      Description => 'Colour Mode',
    99178      PrintConv => {
     179        'Indexed Color' => 'Indexed Colour',
    100180        'Natural color' => 'Natural colour',
    101181        'Neutral Color' => 'Neutral Colour',
     182        'RGB Color' => 'RGB Colour',
    102183        'Saturated Color' => 'Saturated Colour',
    103184        'Vivid color' => 'Vivid colour',
    … …  
    107188   'ColorMoireReductionMode' => 'Colour Moire Reduction Mode',
    108189   'ColorNoiseReduction' => 'Colour Noise Reduction',
     190   'ColorNoiseReductionDetail' => 'Colour Noise Reduction Detail',
    109191   'ColorNoiseReductionIntensity' => 'Colour Noise Reduction Intensity',
    110192   'ColorNoiseReductionSharpness' => 'Colour Noise Reduction Sharpness',
     193   'ColorNoiseReductionSmoothness' => 'Colour Noise Reduction Smoothness',
    111194   'ColorObjBackType' => 'Colour Obj Back Type',
    112195   'ColorObjName' => 'Colour Obj Name',
    … …  
    115198   'ColorPalette' => 'Colour Palette',
    116199   'ColorPlanes' => 'Colour Planes',
     200   'ColorPrimaries' => 'Colour Primaries',
    117201   'ColorProfile' => 'Colour Profile',
     202   'ColorProfileSettings' => 'Colour Profile Settings',
     203   'ColorRangeLevels' => 'Colour Range Levels',
    118204   'ColorRepresentation' => 'Colour Representation',
    119205   'ColorReproduction' => 'Colour Reproduction',
    … …  
    121207   'ColorResponseUnit' => 'Colour Response Unit',
    122208   'ColorSamplersResource' => 'Colour Samplers Resource',
     209   'ColorSamplersResource2' => 'Colour Samplers Resource 2',
     210   'ColorSaturationAdj' => 'Colour Saturation Adj',
    123211   'ColorSequence' => 'Colour Sequence',
     212   'ColorSiting' => 'Colour Siting',
    124213   'ColorSpace' => {
    125214      Description => 'Colour Space',
    126215      PrintConv => {
     216        'Embedded Color Profile' => 'Embedded Colour Profile',
     217        'Linked Color Profile' => 'Linked Colour Profile',
    127218        'No color space specified' => 'No colour space specified',
     219        'Windows Color Space' => 'Windows Colour Space',
    128220      },
    129221    },
    130222   'ColorSpaceData' => 'Colour Space Data',
     223   'ColorSpecApproximation' => 'Colour Spec Approximation',
     224   'ColorSpecData' => 'Colour Spec Data',
     225   'ColorSpecMethod' => {
     226      Description => 'Colour Spec Method',
     227      PrintConv => {
     228        'Vendor Color' => 'Vendor Colour',
     229      },
     230    },
     231   'ColorSpecPrecedence' => 'Colour Spec Precedence',
    131232   'ColorSpecification' => 'Colour Specification',
    132233   'ColorTable' => 'Colour Table',
    … …  
    141242   'ColorTempFlashData' => 'Colour Temp Flash Data',
    142243   'ColorTempFluorescent' => 'Colour Temp Fluorescent',
     244   'ColorTempFluorescentD' => 'Colour Temp Fluorescent D',
     245   'ColorTempFluorescentN' => 'Colour Temp Fluorescent N',
     246   'ColorTempFluorescentW' => 'Colour Temp Fluorescent W',
    143247   'ColorTempKelvin' => 'Colour Temp Kelvin',
    144248   'ColorTempMeasured' => 'Colour Temp Measured',
    … …  
    156260   'ColorTempUnknown15' => 'Colour Temp Unknown 15',
    157261   'ColorTempUnknown16' => 'Colour Temp Unknown 16',
     262   'ColorTempUnknown17' => 'Colour Temp Unknown 17',
     263   'ColorTempUnknown18' => 'Colour Temp Unknown 18',
     264   'ColorTempUnknown19' => 'Colour Temp Unknown 19',
    158265   'ColorTempUnknown2' => 'Colour Temp Unknown 2',
     266   'ColorTempUnknown20' => 'Colour Temp Unknown 20',
     267   'ColorTempUnknown21' => 'Colour Temp Unknown 21',
     268   'ColorTempUnknown22' => 'Colour Temp Unknown 22',
     269   'ColorTempUnknown23' => 'Colour Temp Unknown 23',
     270   'ColorTempUnknown24' => 'Colour Temp Unknown 24',
     271   'ColorTempUnknown25' => 'Colour Temp Unknown 25',
     272   'ColorTempUnknown26' => 'Colour Temp Unknown 26',
     273   'ColorTempUnknown27' => 'Colour Temp Unknown 27',
     274   'ColorTempUnknown28' => 'Colour Temp Unknown 28',
     275   'ColorTempUnknown29' => 'Colour Temp Unknown 29',
    159276   'ColorTempUnknown3' => 'Colour Temp Unknown 3',
     277   'ColorTempUnknown30' => 'Colour Temp Unknown 30',
    160278   'ColorTempUnknown4' => 'Colour Temp Unknown 4',
    161279   'ColorTempUnknown5' => 'Colour Temp Unknown 5',
    … …  
    166284   'ColorTemperature' => 'Colour Temperature',
    167285   'ColorTemperatureAdj' => 'Colour Temperature Adj',
     286   'ColorTemperatureAuto' => 'Colour Temperature Auto',
    168287   'ColorTemperatureBG' => 'Colour Temperature BG',
     288   'ColorTemperatureCustom' => 'Colour Temperature Custom',
    169289   'ColorTemperatureRG' => 'Colour Temperature RG',
     290   'ColorTemperatureSet' => 'Colour Temperature Set',
    170291   'ColorTemperatureSetting' => {
    171292      Description => 'Colour Temperature Setting',
    … …  
    176297   'ColorTone' => 'Colour Tone',
    177298   'ColorToneAdj' => 'Colour Tone Adj',
     299   'ColorToneAuto' => 'Colour Tone Auto',
    178300   'ColorToneFaithful' => 'Colour Tone Faithful',
    179301   'ColorToneLandscape' => 'Colour Tone Landscape',
     302   'ColorToneMonochrome' => 'Colour Tone Monochrome',
    180303   'ColorToneNeutral' => 'Colour Tone Neutral',
    181304   'ColorTonePortrait' => 'Colour Tone Portrait',
    … …  
    206329   'ColorantCount' => 'Colourant Count',
    207330   'ColorantCyan' => 'Colourant Cyan',
     331   'ColorantGray' => 'Colourant Gray',
    208332   'ColorantGreen' => 'Colourant Green',
    209333   'ColorantL' => 'Colourant L',
    … …  
    214338   'ColorantSwatchName' => 'Colourant Swatch Name',
    215339   'ColorantTableOut' => 'Colourant Table Out',
     340   'ColorantTint' => 'Colourant Tint',
    216341   'ColorantType' => 'Colourant Type',
    217342   'ColorantYellow' => 'Colourant Yellow',
     343   'Colorants' => 'Colourants',
     344   'ColorimetricIntentImageState' => 'Colourimetric Intent Image State',
    218345   'ColorimetricReference' => 'Colourimetric Reference',
     346   'Colorimetry' => 'Colourimetry',
     347   'ColorimetryCode' => 'Colourimetry Code',
    219348   'Colors' => 'Colours',
    220    'Colorspace' => 'Colourspace',
    221349   'Compression' => {
    222350      PrintConv => {
    … …  
    236364      },
    237365    },
     366   'CustomColorTone' => 'Custom Colour Tone',
    238367   'D-LightingHQColorBoost' => 'D-Lighting HQ Colour Boost',
    239368   'D-LightingHSColorBoost' => 'D-Lighting HS Colour Boost',
    … …  
    246375      },
    247376    },
     377   'DigitalFilter01' => {
     378      PrintConv => {
     379        'Color Filter' => 'Colour Filter',
     380        'Extract Color' => 'Extract Colour',
     381        'Invert Color' => 'Invert Colour',
     382        'Replace Color' => 'Replace Colour',
     383        'Unicolor Bold' => 'Unicolour Bold',
     384        'Water Color' => 'Water Colour',
     385      },
     386    },
     387   'DigitalFilter02' => {
     388      PrintConv => {
     389        'Color Filter' => 'Colour Filter',
     390        'Extract Color' => 'Extract Colour',
     391        'Invert Color' => 'Invert Colour',
     392        'Water Color' => 'Water Colour',
     393      },
     394    },
     395   'DigitalFilter03' => {
     396      PrintConv => {
     397        'Color Filter' => 'Colour Filter',
     398        'Extract Color' => 'Extract Colour',
     399        'Invert Color' => 'Invert Colour',
     400        'Water Color' => 'Water Colour',
     401      },
     402    },
     403   'DigitalFilter04' => {
     404      PrintConv => {
     405        'Color Filter' => 'Colour Filter',
     406        'Extract Color' => 'Extract Colour',
     407        'Invert Color' => 'Invert Colour',
     408        'Water Color' => 'Water Colour',
     409      },
     410    },
     411   'DigitalFilter05' => {
     412      PrintConv => {
     413        'Color Filter' => 'Colour Filter',
     414        'Extract Color' => 'Extract Colour',
     415        'Invert Color' => 'Invert Colour',
     416        'Water Color' => 'Water Colour',
     417      },
     418    },
     419   'DigitalFilter06' => {
     420      PrintConv => {
     421        'Color Filter' => 'Colour Filter',
     422        'Extract Color' => 'Extract Colour',
     423        'Invert Color' => 'Invert Colour',
     424        'Water Color' => 'Water Colour',
     425      },
     426    },
     427   'DigitalFilter07' => {
     428      PrintConv => {
     429        'Color Filter' => 'Colour Filter',
     430        'Extract Color' => 'Extract Colour',
     431        'Invert Color' => 'Invert Colour',
     432        'Water Color' => 'Water Colour',
     433      },
     434    },
     435   'DigitalFilter08' => {
     436      PrintConv => {
     437        'Color Filter' => 'Colour Filter',
     438        'Extract Color' => 'Extract Colour',
     439        'Invert Color' => 'Invert Colour',
     440        'Water Color' => 'Water Colour',
     441      },
     442    },
     443   'DigitalFilter09' => {
     444      PrintConv => {
     445        'Color Filter' => 'Colour Filter',
     446        'Extract Color' => 'Extract Colour',
     447        'Invert Color' => 'Invert Colour',
     448        'Water Color' => 'Water Colour',
     449      },
     450    },
     451   'DigitalFilter10' => {
     452      PrintConv => {
     453        'Color Filter' => 'Colour Filter',
     454        'Extract Color' => 'Extract Colour',
     455        'Invert Color' => 'Invert Colour',
     456        'Water Color' => 'Water Colour',
     457      },
     458    },
     459   'DigitalFilter11' => {
     460      PrintConv => {
     461        'Color Filter' => 'Colour Filter',
     462        'Extract Color' => 'Extract Colour',
     463        'Invert Color' => 'Invert Colour',
     464        'Water Color' => 'Water Colour',
     465      },
     466    },
     467   'DigitalFilter12' => {
     468      PrintConv => {
     469        'Color Filter' => 'Colour Filter',
     470        'Extract Color' => 'Extract Colour',
     471        'Invert Color' => 'Invert Colour',
     472        'Water Color' => 'Water Colour',
     473      },
     474    },
     475   'DigitalFilter13' => {
     476      PrintConv => {
     477        'Color Filter' => 'Colour Filter',
     478        'Extract Color' => 'Extract Colour',
     479        'Invert Color' => 'Invert Colour',
     480        'Water Color' => 'Water Colour',
     481      },
     482    },
     483   'DigitalFilter14' => {
     484      PrintConv => {
     485        'Color Filter' => 'Colour Filter',
     486        'Extract Color' => 'Extract Colour',
     487        'Invert Color' => 'Invert Colour',
     488        'Water Color' => 'Water Colour',
     489      },
     490    },
     491   'DigitalFilter15' => {
     492      PrintConv => {
     493        'Color Filter' => 'Colour Filter',
     494        'Extract Color' => 'Extract Colour',
     495        'Invert Color' => 'Invert Colour',
     496        'Water Color' => 'Water Colour',
     497      },
     498    },
     499   'DigitalFilter16' => {
     500      PrintConv => {
     501        'Color Filter' => 'Colour Filter',
     502        'Extract Color' => 'Extract Colour',
     503        'Invert Color' => 'Invert Colour',
     504        'Water Color' => 'Water Colour',
     505      },
     506    },
     507   'DigitalFilter17' => {
     508      PrintConv => {
     509        'Color Filter' => 'Colour Filter',
     510        'Extract Color' => 'Extract Colour',
     511        'Invert Color' => 'Invert Colour',
     512        'Water Color' => 'Water Colour',
     513      },
     514    },
     515   'DigitalFilter18' => {
     516      PrintConv => {
     517        'Color Filter' => 'Colour Filter',
     518        'Extract Color' => 'Extract Colour',
     519        'Invert Color' => 'Invert Colour',
     520        'Water Color' => 'Water Colour',
     521      },
     522    },
     523   'DigitalFilter19' => {
     524      PrintConv => {
     525        'Color Filter' => 'Colour Filter',
     526        'Extract Color' => 'Extract Colour',
     527        'Invert Color' => 'Invert Colour',
     528        'Water Color' => 'Water Colour',
     529      },
     530    },
     531   'DigitalFilter20' => {
     532      PrintConv => {
     533        'Color Filter' => 'Colour Filter',
     534        'Extract Color' => 'Extract Colour',
     535        'Invert Color' => 'Invert Colour',
     536        'Water Color' => 'Water Colour',
     537      },
     538    },
    248539   'DisplayUnits' => {
    249540      PrintConv => {
    … …  
    258549      },
    259550    },
     551   'EmbeddedImageColorSpace' => 'Embedded Image Colour Space',
     552   'ExposureProgram' => {
     553      PrintConv => {
     554        'Partial Color Blue' => 'Partial Colour Blue',
     555        'Partial Color Green' => 'Partial Colour Green',
     556        'Partial Color Red' => 'Partial Colour Red',
     557        'Partial Color Yellow' => 'Partial Colour Yellow',
     558        'Pop Color' => 'Pop Colour',
     559      },
     560    },
    260561   'FaithfulRawColorTone' => 'Faithful Raw Colour Tone',
    261562   'FaxProfile' => {
    … …  
    266567    },
    267568   'FgColor' => 'Foreground Colour',
     569   'FilmColorProcess' => 'Film Colour Process',
    268570   'FilmMode' => {
    269571      PrintConv => {
    … …  
    274576      },
    275577    },
     578   'FlagColor' => 'Flag Colour',
    276579   'FlashColorFilter' => 'Flash Colour Filter',
     580   'FocalPlaneColorimetryEstimates' => 'Focal Plane Colourimetry Estimates',
     581   'GammaColorTone' => 'Gamma Colour Tone',
    277582   'GenOpColor' => 'Gen Op Colour',
     583   'GenreID' => {
     584      PrintConv => {
     585        'Books|Kids|Basic Concepts|Colors' => 'Books|Kids|Basic Concepts|Colours',
     586      },
     587    },
    278588   'GreenPaletteColorTableData' => 'Green Palette Colour Table Data',
    279589   'GreenPaletteColorTableDescriptor' => 'Green Palette Colour Table Descriptor',
    … …  
    296606    },
    297607   'ImageColorValue' => 'Image Colour Value',
     608   'ImageMedium' => {
     609      PrintConv => {
     610        'Color hard copy' => 'Colour hard copy',
     611        'Color negative' => 'Colour negative',
     612        'Color reversal' => 'Colour reversal',
     613      },
     614    },
     615   'IndexedColorTableCount' => 'Indexed Colour Table Count',
    298616   'InterchangeColorSpace' => 'Interchange Colour Space',
     617   'Isotherm1Color' => 'Isotherm 1 Colour',
     618   'Isotherm2Color' => 'Isotherm 2 Colour',
    299619   'LandscapeRawColorTone' => 'Landscape Raw Colour Tone',
    300620   'LargeBluePaletteColorTableData' => 'Large Blue Palette Colour Table Data',
    … …  
    305625   'LargeRedPaletteColorTableData' => 'Large Red Palette Colour Table Data',
    306626   'LargeRedPaletteColorTableDescr' => 'Large Red Palette Colour Table Descr',
     627   'LayerBlendModes' => {
     628      PrintConv => {
     629        'Color' => 'Colour',
     630        'Color Burn' => 'Colour Burn',
     631        'Color Dodge' => 'Colour Dodge',
     632        'Darker Color' => 'Darker Colour',
     633        'Lighter Color' => 'Lighter Colour',
     634      },
     635    },
    307636   'MDColorTable' => 'MD Colour Table',
     637   'MDItemColorSpace' => 'MD Item Colour Space',
    308638   'MagicFilter' => {
    309639      PrintConv => {
    310640        'Pale & Light Color' => 'Pale & Light Colour',
     641        'Pale & Light Color II' => 'Pale & Light Colour II',
     642        'Partial Color' => 'Partial Colour',
     643        'Partial Color II' => 'Partial Colour II',
     644        'Partial Color III' => 'Partial Colour III',
     645        'Watercolor' => 'Watercolour',
     646        'Watercolor I' => 'Watercolour I',
     647        'Watercolor II' => 'Watercolour II',
    311648      },
    312649    },
    … …  
    320657    },
    321658   'MattColor' => 'Matt Colour',
     659   'MediaColor' => 'Media Colour',
    322660   'ModifiedColorTemp' => 'Modified Colour Temp',
     661   'MonochromeColor' => 'Monochrome Colour',
    323662   'MyColorMode' => {
    324663      Description => 'My Colour Mode',
    … …  
    335674   'NumImportantColors' => 'Num Important Colours',
    336675   'OpColor' => 'Op Colour',
     676   'OverflowColor' => 'Overflow Colour',
    337677   'PF25ColorMatrix' => 'PF25 Colour Matrix',
    338678   'PaletteColorTableUID' => 'Palette Colour Table UID',
     679   'PaletteColors' => 'Palette Colours',
    339680   'PhotoEffect' => {
    340681      PrintConv => {
    … …  
    348689    },
    349690   'Photoshop2ColorTable' => 'Photoshop 2 Colour Table',
     691   'PictureEffect' => {
     692      PrintConv => {
     693        'Partial Color (blue)' => 'Partial Colour (blue)',
     694        'Partial Color (green)' => 'Partial Colour (green)',
     695        'Partial Color (red)' => 'Partial Colour (red)',
     696        'Partial Color (yellow)' => 'Partial Colour (yellow)',
     697        'Pop Color' => 'Pop Colour',
     698        'Water Color' => 'Water Colour',
     699        'Water Color 2' => 'Water Colour 2',
     700      },
     701    },
     702   'PictureEffect2' => {
     703      PrintConv => {
     704        'Partial Color' => 'Partial Colour',
     705        'Pop Color' => 'Pop Colour',
     706        'Water Color' => 'Water Colour',
     707      },
     708    },
     709   'PictureIndexedColors' => 'Picture Indexed Colours',
     710   'PictureMode' => {
     711      PrintConv => {
     712        'Color Creator' => 'Colour Creator',
     713        'Color Profile 1' => 'Colour Profile 1',
     714        'Color Profile 2' => 'Colour Profile 2',
     715        'Color Profile 3' => 'Colour Profile 3',
     716      },
     717    },
    350718   'PictureType' => {
    351719      PrintConv => {
    … …  
    353721      },
    354722    },
     723   'PictureWizardColor' => 'Picture Wizard Colour',
    355724   'PortraitRawColorTone' => 'Portrait Raw Colour Tone',
    356725   'PresetWhiteBalance' => {
    … …  
    376745   'ROIDisplayColor' => 'ROI Display Colour',
    377746   'RawColorAdj' => 'Raw Colour Adj',
     747   'RawDevArtFilter' => {
     748      PrintConv => {
     749        'Pale & Light Color' => 'Pale & Light Colour',
     750        'Pale & Light Color II' => 'Pale & Light Colour II',
     751        'Partial Color' => 'Partial Colour',
     752        'Partial Color II' => 'Partial Colour II',
     753        'Partial Color III' => 'Partial Colour III',
     754        'Watercolor' => 'Watercolour',
     755        'Watercolor I' => 'Watercolour I',
     756        'Watercolor II' => 'Watercolour II',
     757      },
     758    },
    378759   'RawDevColorSpace' => 'Raw Dev Colour Space',
    379760   'RawDevMemoryColorEmphasis' => 'Raw Dev Memory Colour Emphasis',
    … …  
    391772   'RedPaletteColorTableData' => 'Red Palette Colour Table Data',
    392773   'RedPaletteColorTableDescriptor' => 'Red Palette Colour Table Descriptor',
     774   'ReflectionHardcopyOrigColorimetry' => 'Reflection Hardcopy Orig Colourimetry',
     775   'ReflectionPrintOutputColorimetry' => 'Reflection Print Output Colourimetry',
    393776   'RenderingIntent' => {
    394777      PrintConv => {
     778        'Absolute Colorimetric (LCS_GM_ABS_COLORIMETRIC)' => 'Absolute Colourimetric (LCS_GM_ABS_COLORIMETRIC)',
    395779        'ICC-Absolute Colorimetric' => 'ICC-Absolute Colourimetric',
    396780        'Media-Relative Colorimetric' => 'Media-Relative Colourimetric',
    … …  
    401785        'Color Custom' => 'Colour Custom',
    402786        'Color Outline' => 'Colour Outline',
     787        'Color Sketch' => 'Colour Sketch',
     788        'Selective Color' => 'Selective Colour',
    403789      },
    404790    },
    … …  
    410796      },
    411797    },
     798   'SceneBalanceAlgorithmCommand' => {
     799      PrintConv => {
     800        'Neutral SBA Off, Color SBA Off' => 'Neutral SBA Off, Colour SBA Off',
     801        'Neutral SBA Off, Color SBA On' => 'Neutral SBA Off, Colour SBA On',
     802        'Neutral SBA On, Color SBA Off' => 'Neutral SBA On, Colour SBA Off',
     803        'Neutral SBA On, Color SBA On' => 'Neutral SBA On, Colour SBA On',
     804      },
     805    },
     806   'SceneColorimetryEstimates' => 'Scene Colourimetry Estimates',
    412807   'SceneMode' => {
    413808      PrintConv => {
    … …  
    436831    },
    437832   'ShutterPresentationColorCIELabVal' => 'Shutter Presentation Colour CIE Lab Val',
     833   'SmartAlbumColor' => 'Smart Album Colour',
    438834   'SpecialEffectsOpticalFilter' => {
    439835      PrintConv => {
    … …  
    450846    },
    451847   'SubimageColor' => 'Subimage Colour',
     848   'SwatchColorantA' => 'Swatch Colourant A',
     849   'SwatchColorantB' => 'Swatch Colourant B',
     850   'SwatchColorantBlack' => 'Swatch Colourant Black',
     851   'SwatchColorantBlue' => 'Swatch Colourant Blue',
     852   'SwatchColorantCyan' => 'Swatch Colourant Cyan',
     853   'SwatchColorantGray' => 'Swatch Colourant Gray',
     854   'SwatchColorantGreen' => 'Swatch Colourant Green',
     855   'SwatchColorantL' => 'Swatch Colourant L',
     856   'SwatchColorantMagenta' => 'Swatch Colourant Magenta',
     857   'SwatchColorantMode' => 'Swatch Colourant Mode',
     858   'SwatchColorantRed' => 'Swatch Colourant Red',
     859   'SwatchColorantSwatchName' => 'Swatch Colourant Swatch Name',
     860   'SwatchColorantTint' => 'Swatch Colourant Tint',
     861   'SwatchColorantType' => 'Swatch Colourant Type',
     862   'SwatchColorantYellow' => 'Swatch Colourant Yellow',
     863   'SwatchGroupsColorants' => 'Swatch Groups Colourants',
    452864   'TestTarget' => {
    453865      PrintConv => {
    454866        'Color Chart' => 'Colour Chart',
     867      },
     868    },
     869   'TextColor' => 'Text Colour',
     870   'ToneCurveColorSpace' => 'Tone Curve Colour Space',
     871   'ToningEffect' => {
     872      PrintConv => {
     873        'Color' => 'Colour',
    455874      },
    456875    },
    … …  
    468887    },
    469888   'UltrasoundColorDataPresent' => 'Ultrasound Colour Data Present',
     889   'UnderflowColor' => 'Underflow Colour',
    470890   'Unsharp1Color' => 'Unsharp 1 Colour',
    471891   'Unsharp2Color' => 'Unsharp 2 Colour',
    472892   'Unsharp3Color' => 'Unsharp 3 Colour',
    473893   'Unsharp4Color' => 'Unsharp 4 Colour',
     894   'VideoAlphaPremultipleColor' => 'Video Alpha Premultiple Colour',
    474895   'VideoAlphaPremultipleColorA' => 'Video Alpha Premultiple Colour A',
    475896   'VideoAlphaPremultipleColorB' => 'Video Alpha Premultiple Colour B',
    … …  
    477898   'VideoAlphaPremultipleColorBlue' => 'Video Alpha Premultiple Colour Blue',
    478899   'VideoAlphaPremultipleColorCyan' => 'Video Alpha Premultiple Colour Cyan',
     900   'VideoAlphaPremultipleColorGray' => 'Video Alpha Premultiple Colour Gray',
    479901   'VideoAlphaPremultipleColorGreen' => 'Video Alpha Premultiple Colour Green',
    480902   'VideoAlphaPremultipleColorL' => 'Video Alpha Premultiple Colour L',
    … …  
    483905   'VideoAlphaPremultipleColorRed' => 'Video Alpha Premultiple Colour Red',
    484906   'VideoAlphaPremultipleColorSwatchName' => 'Video Alpha Premultiple Colour Swatch Name',
     907   'VideoAlphaPremultipleColorTint' => 'Video Alpha Premultiple Colour Tint',
    485908   'VideoAlphaPremultipleColorType' => 'Video Alpha Premultiple Colour Type',
    486909   'VideoAlphaPremultipleColorYellow' => 'Video Alpha Premultiple Colour Yellow',
     910   'VideoColorKind' => 'Video Colour Kind',
    487911   'VideoColorSpace' => 'Video Colour Space',
     912   'VisualColor' => {
     913      Description => 'Visual Colour',
     914      PrintConv => {
     915        'Color' => 'Colour',
     916      },
     917    },
    488918   'WBAdjColorTemp' => 'WB Adj Colour Temp',
    489919   'WBAdjLighting' => {
    490920      PrintConv => {
    491         'High Color Rendering Fluorescent' => 'High Colour Rendering Fluorescent',
    492       },
    493     },
     921        'High Color Rendering Fluorescent (3700K)' => 'High Colour Rendering Fluorescent (1)',
     922        'High Color Rendering Fluorescent (5000K)' => 'High Colour Rendering Fluorescent (3)',
     923        'High Color Rendering Fluorescent (cool white)' => 'High Colour Rendering Fluorescent (2)',
     924        'High Color Rendering Fluorescent (daylight)' => 'High Colour Rendering Fluorescent (4)',
     925        'High Color Rendering Fluorescent (warm white)' => 'High Colour Rendering Fluorescent (0)',
     926        'Sodium Vapor Lamps' => 'Sodium Vapour Lamps',
     927        'Standard Fluorescent (high temperature mercury vapor)' => 'Standard Fluorescent (high temperature mercury vapour)',
     928      },
     929    },
     930   'WatercolorFilter' => 'Watercolour Filter',
    494931   'WhiteBalance' => {
    495932      PrintConv => {
    496         'Color Temperature/Color Filter' => 'Color Temperature/Colour Filter',
     933        'Color Filter' => 'Colour Filter',
     934        'Color Temperature' => 'Colour Temperature',
     935        'Color Temperature Enhancement' => 'Colour Temperature Enhancement',
     936        'Color Temperature/Color Filter' => 'Colour Temperature/Colour Filter',
     937      },
     938    },
     939   'WhiteBalance2' => {
     940      PrintConv => {
     941        'Auto (Keep Warm Color Off)' => 'Auto (Keep Warm Colour Off)',
    497942      },
    498943    },
    … …  
    545990=head1 AUTHOR
    546991
    547 Copyright 2003-2011, Phil Harvey (phil at owl.phy.queensu.ca)
     992Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
    548993
    549994This library is free software; you can redistribute it and/or modify it
Note: See TracChangeset for help on using the changeset viewer.