commit 6f84ed5afc0d1d43e01f2728207b6fb2cdafc5b5
author Jack Jansen <jack.jansen@cwi.nl> Thu May 17 12:45:13 2001 +0000
committer Jack Jansen <jack.jansen@cwi.nl> Thu May 17 12:45:13 2001 +0000
tree 68fa306974cc05de44d5c5c07ba62a739db3aa72
parent dfebe90c4c04a7a36e4542907118ddce97085868

Fixed macroman<->latin1 conversion. Some chars don't
exist in latin1, but at least the roundtrip results in the
same macroman characters.

Mac/Lib/lib-toolbox/AppleEvents.py

diff --git a/Mac/Lib/lib-toolbox/AppleEvents.py b/Mac/Lib/lib-toolbox/AppleEvents.py
index 0373685..605a3e0 100644
--- a/Mac/Lib/lib-toolbox/AppleEvents.py
+++ b/Mac/Lib/lib-toolbox/AppleEvents.py
@@ -704,7 +704,7 @@
 kFAFileParam = FOUR_CHAR_CODE('faal')
 kFAIndexParam = FOUR_CHAR_CODE('indx')        
 kAEInternetSuite = FOUR_CHAR_CODE('gurl')
-kAEISWebStarSuite = FOUR_CHAR_CODE('WWW‡')
+kAEISWebStarSuite = FOUR_CHAR_CODE('WWW½')
 kAEISGetURL = FOUR_CHAR_CODE('gurl')
 KAEISHandleCGI = FOUR_CHAR_CODE('sdoc')
 cURL = FOUR_CHAR_CODE('url ')

Mac/Lib/lib-toolbox/Icons.py

diff --git a/Mac/Lib/lib-toolbox/Icons.py b/Mac/Lib/lib-toolbox/Icons.py
index 2c8da98..56dde47 100644
--- a/Mac/Lib/lib-toolbox/Icons.py
+++ b/Mac/Lib/lib-toolbox/Icons.py
@@ -277,35 +277,35 @@
 kUserIcon = FOUR_CHAR_CODE('user')
 kOwnerIcon = FOUR_CHAR_CODE('susr')
 kGroupIcon = FOUR_CHAR_CODE('grup')
-kAppleExtrasFolderIcon = FOUR_CHAR_CODE('aexŸ')
+kAppleExtrasFolderIcon = FOUR_CHAR_CODE('aex€')
 kAppleMenuFolderIcon = FOUR_CHAR_CODE('amnu')
 kApplicationsFolderIcon = FOUR_CHAR_CODE('apps')
 kApplicationSupportFolderIcon = FOUR_CHAR_CODE('asup')
-kAssistantsFolderIcon = FOUR_CHAR_CODE('astŸ')
+kAssistantsFolderIcon = FOUR_CHAR_CODE('ast€')
 kContextualMenuItemsFolderIcon = FOUR_CHAR_CODE('cmnu')
 kControlPanelDisabledFolderIcon = FOUR_CHAR_CODE('ctrD')
 kControlPanelFolderIcon = FOUR_CHAR_CODE('ctrl')
-kControlStripModulesFolderIcon = FOUR_CHAR_CODE('sdvŸ')
+kControlStripModulesFolderIcon = FOUR_CHAR_CODE('sdv€')
 kDocumentsFolderIcon = FOUR_CHAR_CODE('docs')
 kExtensionsDisabledFolderIcon = FOUR_CHAR_CODE('extD')
 kExtensionsFolderIcon = FOUR_CHAR_CODE('extn')
 kFavoritesFolderIcon = FOUR_CHAR_CODE('favs')
 kFontsFolderIcon = FOUR_CHAR_CODE('font')
-kHelpFolderIcon = FOUR_CHAR_CODE('Ÿhlp')
-kInternetFolderIcon = FOUR_CHAR_CODE('intŸ')
-kInternetPlugInFolderIcon = FOUR_CHAR_CODE('Ÿnet')
-kLocalesFolderIcon = FOUR_CHAR_CODE('Ÿloc')
-kMacOSReadMeFolderIcon = FOUR_CHAR_CODE('morŸ')
-kPreferencesFolderIcon = FOUR_CHAR_CODE('prfŸ')
+kHelpFolderIcon = FOUR_CHAR_CODE('€hlp')
+kInternetFolderIcon = FOUR_CHAR_CODE('int€')
+kInternetPlugInFolderIcon = FOUR_CHAR_CODE('€net')
+kLocalesFolderIcon = FOUR_CHAR_CODE('€loc')
+kMacOSReadMeFolderIcon = FOUR_CHAR_CODE('mor€')
+kPreferencesFolderIcon = FOUR_CHAR_CODE('prf€')
 kPrinterDescriptionFolderIcon = FOUR_CHAR_CODE('ppdf')
-kPrinterDriverFolderIcon = FOUR_CHAR_CODE('Ÿprd')
+kPrinterDriverFolderIcon = FOUR_CHAR_CODE('€prd')
 kPrintMonitorFolderIcon = FOUR_CHAR_CODE('prnt')
 kRecentApplicationsFolderIcon = FOUR_CHAR_CODE('rapp')
 kRecentDocumentsFolderIcon = FOUR_CHAR_CODE('rdoc')
 kRecentServersFolderIcon = FOUR_CHAR_CODE('rsrv')
-kScriptingAdditionsFolderIcon = FOUR_CHAR_CODE('Ÿscr')
-kSharedLibrariesFolderIcon = FOUR_CHAR_CODE('Ÿlib')
-kScriptsFolderIcon = FOUR_CHAR_CODE('scrŸ')
+kScriptingAdditionsFolderIcon = FOUR_CHAR_CODE('€scr')
+kSharedLibrariesFolderIcon = FOUR_CHAR_CODE('€lib')
+kScriptsFolderIcon = FOUR_CHAR_CODE('scr€')
 kShutdownItemsDisabledFolderIcon = FOUR_CHAR_CODE('shdD')
 kShutdownItemsFolderIcon = FOUR_CHAR_CODE('shdf')
 kSpeakableItemsFolder = FOUR_CHAR_CODE('spki')
@@ -313,13 +313,13 @@
 kStartupItemsFolderIcon = FOUR_CHAR_CODE('strt')
 kSystemExtensionDisabledFolderIcon = FOUR_CHAR_CODE('macD')
 kSystemFolderIcon = FOUR_CHAR_CODE('macs')
-kTextEncodingsFolderIcon = FOUR_CHAR_CODE('Ÿtex')
+kTextEncodingsFolderIcon = FOUR_CHAR_CODE('€tex')
 kAppearanceFolderIcon = FOUR_CHAR_CODE('appr')
-kUtilitiesFolderIcon = FOUR_CHAR_CODE('utiŸ')
+kUtilitiesFolderIcon = FOUR_CHAR_CODE('uti€')
 kVoicesFolderIcon = FOUR_CHAR_CODE('fvoc')
 kColorSyncFolderIcon = FOUR_CHAR_CODE('prof')
 kInternetSearchSitesFolderIcon = FOUR_CHAR_CODE('issf')
-kUsersFolderIcon = FOUR_CHAR_CODE('usrŸ')
+kUsersFolderIcon = FOUR_CHAR_CODE('usr€')
 kAppleScriptBadgeIcon = FOUR_CHAR_CODE('scrp')
 kLockedBadgeIcon = FOUR_CHAR_CODE('lbdg')
 kMountedBadgeIcon = FOUR_CHAR_CODE('mbdg')