diff --git a/docs/develop/app/usecases/BMessageFilterUseCases.html b/docs/develop/app/usecases/BMessageFilterUseCases.html index 41ecfc9a2a..c8d94eea88 100644 --- a/docs/develop/app/usecases/BMessageFilterUseCases.html +++ b/docs/develop/app/usecases/BMessageFilterUseCases.html @@ -1,5 +1,5 @@ - + BMessageFilter Use Cases and Implementation Details diff --git a/docs/develop/app/usecases/BMessageQueueUseCases.html b/docs/develop/app/usecases/BMessageQueueUseCases.html index 11a8f8d93b..0c715d04e9 100644 --- a/docs/develop/app/usecases/BMessageQueueUseCases.html +++ b/docs/develop/app/usecases/BMessageQueueUseCases.html @@ -1,5 +1,5 @@ - + BMessageQueue Use Cases and Implementation Details diff --git a/docs/develop/app/usecases/BPropertyInfoUseCases.html b/docs/develop/app/usecases/BPropertyInfoUseCases.html index 31c877a57c..c181904baa 100644 --- a/docs/develop/app/usecases/BPropertyInfoUseCases.html +++ b/docs/develop/app/usecases/BPropertyInfoUseCases.html @@ -1,5 +1,5 @@ - + BPropertyInfo Use Cases and Implementation Details diff --git a/docs/develop/ikteam/UnitTestingInfo.html b/docs/develop/ikteam/UnitTestingInfo.html index c5d246eb3a..efe48c5851 100644 --- a/docs/develop/ikteam/UnitTestingInfo.html +++ b/docs/develop/ikteam/UnitTestingInfo.html @@ -1,5 +1,5 @@ - + Unit Testing Information diff --git a/docs/develop/interface/usecases/BDeskbarUseCases.html b/docs/develop/interface/usecases/BDeskbarUseCases.html index e0a47cc2ab..e64c36e970 100644 --- a/docs/develop/interface/usecases/BDeskbarUseCases.html +++ b/docs/develop/interface/usecases/BDeskbarUseCases.html @@ -1,5 +1,5 @@ - + BDeskbar Use Cases and Implementation Details diff --git a/docs/develop/interface/usecases/BPolygonUseCases.html b/docs/develop/interface/usecases/BPolygonUseCases.html index 2474e2871a..826c138876 100644 --- a/docs/develop/interface/usecases/BPolygonUseCases.html +++ b/docs/develop/interface/usecases/BPolygonUseCases.html @@ -1,5 +1,5 @@ - + BPolygon Use Cases and Implementation Details diff --git a/docs/develop/support/usecases/BAutolockUseCases.html b/docs/develop/support/usecases/BAutolockUseCases.html index 9195f64f9b..f4961b2ac2 100644 --- a/docs/develop/support/usecases/BAutolockUseCases.html +++ b/docs/develop/support/usecases/BAutolockUseCases.html @@ -1,5 +1,5 @@ - + BAutolock Use Cases and Implementation Details diff --git a/docs/develop/support/usecases/BLockerUseCases.html b/docs/develop/support/usecases/BLockerUseCases.html index 18bccbf8e8..5b3bc91963 100644 --- a/docs/develop/support/usecases/BLockerUseCases.html +++ b/docs/develop/support/usecases/BLockerUseCases.html @@ -1,5 +1,5 @@ - + BLocker Use Cases and Implementation Details diff --git a/headers/libs/zlib/zconf.h b/headers/libs/zlib/zconf.h index 5ae265e66e..ba6b9ff600 100644 --- a/headers/libs/zlib/zconf.h +++ b/headers/libs/zlib/zconf.h @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id$ */ +/* @(#) $Id: zconf.h 28305 2008-10-23 21:46:26Z bonefish $ */ #ifndef ZCONF_H #define ZCONF_H diff --git a/headers/os/drivers/usb/USB_langIDs.h b/headers/os/drivers/usb/USB_langIDs.h index b33f71b347..fc0672f5d8 100644 --- a/headers/os/drivers/usb/USB_langIDs.h +++ b/headers/os/drivers/usb/USB_langIDs.h @@ -8,12 +8,12 @@ // descriptor string index 0 = supported LANGIDs array #define USB_LANGIDS_STRING_INDEX (0) - -#define USB_PRIMARY_LANGID_MASK (0x003F) // 9 to 0 bits -#define USB_SUB_LANGID_MASK (0xFC00) // 15 to 10 bits - -#define USB_PRIMARY_LANGID(id) (id & USB_PRIMARY_LANGID_MASK) -#define USB_SUB_LANGID(id) ((id & USB_SUB_LANGID_MASK) >> 10) + +#define USB_PRIMARY_LANGID_MASK (0x003F) // 9 to 0 bits +#define USB_SUB_LANGID_MASK (0xFC00) // 15 to 10 bits + +#define USB_PRIMARY_LANGID(id) (id & USB_PRIMARY_LANGID_MASK) +#define USB_SUB_LANGID(id) ((id & USB_SUB_LANGID_MASK) >> 10) enum { USB_LANGID_AFRIKAANS = 0x0436, // Afrikaans @@ -21,39 +21,39 @@ enum { USB_LANGID_ARABIC_SAUDI_ARABIA = 0x0401, // Arabic (Saudi Arabia) USB_LANGID_ARABIC_IRAK = 0x0801, // Arabic (Irak) USB_LANGID_ARABIC_EGYPT = 0x0c01, // Arabic (Egypt) - USB_LANGID_ARABIC_LYBYA = 0x1001, // Arabic (Libya) - USB_LANGID_ARABIC_ALGERIA = 0x1401, // Arabic (Algeria) - USB_LANGID_ARABIC_MOROCCO = 0x1801, // Arabic (Morocco) - USB_LANGID_ARABIC_TUNISIA = 0x1c01, // Arabic (Tunisia) - USB_LANGID_ARABIC_OMAN = 0x2001, // Arabic (Oman) - USB_LANGID_ARABIC_YEMEN = 0x2401, // Arabic (Yemen) - USB_LANGID_ARABIC_SYRIA = 0x2801, // Arabic (Syria) - USB_LANGID_ARABIC_JORDAN = 0x2c01, // Arabic (Jordan) - USB_LANGID_ARABIC_LEBANON = 0x3001, // Arabic (Lebanon) - USB_LANGID_ARABIC_KUWAIT = 0x3401, // Arabic (Kuwait) - USB_LANGID_ARABIC_UAE = 0x3801, // Arabic (U.A.E.) - USB_LANGID_ARABIC_BAHRAIN = 0x3c01, // Arabic (Bahrain) - USB_LANGID_ARABIC_QATAR = 0x4001, // Arabic (Qatar) - USB_LANGID_ARMENIAN = 0x042b, // Armenian - USB_LANGID_ASSAMESE = 0x044d, // Assamese - USB_LANGID_AZERI_LATIN = 0x042c, // Azeri (Latin) - USB_LANGID_AZERI_CYRILLIC = 0x082c, // Azeri (Cyrillic) - USB_LANGID_BASQUE = 0x042d, // Basque - USB_LANGID_BELARUSSIAN = 0x0423, // Belarussian - USB_LANGID_BENGALI = 0x0445, // Bengali - USB_LANGID_BULGARIAN = 0x0402, // Bulgarian - USB_LANGID_BURMESE = 0x0455, // Burmese - USB_LANGID_CATALAN = 0x0403, // Catalan - USB_LANGID_CHINESE_TAIWAN = 0x0404, // Chinese (Taiwan) - USB_LANGID_CHINESE_PRC = 0x0804, // Chinese (PRC = People Republic of Chinese) - USB_LANGID_CHINESE_HONG_KONG = 0x0c04, // Chinese (Hong Kong) - USB_LANGID_CHINESE_SINGAPORE = 0x1004, // Chinese (Singapore) - USB_LANGID_CHINESE_MACAU_SAR = 0x1404, // Chinese (Macau SAR) - USB_LANGID_CROATIAN = 0x041a, // Croatian - USB_LANGID_CZECH = 0x0405, // Czech - USB_LANGID_DANISH = 0x0406, // Danish - USB_LANGID_DUTCH_NETHERLANDS = 0x0413, // Dutch (Netherlands) - USB_LANGID_DUTCH_BELGIUM = 0x0813, // Dutch (Belgium) + USB_LANGID_ARABIC_LYBYA = 0x1001, // Arabic (Libya) + USB_LANGID_ARABIC_ALGERIA = 0x1401, // Arabic (Algeria) + USB_LANGID_ARABIC_MOROCCO = 0x1801, // Arabic (Morocco) + USB_LANGID_ARABIC_TUNISIA = 0x1c01, // Arabic (Tunisia) + USB_LANGID_ARABIC_OMAN = 0x2001, // Arabic (Oman) + USB_LANGID_ARABIC_YEMEN = 0x2401, // Arabic (Yemen) + USB_LANGID_ARABIC_SYRIA = 0x2801, // Arabic (Syria) + USB_LANGID_ARABIC_JORDAN = 0x2c01, // Arabic (Jordan) + USB_LANGID_ARABIC_LEBANON = 0x3001, // Arabic (Lebanon) + USB_LANGID_ARABIC_KUWAIT = 0x3401, // Arabic (Kuwait) + USB_LANGID_ARABIC_UAE = 0x3801, // Arabic (U.A.E.) + USB_LANGID_ARABIC_BAHRAIN = 0x3c01, // Arabic (Bahrain) + USB_LANGID_ARABIC_QATAR = 0x4001, // Arabic (Qatar) + USB_LANGID_ARMENIAN = 0x042b, // Armenian + USB_LANGID_ASSAMESE = 0x044d, // Assamese + USB_LANGID_AZERI_LATIN = 0x042c, // Azeri (Latin) + USB_LANGID_AZERI_CYRILLIC = 0x082c, // Azeri (Cyrillic) + USB_LANGID_BASQUE = 0x042d, // Basque + USB_LANGID_BELARUSSIAN = 0x0423, // Belarussian + USB_LANGID_BENGALI = 0x0445, // Bengali + USB_LANGID_BULGARIAN = 0x0402, // Bulgarian + USB_LANGID_BURMESE = 0x0455, // Burmese + USB_LANGID_CATALAN = 0x0403, // Catalan + USB_LANGID_CHINESE_TAIWAN = 0x0404, // Chinese (Taiwan) + USB_LANGID_CHINESE_PRC = 0x0804, // Chinese (PRC = People Republic of Chinese) + USB_LANGID_CHINESE_HONG_KONG = 0x0c04, // Chinese (Hong Kong) + USB_LANGID_CHINESE_SINGAPORE = 0x1004, // Chinese (Singapore) + USB_LANGID_CHINESE_MACAU_SAR = 0x1404, // Chinese (Macau SAR) + USB_LANGID_CROATIAN = 0x041a, // Croatian + USB_LANGID_CZECH = 0x0405, // Czech + USB_LANGID_DANISH = 0x0406, // Danish + USB_LANGID_DUTCH_NETHERLANDS = 0x0413, // Dutch (Netherlands) + USB_LANGID_DUTCH_BELGIUM = 0x0813, // Dutch (Belgium) USB_LANGID_ENGLISH_UNITED_STATES = 0x0409, // English (United States) USB_LANGID_ENGLISH_UNITED_KINGDOM = 0x0809, // English (United Kingdom) USB_LANGID_ENGLISH_AUSTRALIAN = 0x0c09, // English (Australian) @@ -83,91 +83,91 @@ enum { USB_LANGID_GERMAN_AUSTRIA = 0x0c07, // German (Austria) USB_LANGID_GERMAN_LUXEMBOURG = 0x1007, // German (Luxembourg) USB_LANGID_GERMAN_LIECHTENSTEIN = 0x1407, // German (Liechtenstein) - USB_LANGID_GREEK = 0x0408, // Greek - USB_LANGID_GUJARATI = 0x0447, // Gujarati - USB_LANGID_HEBREW = 0x040d, // Hebrew - USB_LANGID_HINDI = 0x0439, // Hindi - USB_LANGID_HUNGARIAN = 0x040e, // Hungarian - USB_LANGID_ICELANDIC = 0x040f, // Icelandic - USB_LANGID_INDONESIAN = 0x0421, // Indonesian - USB_LANGID_ITALIAN_STANDARD = 0x0410, // Italian (Standard) - USB_LANGID_ITALIAN_SWITZERLAND = 0x0810, // Italian (Switzerland) - USB_LANGID_JAPANESE = 0x0411, // Japanese - USB_LANGID_KANNADA = 0x044b, // Kannada - USB_LANGID_KASHMIRI_INDIA = 0x0860, // Kashmiri (India) - USB_LANGID_KAZAKH = 0x043f, // Kazakh - USB_LANGID_KONKANI = 0x0457, // Konkani - USB_LANGID_KOREAN_JOHAB = 0x0412, // Korean (Johab) - USB_LANGID_LATVIAN = 0x0426, // Latvian - USB_LANGID_LITHUANIAN = 0x0427, // Lithuanian - USB_LANGID_LITHUANIAN_CLASSIC = 0x0827, // Lithuanian (Classic) - USB_LANGID_MACEDONIAN = 0x042f, // Macedonian - USB_LANGID_MALAY_MALAYSIAN = 0x043e, // Malay (Malaysian) - USB_LANGID_MALAY_BRUNEI_DARUSSALAM = 0x083e, // Malay (Brunei Darussalam) - USB_LANGID_MALAYALAM = 0x044c, // Malayalam - USB_LANGID_MANIPURI = 0x0458, // Manipuri - USB_LANGID_MARATHI = 0x044e, // Marathi - USB_LANGID_NEPALI_INDIA = 0x0861, // Nepali (India) - USB_LANGID_NORWEGIAN_BOKMAL = 0x0414, // Norwegian (Bokmal) - USB_LANGID_NORWEGIAN_NYNORSK = 0x0814, // Norwegian (Nynorsk) - USB_LANGID_ORIYA = 0x0448, // Oriya - USB_LANGID_POLISH = 0x0415, // Polish - USB_LANGID_PORTUGUESE_BRAZIL = 0x0416, // Portuguese (Brazil) - USB_LANGID_PORTUGUESE_STANDARD = 0x0816, // Portuguese (Standard) - USB_LANGID_PUNJABI = 0x0446, // Punjabi - USB_LANGID_ROMANIAN = 0x0418, // Romanian - USB_LANGID_RUSSIAN = 0x0419, // Russian - USB_LANGID_SANSKRIT = 0x044f, // Sanskrit - USB_LANGID_SERBIAN_CYRILLIC = 0x0c1a, // Serbian (Cyrillic) - USB_LANGID_SERBIAN_LATIN = 0x081a, // Serbian (Latin) - USB_LANGID_SINDHI = 0x0459, // Sindhi - USB_LANGID_SLOVAK = 0x041b, // Slovak - USB_LANGID_SLOVENIAN = 0x0424, // Slovenian - USB_LANGID_SPANNISH_TRADITIONAL_SORT= 0x040a, // Spannish (Traditional Sort) - USB_LANGID_SPANNISH_MEXICAN = 0x080a, // Spannish (Mexican) - USB_LANGID_SPANNISH_MODERN_SORT = 0x0c0a, // Spannish (Modern Sort) - USB_LANGID_SPANNISH_GUATEMALA = 0x100a, // Spannish (Guatemala) - USB_LANGID_SPANNISH_COSTA_RICA = 0x140a, // Spannish (Costa Rica) - USB_LANGID_SPANNISH_PANAMA = 0x180a, // Spannish (Panama) - USB_LANGID_SPANNISH_DOMINICAN_REPUBLIC = 0x1c0a, // Spannish (Dominican Republic) - USB_LANGID_SPANNISH_VENEZUELA = 0x200a, // Spannish (Venezuela) - USB_LANGID_SPANNISH_COLOMBIA = 0x240a, // Spannish (Colombia) - USB_LANGID_SPANNISH_PERU = 0x280a, // Spannish (Peru) - USB_LANGID_SPANNISH_ARGENTINA = 0x2c0a, // Spannish (Argentina) - USB_LANGID_SPANNISH_ECUADOR = 0x300a, // Spannish (Ecuador) - USB_LANGID_SPANNISH_CHILE = 0x340a, // Spannish (Chile) - USB_LANGID_SPANNISH_URUGUAY = 0x380a, // Spannish (Uruguay) - USB_LANGID_SPANNISH_PARAGUAY = 0x3c0a, // Spannish (Paraguay) - USB_LANGID_SPANNISH_BOLIVIA = 0x400a, // Spannish (Bolivia) - USB_LANGID_SPANNISH_EL_SALVADOR = 0x440a, // Spannish (El Salvador) - USB_LANGID_SPANNISH_HONDURAS = 0x480a, // Spannish (Honduras) - USB_LANGID_SPANNISH_NICARAGUA = 0x4c0a, // Spannish (Nicaragua) - USB_LANGID_SPANNISH_PUERTO_RICO = 0x500a, // Spannish (Puerto Rico) - USB_LANGID_SUTU = 0x0430, // Sutu - USB_LANGID_SWAHILI_KENYA = 0x0441, // Swahili (Kenya) - USB_LANGID_SWEDISH = 0x041d, // Swedish - USB_LANGID_SWEDISH_FINLAND = 0x081d, // Swedish (Finland) - USB_LANGID_TAMIL = 0x0449, // Tamil - USB_LANGID_TATAR_TATARSTAN = 0x0444, // Tatar (Tatarstan) - USB_LANGID_TELUGU = 0x044a, // Telugu - USB_LANGID_THAI = 0x041e, // Thai - USB_LANGID_TURKISH = 0x041f, // Turkish - USB_LANGID_UKRAINIAN = 0x0422, // Ukrainian - USB_LANGID_URDU_PAKISTAN = 0x0420, // Urdu (Pakistan) - USB_LANGID_URDU_INDIA = 0x0820, // Urdu (India) - USB_LANGID_UZBEK_LATIN = 0x0443, // Uzbek (Latin) - USB_LANGID_UZBEK_CYRILLIC = 0x0843, // Uzbek (Cyrillic) - USB_LANGID_VIETNAMESE = 0x042a, // Vietnamese - - USB_LANGID_HID_UDD = 0x04ff, // HID (Usage Data Descriptor) - USB_LANGID_HID1 = 0xf0ff, // HID (Vendor Defined 1) - USB_LANGID_HID2 = 0xf4ff, // HID (Vendor Defined 2) - USB_LANGID_HID3 = 0xf8ff, // HID (Vendor Defined 3) - USB_LANGID_HID4 = 0xfcff, // HID (Vendor Defined 4) + USB_LANGID_GREEK = 0x0408, // Greek + USB_LANGID_GUJARATI = 0x0447, // Gujarati + USB_LANGID_HEBREW = 0x040d, // Hebrew + USB_LANGID_HINDI = 0x0439, // Hindi + USB_LANGID_HUNGARIAN = 0x040e, // Hungarian + USB_LANGID_ICELANDIC = 0x040f, // Icelandic + USB_LANGID_INDONESIAN = 0x0421, // Indonesian + USB_LANGID_ITALIAN_STANDARD = 0x0410, // Italian (Standard) + USB_LANGID_ITALIAN_SWITZERLAND = 0x0810, // Italian (Switzerland) + USB_LANGID_JAPANESE = 0x0411, // Japanese + USB_LANGID_KANNADA = 0x044b, // Kannada + USB_LANGID_KASHMIRI_INDIA = 0x0860, // Kashmiri (India) + USB_LANGID_KAZAKH = 0x043f, // Kazakh + USB_LANGID_KONKANI = 0x0457, // Konkani + USB_LANGID_KOREAN_JOHAB = 0x0412, // Korean (Johab) + USB_LANGID_LATVIAN = 0x0426, // Latvian + USB_LANGID_LITHUANIAN = 0x0427, // Lithuanian + USB_LANGID_LITHUANIAN_CLASSIC = 0x0827, // Lithuanian (Classic) + USB_LANGID_MACEDONIAN = 0x042f, // Macedonian + USB_LANGID_MALAY_MALAYSIAN = 0x043e, // Malay (Malaysian) + USB_LANGID_MALAY_BRUNEI_DARUSSALAM = 0x083e, // Malay (Brunei Darussalam) + USB_LANGID_MALAYALAM = 0x044c, // Malayalam + USB_LANGID_MANIPURI = 0x0458, // Manipuri + USB_LANGID_MARATHI = 0x044e, // Marathi + USB_LANGID_NEPALI_INDIA = 0x0861, // Nepali (India) + USB_LANGID_NORWEGIAN_BOKMAL = 0x0414, // Norwegian (Bokmal) + USB_LANGID_NORWEGIAN_NYNORSK = 0x0814, // Norwegian (Nynorsk) + USB_LANGID_ORIYA = 0x0448, // Oriya + USB_LANGID_POLISH = 0x0415, // Polish + USB_LANGID_PORTUGUESE_BRAZIL = 0x0416, // Portuguese (Brazil) + USB_LANGID_PORTUGUESE_STANDARD = 0x0816, // Portuguese (Standard) + USB_LANGID_PUNJABI = 0x0446, // Punjabi + USB_LANGID_ROMANIAN = 0x0418, // Romanian + USB_LANGID_RUSSIAN = 0x0419, // Russian + USB_LANGID_SANSKRIT = 0x044f, // Sanskrit + USB_LANGID_SERBIAN_CYRILLIC = 0x0c1a, // Serbian (Cyrillic) + USB_LANGID_SERBIAN_LATIN = 0x081a, // Serbian (Latin) + USB_LANGID_SINDHI = 0x0459, // Sindhi + USB_LANGID_SLOVAK = 0x041b, // Slovak + USB_LANGID_SLOVENIAN = 0x0424, // Slovenian + USB_LANGID_SPANNISH_TRADITIONAL_SORT= 0x040a, // Spannish (Traditional Sort) + USB_LANGID_SPANNISH_MEXICAN = 0x080a, // Spannish (Mexican) + USB_LANGID_SPANNISH_MODERN_SORT = 0x0c0a, // Spannish (Modern Sort) + USB_LANGID_SPANNISH_GUATEMALA = 0x100a, // Spannish (Guatemala) + USB_LANGID_SPANNISH_COSTA_RICA = 0x140a, // Spannish (Costa Rica) + USB_LANGID_SPANNISH_PANAMA = 0x180a, // Spannish (Panama) + USB_LANGID_SPANNISH_DOMINICAN_REPUBLIC = 0x1c0a, // Spannish (Dominican Republic) + USB_LANGID_SPANNISH_VENEZUELA = 0x200a, // Spannish (Venezuela) + USB_LANGID_SPANNISH_COLOMBIA = 0x240a, // Spannish (Colombia) + USB_LANGID_SPANNISH_PERU = 0x280a, // Spannish (Peru) + USB_LANGID_SPANNISH_ARGENTINA = 0x2c0a, // Spannish (Argentina) + USB_LANGID_SPANNISH_ECUADOR = 0x300a, // Spannish (Ecuador) + USB_LANGID_SPANNISH_CHILE = 0x340a, // Spannish (Chile) + USB_LANGID_SPANNISH_URUGUAY = 0x380a, // Spannish (Uruguay) + USB_LANGID_SPANNISH_PARAGUAY = 0x3c0a, // Spannish (Paraguay) + USB_LANGID_SPANNISH_BOLIVIA = 0x400a, // Spannish (Bolivia) + USB_LANGID_SPANNISH_EL_SALVADOR = 0x440a, // Spannish (El Salvador) + USB_LANGID_SPANNISH_HONDURAS = 0x480a, // Spannish (Honduras) + USB_LANGID_SPANNISH_NICARAGUA = 0x4c0a, // Spannish (Nicaragua) + USB_LANGID_SPANNISH_PUERTO_RICO = 0x500a, // Spannish (Puerto Rico) + USB_LANGID_SUTU = 0x0430, // Sutu + USB_LANGID_SWAHILI_KENYA = 0x0441, // Swahili (Kenya) + USB_LANGID_SWEDISH = 0x041d, // Swedish + USB_LANGID_SWEDISH_FINLAND = 0x081d, // Swedish (Finland) + USB_LANGID_TAMIL = 0x0449, // Tamil + USB_LANGID_TATAR_TATARSTAN = 0x0444, // Tatar (Tatarstan) + USB_LANGID_TELUGU = 0x044a, // Telugu + USB_LANGID_THAI = 0x041e, // Thai + USB_LANGID_TURKISH = 0x041f, // Turkish + USB_LANGID_UKRAINIAN = 0x0422, // Ukrainian + USB_LANGID_URDU_PAKISTAN = 0x0420, // Urdu (Pakistan) + USB_LANGID_URDU_INDIA = 0x0820, // Urdu (India) + USB_LANGID_UZBEK_LATIN = 0x0443, // Uzbek (Latin) + USB_LANGID_UZBEK_CYRILLIC = 0x0843, // Uzbek (Cyrillic) + USB_LANGID_VIETNAMESE = 0x042a, // Vietnamese + + USB_LANGID_HID_UDD = 0x04ff, // HID (Usage Data Descriptor) + USB_LANGID_HID1 = 0xf0ff, // HID (Vendor Defined 1) + USB_LANGID_HID2 = 0xf4ff, // HID (Vendor Defined 2) + USB_LANGID_HID3 = 0xf8ff, // HID (Vendor Defined 3) + USB_LANGID_HID4 = 0xfcff, // HID (Vendor Defined 4) USB_LANGID_INVALID = 0x0000 // Invalid LANG ID }; #endif // USB_LANGIDS_H - + diff --git a/headers/posix/arpa/nameser_compat.h b/headers/posix/arpa/nameser_compat.h index a9426eb1ca..bf4714aafa 100644 --- a/headers/posix/arpa/nameser_compat.h +++ b/headers/posix/arpa/nameser_compat.h @@ -32,7 +32,7 @@ /* * from nameser.h 8.1 (Berkeley) 6/2/93 - * $Id$ + * $Id: nameser_compat.h 24644 2008-03-29 12:37:05Z bonefish $ */ #ifndef _ARPA_NAMESER_COMPAT_ diff --git a/headers/posix/resolv.h b/headers/posix/resolv.h index 54ef65542e..73d2e354dd 100644 --- a/headers/posix/resolv.h +++ b/headers/posix/resolv.h @@ -50,7 +50,7 @@ /* * @(#)resolv.h 8.1 (Berkeley) 6/2/93 - * $Id$ + * $Id: resolv.h 18456 2006-08-08 12:33:33Z axeld $ */ #ifndef _RESOLV_H_ diff --git a/src/add-ons/input_server/methods/canna/canna/RK.h b/src/add-ons/input_server/methods/canna/canna/RK.h index 8ea3c47f68..00bdb47196 100644 --- a/src/add-ons/input_server/methods/canna/canna/RK.h +++ b/src/add-ons/input_server/methods/canna/canna/RK.h @@ -20,7 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: RK.h,v 1.1 2004/12/23 22:08:39 korli Exp $ */ +/* $Id: RK.h 10527 2004-12-23 22:08:39Z korli $ */ /************************************************************************/ /* THIS SOURCE CODE IS MODIFIED FOR TKO BY T.MURAI 1997 diff --git a/src/add-ons/input_server/methods/canna/canna/jrkanji.h b/src/add-ons/input_server/methods/canna/canna/jrkanji.h index 0aeca5b376..200be4744d 100644 --- a/src/add-ons/input_server/methods/canna/canna/jrkanji.h +++ b/src/add-ons/input_server/methods/canna/canna/jrkanji.h @@ -25,7 +25,7 @@ * 8/16 bit String Manipulations. * * "@(#)kanji.h 2.3 88/10/03 10:25:34" - * "@(#) 102.1 $Id: jrkanji.h,v 1.1 2004/12/23 22:08:39 korli Exp $" + * "@(#) 102.1 $Id: jrkanji.h 10527 2004-12-23 22:08:39Z korli $" */ #ifndef _JR_KANJI_H_ diff --git a/src/add-ons/input_server/methods/canna/canna/keydef.h b/src/add-ons/input_server/methods/canna/canna/keydef.h index 0b79367f5a..e251409dd6 100644 --- a/src/add-ons/input_server/methods/canna/canna/keydef.h +++ b/src/add-ons/input_server/methods/canna/canna/keydef.h @@ -20,7 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* @(#) 102.1 $Id: keydef.h,v 1.1 2004/12/23 22:08:39 korli Exp $ */ +/* @(#) 102.1 $Id: keydef.h 10527 2004-12-23 22:08:39Z korli $ */ /* normal function keys */ #define CANNA_KEY_Nfer 0x80 diff --git a/src/add-ons/input_server/methods/canna/canna/mfdef.h b/src/add-ons/input_server/methods/canna/canna/mfdef.h index c54858fb71..cf9678576d 100644 --- a/src/add-ons/input_server/methods/canna/canna/mfdef.h +++ b/src/add-ons/input_server/methods/canna/canna/mfdef.h @@ -23,7 +23,7 @@ #ifndef _MFDEF_H_ #define _MFDEF_H_ -/* @(#) 102.1 $Id: mfdef.h,v 1.1 2004/12/23 22:08:39 korli Exp $ */ +/* @(#) 102.1 $Id: mfdef.h 10527 2004-12-23 22:08:39Z korli $ */ /* ¤³¤Î¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤Ç¤Ï¥â¡¼¥É¤Ë³ä¤ê¿¶¤é¤ì¤¿ÈÖ¹æ¤ä¡¢´Ø¿ô¤Ë³ä¤ê¿¶¤é¤ì¤¿ diff --git a/src/add-ons/input_server/methods/canna/canna/patchlevel.h b/src/add-ons/input_server/methods/canna/canna/patchlevel.h index 91b2e6e45b..c69f77b865 100644 --- a/src/add-ons/input_server/methods/canna/canna/patchlevel.h +++ b/src/add-ons/input_server/methods/canna/canna/patchlevel.h @@ -20,7 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: patchlevel.h,v 1.1 2004/12/23 22:08:39 korli Exp $ */ +/* $Id: patchlevel.h 10527 2004-12-23 22:08:39Z korli $ */ #define CANNA_MAJOR_MINOR 3005 #define CANNA_PATCH_LEVEL " beta 2" diff --git a/src/add-ons/input_server/methods/canna/canna/protodefs.h b/src/add-ons/input_server/methods/canna/canna/protodefs.h index baf87ef358..b732e1d08b 100644 --- a/src/add-ons/input_server/methods/canna/canna/protodefs.h +++ b/src/add-ons/input_server/methods/canna/canna/protodefs.h @@ -20,7 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: protodefs.h,v 1.1 2004/12/23 22:08:39 korli Exp $ */ +/* $Id: protodefs.h 10527 2004-12-23 22:08:39Z korli $ */ #define canna_version(majv, minv) ((majv) * 1024 + (minv)) diff --git a/src/add-ons/input_server/methods/canna/canna/symbolname.h b/src/add-ons/input_server/methods/canna/canna/symbolname.h index c9016e3cfe..bd2c4e4490 100644 --- a/src/add-ons/input_server/methods/canna/canna/symbolname.h +++ b/src/add-ons/input_server/methods/canna/canna/symbolname.h @@ -20,7 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: symbolname.h,v 1.1 2004/12/23 22:08:39 korli Exp $ +/* $Id: symbolname.h 10527 2004-12-23 22:08:39Z korli $ */ #define S_HenkanNyuuryokuMode "henkan-nyuuryoku-mode" diff --git a/src/add-ons/input_server/methods/canna/canna/widedef.h b/src/add-ons/input_server/methods/canna/canna/widedef.h index d08d7454a6..ee618262ff 100644 --- a/src/add-ons/input_server/methods/canna/canna/widedef.h +++ b/src/add-ons/input_server/methods/canna/canna/widedef.h @@ -21,7 +21,7 @@ */ /* - * @(#) 102.1 $Id: widedef.h,v 1.1 2004/12/23 22:08:39 korli Exp $ + * @(#) 102.1 $Id: widedef.h 10527 2004-12-23 22:08:39Z korli $ */ // Modified by T.Murai for BeOS diff --git a/src/add-ons/input_server/methods/canna/lib/RKkana.c b/src/add-ons/input_server/methods/canna/lib/RKkana.c index 4ee0b8a1ec..1e957c5ddf 100644 --- a/src/add-ons/input_server/methods/canna/lib/RKkana.c +++ b/src/add-ons/input_server/methods/canna/lib/RKkana.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcsid[]="@(#) 102.1 $Id$"; +static char rcsid[]="@(#) 102.1 $Id: RKkana.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* LINTLIBRARY */ diff --git a/src/add-ons/input_server/methods/canna/lib/RKroma.c b/src/add-ons/input_server/methods/canna/lib/RKroma.c index c01ea2777c..342bfca0ac 100644 --- a/src/add-ons/input_server/methods/canna/lib/RKroma.c +++ b/src/add-ons/input_server/methods/canna/lib/RKroma.c @@ -24,7 +24,7 @@ //////////////////////////////////////////////////////////////////////// #if !defined(lint) && !defined(__CODECENTER__) -static char rcsid[]="@(#) 102.1 $Id: RKroma.c,v 1.1 2004/12/23 21:23:48 korli Exp $"; +static char rcsid[]="@(#) 102.1 $Id: RKroma.c 10525 2004-12-23 21:23:50Z korli $"; #endif #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/alphamap.h b/src/add-ons/input_server/methods/canna/lib/alphamap.h index b0bbfcd795..206deedbe8 100644 --- a/src/add-ons/input_server/methods/canna/lib/alphamap.h +++ b/src/add-ons/input_server/methods/canna/lib/alphamap.h @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char alphamap_id[] = "@(#) 102.1 $Id: alphamap.h,v 1.1 2004/12/23 21:23:48 korli Exp $"; +static char alphamap_id[] = "@(#) 102.1 $Id: alphamap.h 10525 2004-12-23 21:23:50Z korli $"; #endif /* lint */ extern int JapaneseMode(); diff --git a/src/add-ons/input_server/methods/canna/lib/bunmap.h b/src/add-ons/input_server/methods/canna/lib/bunmap.h index f1563d5d6c..f26516abda 100644 --- a/src/add-ons/input_server/methods/canna/lib/bunmap.h +++ b/src/add-ons/input_server/methods/canna/lib/bunmap.h @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char bunmap_id[] = "@(#) 102.1 $Id$"; +static char bunmap_id[] = "@(#) 102.1 $Id: bunmap.h 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ extern int DoFuncSequence(); diff --git a/src/add-ons/input_server/methods/canna/lib/bunsetsu.c b/src/add-ons/input_server/methods/canna/lib/bunsetsu.c index db6df7e2e4..7b3a0ea219 100644 --- a/src/add-ons/input_server/methods/canna/lib/bunsetsu.c +++ b/src/add-ons/input_server/methods/canna/lib/bunsetsu.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id: bunsetsu.c,v 1.1 2004/12/23 21:23:48 korli Exp $"; +static char rcs_id[] = "@(#) 102.1 $Id: bunsetsu.c 10525 2004-12-23 21:23:50Z korli $"; #endif /* lint */ #include diff --git a/src/add-ons/input_server/methods/canna/lib/bushu.c b/src/add-ons/input_server/methods/canna/lib/bushu.c index 328ded428b..fdd444ceb2 100644 --- a/src/add-ons/input_server/methods/canna/lib/bushu.c +++ b/src/add-ons/input_server/methods/canna/lib/bushu.c @@ -25,7 +25,7 @@ /************************************************************************/ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: bushu.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include diff --git a/src/add-ons/input_server/methods/canna/lib/canna.h b/src/add-ons/input_server/methods/canna/lib/canna.h index 316779008a..3642af939c 100644 --- a/src/add-ons/input_server/methods/canna/lib/canna.h +++ b/src/add-ons/input_server/methods/canna/lib/canna.h @@ -21,7 +21,7 @@ */ /* - * @(#) 102.1 $Id$ + * @(#) 102.1 $Id: canna.h 14875 2005-11-12 21:25:31Z bonefish $ */ /************************************************************************/ diff --git a/src/add-ons/input_server/methods/canna/lib/chikuji.c b/src/add-ons/input_server/methods/canna/lib/chikuji.c index 986d17a1cd..3e751f5731 100644 --- a/src/add-ons/input_server/methods/canna/lib/chikuji.c +++ b/src/add-ons/input_server/methods/canna/lib/chikuji.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "$Id$"; +static char rcs_id[] = "$Id: chikuji.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/chikujimap.h b/src/add-ons/input_server/methods/canna/lib/chikujimap.h index 84fcae83d4..4aac1e7224 100644 --- a/src/add-ons/input_server/methods/canna/lib/chikujimap.h +++ b/src/add-ons/input_server/methods/canna/lib/chikujimap.h @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char chikuji_id[] = "$Id: chikujimap.h,v 1.1 2004/12/23 21:23:49 korli Exp $"; +static char chikuji_id[] = "$Id: chikujimap.h 10525 2004-12-23 21:23:50Z korli $"; #endif #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/commondata.c b/src/add-ons/input_server/methods/canna/lib/commondata.c index 7f00c7c62f..4189cf6963 100644 --- a/src/add-ons/input_server/methods/canna/lib/commondata.c +++ b/src/add-ons/input_server/methods/canna/lib/commondata.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id: commondata.c,v 1.1 2004/12/23 21:23:49 korli Exp $"; +static char rcs_id[] = "@(#) 102.1 $Id: commondata.c 10525 2004-12-23 21:23:50Z korli $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/defaultmap.c b/src/add-ons/input_server/methods/canna/lib/defaultmap.c index efee900cad..bce8ca8c97 100644 --- a/src/add-ons/input_server/methods/canna/lib/defaultmap.c +++ b/src/add-ons/input_server/methods/canna/lib/defaultmap.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: defaultmap.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/ebind.c b/src/add-ons/input_server/methods/canna/lib/ebind.c index c1847ebe8f..4a8ce18ab8 100644 --- a/src/add-ons/input_server/methods/canna/lib/ebind.c +++ b/src/add-ons/input_server/methods/canna/lib/ebind.c @@ -26,7 +26,7 @@ /************************************************************************/ #if !defined(lint) && !defined(__CODECENTER__) -static char rcsid[] = "$Id$"; +static char rcsid[] = "$Id: ebind.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/empty.c b/src/add-ons/input_server/methods/canna/lib/empty.c index 8be759a7f0..ea169db209 100644 --- a/src/add-ons/input_server/methods/canna/lib/empty.c +++ b/src/add-ons/input_server/methods/canna/lib/empty.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: empty.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/emptymap.h b/src/add-ons/input_server/methods/canna/lib/emptymap.h index b3e6e4e23f..7424b36726 100644 --- a/src/add-ons/input_server/methods/canna/lib/emptymap.h +++ b/src/add-ons/input_server/methods/canna/lib/emptymap.h @@ -22,7 +22,7 @@ // modified by T.Murai 1998 #if !defined(lint) && !defined(__CODECENTER__) -static char emptymap_id[] = "@(#) 102.1 $Id: emptymap.h,v 1.1 2004/12/23 21:23:49 korli Exp $"; +static char emptymap_id[] = "@(#) 102.1 $Id: emptymap.h 10525 2004-12-23 21:23:50Z korli $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/engine.c b/src/add-ons/input_server/methods/canna/lib/engine.c index b212c5cbbb..cb0d3f07d0 100644 --- a/src/add-ons/input_server/methods/canna/lib/engine.c +++ b/src/add-ons/input_server/methods/canna/lib/engine.c @@ -25,7 +25,7 @@ /************************************************************************/ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "$Id$"; +static char rcs_id[] = "$Id: engine.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/henkan.c b/src/add-ons/input_server/methods/canna/lib/henkan.c index 11a67c4f75..b6a36ae479 100644 --- a/src/add-ons/input_server/methods/canna/lib/henkan.c +++ b/src/add-ons/input_server/methods/canna/lib/henkan.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: henkan.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/hex.c b/src/add-ons/input_server/methods/canna/lib/hex.c index 1c971daf3a..6ee2b6ab13 100644 --- a/src/add-ons/input_server/methods/canna/lib/hex.c +++ b/src/add-ons/input_server/methods/canna/lib/hex.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: hex.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #ifndef NO_EXTEND_MENU diff --git a/src/add-ons/input_server/methods/canna/lib/ichiran.c b/src/add-ons/input_server/methods/canna/lib/ichiran.c index 15574bbdcc..edde72168b 100644 --- a/src/add-ons/input_server/methods/canna/lib/ichiran.c +++ b/src/add-ons/input_server/methods/canna/lib/ichiran.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: ichiran.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include diff --git a/src/add-ons/input_server/methods/canna/lib/ichiranmap.h b/src/add-ons/input_server/methods/canna/lib/ichiranmap.h index e21dfa456c..efd63dabb4 100644 --- a/src/add-ons/input_server/methods/canna/lib/ichiranmap.h +++ b/src/add-ons/input_server/methods/canna/lib/ichiranmap.h @@ -22,7 +22,7 @@ // Modified by T.Murai #if !defined(lint) && !defined(__CODECENTER__) -static char ichiranmap_id[] = "@(#) 102.1 $Id$"; +static char ichiranmap_id[] = "@(#) 102.1 $Id: ichiranmap.h 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/jishu.c b/src/add-ons/input_server/methods/canna/lib/jishu.c index 46dbae2809..d8d962f84f 100644 --- a/src/add-ons/input_server/methods/canna/lib/jishu.c +++ b/src/add-ons/input_server/methods/canna/lib/jishu.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: jishu.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/jishumap.h b/src/add-ons/input_server/methods/canna/lib/jishumap.h index ca741d8f67..a7bc403c2e 100644 --- a/src/add-ons/input_server/methods/canna/lib/jishumap.h +++ b/src/add-ons/input_server/methods/canna/lib/jishumap.h @@ -22,7 +22,7 @@ // Modified by T.Murai #if !defined(lint) && !defined(__CODECENTER__) -static char jishumap_id[] = "@(#) 102.1 $Id$"; +static char jishumap_id[] = "@(#) 102.1 $Id: jishumap.h 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/jrbind.c b/src/add-ons/input_server/methods/canna/lib/jrbind.c index 647265d780..6be5a47bf1 100644 --- a/src/add-ons/input_server/methods/canna/lib/jrbind.c +++ b/src/add-ons/input_server/methods/canna/lib/jrbind.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: jrbind.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/kctrl.c b/src/add-ons/input_server/methods/canna/lib/kctrl.c index 03e17a0c54..fe0a7ab6f7 100644 --- a/src/add-ons/input_server/methods/canna/lib/kctrl.c +++ b/src/add-ons/input_server/methods/canna/lib/kctrl.c @@ -25,7 +25,7 @@ /************************************************************************/ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: kctrl.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/keydef.c b/src/add-ons/input_server/methods/canna/lib/keydef.c index b1e1cd0fb6..57358e7aa5 100644 --- a/src/add-ons/input_server/methods/canna/lib/keydef.c +++ b/src/add-ons/input_server/methods/canna/lib/keydef.c @@ -25,7 +25,7 @@ /************************************************************************/ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: keydef.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/kigo.c b/src/add-ons/input_server/methods/canna/lib/kigo.c index 4e0ca27dff..5363545d9d 100644 --- a/src/add-ons/input_server/methods/canna/lib/kigo.c +++ b/src/add-ons/input_server/methods/canna/lib/kigo.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: kigo.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/kigomap.h b/src/add-ons/input_server/methods/canna/lib/kigomap.h index b429ca0d95..20ae527581 100644 --- a/src/add-ons/input_server/methods/canna/lib/kigomap.h +++ b/src/add-ons/input_server/methods/canna/lib/kigomap.h @@ -22,7 +22,7 @@ // Modified by T.Murai #if !defined(lint) && !defined(__CODECENTER__) -static char kigomap_id[] = "@(#) 102.1 $Id$"; +static char kigomap_id[] = "@(#) 102.1 $Id: kigomap.h 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #ifdef NO_EXTEND_MENU diff --git a/src/add-ons/input_server/methods/canna/lib/lisp.c b/src/add-ons/input_server/methods/canna/lib/lisp.c index 9bb689907f..1ddad6ecff 100644 --- a/src/add-ons/input_server/methods/canna/lib/lisp.c +++ b/src/add-ons/input_server/methods/canna/lib/lisp.c @@ -25,7 +25,7 @@ /************************************************************************/ #if !defined(lint) && !defined(__CODECENTER__) -static char rcsid[] = "$Id$"; +static char rcsid[] = "$Id: lisp.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* diff --git a/src/add-ons/input_server/methods/canna/lib/lisp.h b/src/add-ons/input_server/methods/canna/lib/lisp.h index 04981f1b04..77cbffb67c 100644 --- a/src/add-ons/input_server/methods/canna/lib/lisp.h +++ b/src/add-ons/input_server/methods/canna/lib/lisp.h @@ -20,7 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lisp.h,v 1.1 2004/12/23 21:23:49 korli Exp $ */ +/* $Id: lisp.h 10525 2004-12-23 21:23:50Z korli $ */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/mode.c b/src/add-ons/input_server/methods/canna/lib/mode.c index 8e7a006066..9084717bf3 100644 --- a/src/add-ons/input_server/methods/canna/lib/mode.c +++ b/src/add-ons/input_server/methods/canna/lib/mode.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: mode.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/multi.c b/src/add-ons/input_server/methods/canna/lib/multi.c index 684e63d190..e5b5c272df 100644 --- a/src/add-ons/input_server/methods/canna/lib/multi.c +++ b/src/add-ons/input_server/methods/canna/lib/multi.c @@ -25,7 +25,7 @@ /************************************************************************/ #if !defined(lint) && !defined(__CODECENTER__) -static char m_s_map_id[] = "@(#) 102.1 $Id$"; +static char m_s_map_id[] = "@(#) 102.1 $Id: multi.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/onoff.c b/src/add-ons/input_server/methods/canna/lib/onoff.c index 2ecc58894c..801cfb5e82 100644 --- a/src/add-ons/input_server/methods/canna/lib/onoff.c +++ b/src/add-ons/input_server/methods/canna/lib/onoff.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: onoff.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include diff --git a/src/add-ons/input_server/methods/canna/lib/parse.c b/src/add-ons/input_server/methods/canna/lib/parse.c index 87486d6d14..ae57b1a639 100644 --- a/src/add-ons/input_server/methods/canna/lib/parse.c +++ b/src/add-ons/input_server/methods/canna/lib/parse.c @@ -25,7 +25,7 @@ /************************************************************************/ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: parse.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include diff --git a/src/add-ons/input_server/methods/canna/lib/romaji.c b/src/add-ons/input_server/methods/canna/lib/romaji.c index ab99027d84..571097348e 100644 --- a/src/add-ons/input_server/methods/canna/lib/romaji.c +++ b/src/add-ons/input_server/methods/canna/lib/romaji.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: romaji.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/t_reimap.h b/src/add-ons/input_server/methods/canna/lib/t_reimap.h index ee94eaf257..8ab3aa10f6 100644 --- a/src/add-ons/input_server/methods/canna/lib/t_reimap.h +++ b/src/add-ons/input_server/methods/canna/lib/t_reimap.h @@ -22,7 +22,7 @@ // Modified by T.Murai #if !defined(lint) && !defined(__CODECENTER__) -static char t_reimap_id[] = "@(#) 102.1 $Id$"; +static char t_reimap_id[] = "@(#) 102.1 $Id: t_reimap.h 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/tanmap.h b/src/add-ons/input_server/methods/canna/lib/tanmap.h index e8b7d3243c..beadb84a3d 100644 --- a/src/add-ons/input_server/methods/canna/lib/tanmap.h +++ b/src/add-ons/input_server/methods/canna/lib/tanmap.h @@ -22,7 +22,7 @@ // Modified by T.Murai #if !defined(lint) && !defined(__CODECENTER__) -static char tanmap_id[] = "@(#) 102.1 $Id$"; +static char tanmap_id[] = "@(#) 102.1 $Id: tanmap.h 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/uiutil.c b/src/add-ons/input_server/methods/canna/lib/uiutil.c index 0c87eb882e..8388e55b0f 100644 --- a/src/add-ons/input_server/methods/canna/lib/uiutil.c +++ b/src/add-ons/input_server/methods/canna/lib/uiutil.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: uiutil.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/uldefine.c b/src/add-ons/input_server/methods/canna/lib/uldefine.c index 0d85f9af67..98cae7e69a 100644 --- a/src/add-ons/input_server/methods/canna/lib/uldefine.c +++ b/src/add-ons/input_server/methods/canna/lib/uldefine.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: uldefine.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif #include diff --git a/src/add-ons/input_server/methods/canna/lib/uldelete.c b/src/add-ons/input_server/methods/canna/lib/uldelete.c index 966e85eedb..9802c30ff4 100644 --- a/src/add-ons/input_server/methods/canna/lib/uldelete.c +++ b/src/add-ons/input_server/methods/canna/lib/uldelete.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: uldelete.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif diff --git a/src/add-ons/input_server/methods/canna/lib/ulhinshi.c b/src/add-ons/input_server/methods/canna/lib/ulhinshi.c index 5f2ee3b091..f6e8795d27 100644 --- a/src/add-ons/input_server/methods/canna/lib/ulhinshi.c +++ b/src/add-ons/input_server/methods/canna/lib/ulhinshi.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: ulhinshi.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif #include diff --git a/src/add-ons/input_server/methods/canna/lib/ulkigo.c b/src/add-ons/input_server/methods/canna/lib/ulkigo.c index f3edb40c8c..9433895abe 100644 --- a/src/add-ons/input_server/methods/canna/lib/ulkigo.c +++ b/src/add-ons/input_server/methods/canna/lib/ulkigo.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: ulkigo.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif #include diff --git a/src/add-ons/input_server/methods/canna/lib/ulmount.c b/src/add-ons/input_server/methods/canna/lib/ulmount.c index eebe060598..ba8798eca7 100644 --- a/src/add-ons/input_server/methods/canna/lib/ulmount.c +++ b/src/add-ons/input_server/methods/canna/lib/ulmount.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: ulmount.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif #ifndef NO_EXTEND_MENU diff --git a/src/add-ons/input_server/methods/canna/lib/ulserver.c b/src/add-ons/input_server/methods/canna/lib/ulserver.c index 164b29ba11..8b9d786561 100644 --- a/src/add-ons/input_server/methods/canna/lib/ulserver.c +++ b/src/add-ons/input_server/methods/canna/lib/ulserver.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: ulserver.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif #ifndef NO_EXTEND_MENU diff --git a/src/add-ons/input_server/methods/canna/lib/util.c b/src/add-ons/input_server/methods/canna/lib/util.c index 71d1f30949..832c8c7e17 100644 --- a/src/add-ons/input_server/methods/canna/lib/util.c +++ b/src/add-ons/input_server/methods/canna/lib/util.c @@ -82,7 +82,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: util.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/lib/yesno.c b/src/add-ons/input_server/methods/canna/lib/yesno.c index 60b8cb6d01..168df2007c 100644 --- a/src/add-ons/input_server/methods/canna/lib/yesno.c +++ b/src/add-ons/input_server/methods/canna/lib/yesno.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "@(#) 102.1 $Id$"; +static char rcs_id[] = "@(#) 102.1 $Id: yesno.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* lint */ #include diff --git a/src/add-ons/input_server/methods/canna/lib/yomimap.h b/src/add-ons/input_server/methods/canna/lib/yomimap.h index 2a4f774379..d9117689b9 100644 --- a/src/add-ons/input_server/methods/canna/lib/yomimap.h +++ b/src/add-ons/input_server/methods/canna/lib/yomimap.h @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char yomimap_id[] = "@(#) 102.1 $Id: yomimap.h,v 1.1 2004/12/23 21:23:49 korli Exp $"; +static char yomimap_id[] = "@(#) 102.1 $Id: yomimap.h 10525 2004-12-23 21:23:50Z korli $"; #endif /* lint */ #include "canna.h" diff --git a/src/add-ons/input_server/methods/canna/rk/RKintern.h b/src/add-ons/input_server/methods/canna/rk/RKintern.h index 637cf6f1bd..51c6a7b46a 100644 --- a/src/add-ons/input_server/methods/canna/rk/RKintern.h +++ b/src/add-ons/input_server/methods/canna/rk/RKintern.h @@ -21,7 +21,7 @@ */ /* LINTLIBRARY */ -/* $Id: RKintern.h,v 1.1 2004/12/23 21:23:49 korli Exp $ */ +/* $Id: RKintern.h 10525 2004-12-23 21:23:50Z korli $ */ /************************************************************************/ /* THIS SOURCE CODE IS MODIFIED FOR kanBe BY T.MURAI 1997 /************************************************************************/ diff --git a/src/add-ons/input_server/methods/canna/rk/RKrename.h b/src/add-ons/input_server/methods/canna/rk/RKrename.h index 79c1161278..940138bcf6 100644 --- a/src/add-ons/input_server/methods/canna/rk/RKrename.h +++ b/src/add-ons/input_server/methods/canna/rk/RKrename.h @@ -20,7 +20,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: RKrename.h,v 1.1 2004/12/23 21:23:50 korli Exp $ */ +/* $Id: RKrename.h 10525 2004-12-23 21:23:50Z korli $ */ #define RkGetProtocolVersion wRkGetProtocolVersion #define RkGetServerName wRkGetServerName diff --git a/src/add-ons/input_server/methods/canna/rk/RKutil.c b/src/add-ons/input_server/methods/canna/rk/RKutil.c index 504840c48c..fd169767f0 100644 --- a/src/add-ons/input_server/methods/canna/rk/RKutil.c +++ b/src/add-ons/input_server/methods/canna/rk/RKutil.c @@ -25,7 +25,7 @@ /************************************************************************/ #if !defined(lint) && !defined(__CODECENTER__) -static char rcsid[]="@(#)$Id: RKutil.c,v 1.1 2004/12/23 21:23:50 korli Exp $ $Author: korli $ $Revision: 1.1 $ $Data$"; +static char rcsid[]="@(#)$Id: RKutil.c 10525 2004-12-23 21:23:50Z korli $ $Author: korli $ $Revision: 1.1 $ $Data$"; #endif #include diff --git a/src/add-ons/input_server/methods/canna/rk/bits.c b/src/add-ons/input_server/methods/canna/rk/bits.c index 9a0231bd5a..cc913be636 100644 --- a/src/add-ons/input_server/methods/canna/rk/bits.c +++ b/src/add-ons/input_server/methods/canna/rk/bits.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) -static char rcsid[]="$Id: bits.c,v 1.1 2004/12/23 21:23:50 korli Exp $"; +static char rcsid[]="$Id: bits.c 10525 2004-12-23 21:23:50Z korli $"; #endif /* LINTLIBRARY */ diff --git a/src/add-ons/input_server/methods/canna/rk/bun.c b/src/add-ons/input_server/methods/canna/rk/bun.c index 359647905e..2ae61d2f0f 100644 --- a/src/add-ons/input_server/methods/canna/rk/bun.c +++ b/src/add-ons/input_server/methods/canna/rk/bun.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) -static char rcsid[] = "$Id$"; +static char rcsid[] = "$Id: bun.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* LINTLIBRARY */ diff --git a/src/add-ons/input_server/methods/canna/rk/context.c b/src/add-ons/input_server/methods/canna/rk/context.c index 6f3b8944bb..682b0a298a 100644 --- a/src/add-ons/input_server/methods/canna/rk/context.c +++ b/src/add-ons/input_server/methods/canna/rk/context.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcsid[]="$Id: context.c,v 1.1 2004/12/23 21:23:50 korli Exp $"; +static char rcsid[]="$Id: context.c 10525 2004-12-23 21:23:50Z korli $"; #endif /*LINTLIBRARY*/ diff --git a/src/add-ons/input_server/methods/canna/rk/dd.c b/src/add-ons/input_server/methods/canna/rk/dd.c index cb5251686a..08f149f18d 100644 --- a/src/add-ons/input_server/methods/canna/rk/dd.c +++ b/src/add-ons/input_server/methods/canna/rk/dd.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) - static char rcsid[]="$Id: dd.c,v 1.1 2004/12/23 21:23:50 korli Exp $"; + static char rcsid[]="$Id: dd.c 10525 2004-12-23 21:23:50Z korli $"; #endif /*LINTLIBRARY*/ diff --git a/src/add-ons/input_server/methods/canna/rk/dic.c b/src/add-ons/input_server/methods/canna/rk/dic.c index ddfd97556c..dae6afa991 100644 --- a/src/add-ons/input_server/methods/canna/rk/dic.c +++ b/src/add-ons/input_server/methods/canna/rk/dic.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcsid[]="@(#) 102.1 $Id$"; +static char rcsid[]="@(#) 102.1 $Id: dic.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /*LINTLIBRARY*/ diff --git a/src/add-ons/input_server/methods/canna/rk/dicsw.c b/src/add-ons/input_server/methods/canna/rk/dicsw.c index dea4fc6137..3d564ce57f 100644 --- a/src/add-ons/input_server/methods/canna/rk/dicsw.c +++ b/src/add-ons/input_server/methods/canna/rk/dicsw.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcsid[]="$Id: dicsw.c,v 1.1 2004/12/23 21:23:50 korli Exp $"; +static char rcsid[]="$Id: dicsw.c 10525 2004-12-23 21:23:50Z korli $"; #endif /*LINTLIBRARY*/ diff --git a/src/add-ons/input_server/methods/canna/rk/fq.c b/src/add-ons/input_server/methods/canna/rk/fq.c index 9726ac6c49..2b630daae7 100644 --- a/src/add-ons/input_server/methods/canna/rk/fq.c +++ b/src/add-ons/input_server/methods/canna/rk/fq.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcsid[]="$Id: fq.c,v 1.1 2004/12/23 21:23:50 korli Exp $"; +static char rcsid[]="$Id: fq.c 10525 2004-12-23 21:23:50Z korli $"; #endif #include "RKintern.h" diff --git a/src/add-ons/input_server/methods/canna/rk/kana.c b/src/add-ons/input_server/methods/canna/rk/kana.c index a1cf8e803f..a9e834d942 100644 --- a/src/add-ons/input_server/methods/canna/rk/kana.c +++ b/src/add-ons/input_server/methods/canna/rk/kana.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcsid[]="@(#) 102.1 $Id: kana.c,v 1.1 2004/12/23 21:23:50 korli Exp $"; +static char rcsid[]="@(#) 102.1 $Id: kana.c 10525 2004-12-23 21:23:50Z korli $"; #endif /* LINTLIBRARY */ diff --git a/src/add-ons/input_server/methods/canna/rk/ncache.c b/src/add-ons/input_server/methods/canna/rk/ncache.c index 4c625eab18..4566f1c0c2 100644 --- a/src/add-ons/input_server/methods/canna/rk/ncache.c +++ b/src/add-ons/input_server/methods/canna/rk/ncache.c @@ -26,7 +26,7 @@ /* -static char rcsid[]="$Id: ncache.c,v 1.1 2004/12/23 21:23:50 korli Exp $"; +static char rcsid[]="$Id: ncache.c 10525 2004-12-23 21:23:50Z korli $"; */ #include "canna.h" #include "RK.h" diff --git a/src/add-ons/input_server/methods/canna/rk/ngram.c b/src/add-ons/input_server/methods/canna/rk/ngram.c index 51f6f340ae..ed435752f7 100644 --- a/src/add-ons/input_server/methods/canna/rk/ngram.c +++ b/src/add-ons/input_server/methods/canna/rk/ngram.c @@ -26,7 +26,7 @@ #if !defined(lint) && !defined(__CODECENTER__) -static char rcsid[]="$Id$"; +static char rcsid[]="$Id: ngram.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif #include diff --git a/src/add-ons/input_server/methods/canna/rk/nword.c b/src/add-ons/input_server/methods/canna/rk/nword.c index 10addc2f5d..595e6fbeea 100644 --- a/src/add-ons/input_server/methods/canna/rk/nword.c +++ b/src/add-ons/input_server/methods/canna/rk/nword.c @@ -27,7 +27,7 @@ #include #if !defined(lint) && !defined(__CODECENTER__) -static char rcsid[]="$Id$"; +static char rcsid[]="$Id: nword.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /* LINTLIBRARY */ diff --git a/src/add-ons/input_server/methods/canna/rk/permdic.c b/src/add-ons/input_server/methods/canna/rk/permdic.c index a72383d2ad..62fa6ae89e 100644 --- a/src/add-ons/input_server/methods/canna/rk/permdic.c +++ b/src/add-ons/input_server/methods/canna/rk/permdic.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) -static char rcs_id[] = "$Id$"; +static char rcs_id[] = "$Id: permdic.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif #include diff --git a/src/add-ons/input_server/methods/canna/rk/tempdic.c b/src/add-ons/input_server/methods/canna/rk/tempdic.c index 0ac09905cd..27ba17854d 100644 --- a/src/add-ons/input_server/methods/canna/rk/tempdic.c +++ b/src/add-ons/input_server/methods/canna/rk/tempdic.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(__CODECENTER__) - static char rcsid[]="$Id$"; + static char rcsid[]="$Id: tempdic.c 14875 2005-11-12 21:25:31Z bonefish $"; #endif /*LINTLIBRARY*/ diff --git a/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.cpp b/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.cpp index 3dba3a8b26..00de71d2b5 100644 --- a/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.cpp +++ b/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id$ + * $Id: SpamFilter.cpp 29284 2009-02-22 13:45:40Z bga $ * * SpamFilter - Uses Bayesian statistics to evaluate the spaminess of a * message. The evaluation is done by a separate server, this add-on just gets diff --git a/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.h b/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.h index 831459dd4d..fab2e9a9f8 100644 --- a/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.h +++ b/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilter.h @@ -1,7 +1,7 @@ #ifndef AGMS_BAYESIAN_SPAM_FILTER_H #define AGMS_BAYESIAN_SPAM_FILTER_H /****************************************************************************** - * $Id$ + * $Id: SpamFilter.h 13952 2005-08-13 19:31:42Z agmsmith $ * * SpamFilter - Uses Bayesian statistics to evaluate the spaminess of a * message. The evaluation is done by a separate server, this add-on just gets diff --git a/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp b/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp index 721e7aafa7..813306c3bd 100644 --- a/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp +++ b/src/add-ons/mail_daemon/inbound_filters/spam_filter/SpamFilterConfig.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id$ + * $Id: SpamFilterConfig.cpp 19449 2006-12-09 03:38:11Z darkwyrm $ * * SpamFilter's configuration view. Lets the user change various settings * related to the add-on, but not the spamdbm server. diff --git a/src/add-ons/media/plugins/ogg/libogg/bitwise.c b/src/add-ons/media/plugins/ogg/libogg/bitwise.c index fde3104369..151e42bd4a 100644 --- a/src/add-ons/media/plugins/ogg/libogg/bitwise.c +++ b/src/add-ons/media/plugins/ogg/libogg/bitwise.c @@ -11,7 +11,7 @@ ******************************************************************** function: packing variable sized words into an octet stream - last mod: $Id: bitwise.c,v 1.2 2004/02/24 13:52:39 shatty Exp $ + last mod: $Id: bitwise.c 6729 2004-02-24 13:52:39Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/ogg/libogg/framing.c b/src/add-ons/media/plugins/ogg/libogg/framing.c index 7c48137f87..8135805dc4 100644 --- a/src/add-ons/media/plugins/ogg/libogg/framing.c +++ b/src/add-ons/media/plugins/ogg/libogg/framing.c @@ -12,7 +12,7 @@ function: code raw [Vorbis] packets into framed OggSquish stream and decode Ogg streams back into raw packets - last mod: $Id: framing.c,v 1.2 2004/02/24 13:52:39 shatty Exp $ + last mod: $Id: framing.c 6729 2004-02-24 13:52:39Z shatty $ note: The CRC code is directly derived from public domain code by Ross Williams (ross@guest.adelaide.edu.au). See docs/framing.html diff --git a/src/add-ons/media/plugins/ogg/libogg/ogg/ogg.h b/src/add-ons/media/plugins/ogg/libogg/ogg/ogg.h index 304a04e2fd..908981d0c7 100644 --- a/src/add-ons/media/plugins/ogg/libogg/ogg/ogg.h +++ b/src/add-ons/media/plugins/ogg/libogg/ogg/ogg.h @@ -11,7 +11,7 @@ ******************************************************************** function: toplevel libogg include - last mod: $Id: ogg.h,v 1.2 2004/02/24 13:52:39 shatty Exp $ + last mod: $Id: ogg.h 6729 2004-02-24 13:52:39Z shatty $ ********************************************************************/ #ifndef _OGG_H diff --git a/src/add-ons/media/plugins/ogg/libogg/ogg/os_types.h b/src/add-ons/media/plugins/ogg/libogg/ogg/os_types.h index 884bc2f7c2..dbbb68578f 100644 --- a/src/add-ons/media/plugins/ogg/libogg/ogg/os_types.h +++ b/src/add-ons/media/plugins/ogg/libogg/ogg/os_types.h @@ -11,7 +11,7 @@ ******************************************************************** function: #ifdef jail to whip a few platforms into the UNIX ideal. - last mod: $Id$ + last mod: $Id: os_types.h 28305 2008-10-23 21:46:26Z bonefish $ ********************************************************************/ #ifndef _OS_TYPES_H diff --git a/src/add-ons/media/plugins/speex/libspeex/lsp.h b/src/add-ons/media/plugins/speex/libspeex/lsp.h index 1f3b02f694..2540495480 100644 --- a/src/add-ons/media/plugins/speex/libspeex/lsp.h +++ b/src/add-ons/media/plugins/speex/libspeex/lsp.h @@ -1,57 +1,57 @@ -/*---------------------------------------------------------------------------*\ -Original Copyright - FILE........: AK2LSPD.H - TYPE........: Turbo C header file - COMPANY.....: Voicetronix - AUTHOR......: James Whitehall - DATE CREATED: 21/11/95 - -Modified by Jean-Marc Valin - - This file contains functions for converting Linear Prediction - Coefficients (LPC) to Line Spectral Pair (LSP) and back. Note that the - LSP coefficients are not in radians format but in the x domain of the - unit circle. - -\*---------------------------------------------------------------------------*/ -/* Speex License: - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - - Neither the name of the Xiph.org Foundation nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef __AK2LSPD__ -#define __AK2LSPD__ - -int lpc_to_lsp (float *a, int lpcrdr, float *freq, int nb, float delta, char *stack); -void lsp_to_lpc(float *freq, float *ak, int lpcrdr, char *stack); - -/*Added by JMV*/ -void lsp_enforce_margin(float *lsp, int len, float margin); - - -#endif /* __AK2LSPD__ */ +/*---------------------------------------------------------------------------*\ +Original Copyright + FILE........: AK2LSPD.H + TYPE........: Turbo C header file + COMPANY.....: Voicetronix + AUTHOR......: James Whitehall + DATE CREATED: 21/11/95 + +Modified by Jean-Marc Valin + + This file contains functions for converting Linear Prediction + Coefficients (LPC) to Line Spectral Pair (LSP) and back. Note that the + LSP coefficients are not in radians format but in the x domain of the + unit circle. + +\*---------------------------------------------------------------------------*/ +/* Speex License: + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + - Neither the name of the Xiph.org Foundation nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef __AK2LSPD__ +#define __AK2LSPD__ + +int lpc_to_lsp (float *a, int lpcrdr, float *freq, int nb, float delta, char *stack); +void lsp_to_lpc(float *freq, float *ak, int lpcrdr, char *stack); + +/*Added by JMV*/ +void lsp_enforce_margin(float *lsp, int len, float margin); + + +#endif /* __AK2LSPD__ */ diff --git a/src/add-ons/media/plugins/theora/libtheora/decode.c b/src/add-ons/media/plugins/theora/libtheora/decode.c index 5619c505c9..66e64295a3 100644 --- a/src/add-ons/media/plugins/theora/libtheora/decode.c +++ b/src/add-ons/media/plugins/theora/libtheora/decode.c @@ -11,7 +11,7 @@ ******************************************************************** function: - last mod: $Id$ + last mod: $Id: decode.c 33343 2009-09-29 00:37:35Z phoudoin $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/theora/libtheora/encode.c b/src/add-ons/media/plugins/theora/libtheora/encode.c index 44f880cf15..10015204f2 100644 --- a/src/add-ons/media/plugins/theora/libtheora/encode.c +++ b/src/add-ons/media/plugins/theora/libtheora/encode.c @@ -11,7 +11,7 @@ ******************************************************************** function: - last mod: $Id$ + last mod: $Id: encode.c 33343 2009-09-29 00:37:35Z phoudoin $ ********************************************************************/ #include diff --git a/src/add-ons/media/plugins/theora/libtheora/huffman.h b/src/add-ons/media/plugins/theora/libtheora/huffman.h index c289a5db1b..f5aaba15c9 100644 --- a/src/add-ons/media/plugins/theora/libtheora/huffman.h +++ b/src/add-ons/media/plugins/theora/libtheora/huffman.h @@ -11,7 +11,7 @@ ******************************************************************** function: - last mod: $Id$ + last mod: $Id: huffman.h 33343 2009-09-29 00:37:35Z phoudoin $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/theora/libtheora/idct.c b/src/add-ons/media/plugins/theora/libtheora/idct.c index 8385733d12..155a3d13cc 100644 --- a/src/add-ons/media/plugins/theora/libtheora/idct.c +++ b/src/add-ons/media/plugins/theora/libtheora/idct.c @@ -11,7 +11,7 @@ ******************************************************************** function: - last mod: $Id$ + last mod: $Id: idct.c 33343 2009-09-29 00:37:35Z phoudoin $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/theora/libtheora/quant.c b/src/add-ons/media/plugins/theora/libtheora/quant.c index 2be01ceec1..7fe79f4cdc 100644 --- a/src/add-ons/media/plugins/theora/libtheora/quant.c +++ b/src/add-ons/media/plugins/theora/libtheora/quant.c @@ -11,7 +11,7 @@ ******************************************************************** function: - last mod: $Id$ + last mod: $Id: quant.c 33343 2009-09-29 00:37:35Z phoudoin $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/theora/libtheora/theora/theora.h b/src/add-ons/media/plugins/theora/libtheora/theora/theora.h index 7ba672ae8c..0a1979041a 100644 --- a/src/add-ons/media/plugins/theora/libtheora/theora/theora.h +++ b/src/add-ons/media/plugins/theora/libtheora/theora/theora.h @@ -11,7 +11,7 @@ ******************************************************************** function: - last mod: $Id$ + last mod: $Id: theora.h 33343 2009-09-29 00:37:35Z phoudoin $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/analysis.c b/src/add-ons/media/plugins/vorbis/libvorbis/analysis.c index 7193b6a364..b8ffd453fa 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/analysis.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/analysis.c @@ -11,7 +11,7 @@ ******************************************************************** function: single-block PCM analysis mode dispatch - last mod: $Id: analysis.c,v 1.1 2003/12/13 20:17:55 shatty Exp $ + last mod: $Id: analysis.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/backends.h b/src/add-ons/media/plugins/vorbis/libvorbis/backends.h index d0a2534cba..1b510717ff 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/backends.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/backends.h @@ -12,7 +12,7 @@ function: libvorbis backend and mapping structures; needed for static mode headers - last mod: $Id: backends.h,v 1.1 2003/12/13 20:17:55 shatty Exp $ + last mod: $Id: backends.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/barkmel.c b/src/add-ons/media/plugins/vorbis/libvorbis/barkmel.c index 28c36ea399..c2293fd17f 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/barkmel.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/barkmel.c @@ -11,7 +11,7 @@ ******************************************************************** function: bark scale utility - last mod: $Id: barkmel.c,v 1.1 2003/12/13 20:17:55 shatty Exp $ + last mod: $Id: barkmel.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/bitrate.c b/src/add-ons/media/plugins/vorbis/libvorbis/bitrate.c index be366479d9..8fc100204b 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/bitrate.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/bitrate.c @@ -11,7 +11,7 @@ ******************************************************************** function: bitrate tracking and management - last mod: $Id: bitrate.c,v 1.1 2003/12/13 20:17:55 shatty Exp $ + last mod: $Id: bitrate.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/bitrate.h b/src/add-ons/media/plugins/vorbis/libvorbis/bitrate.h index c4f0d70be3..33e712e0da 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/bitrate.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/bitrate.h @@ -11,7 +11,7 @@ ******************************************************************** function: bitrate tracking and management - last mod: $Id: bitrate.h,v 1.1 2003/12/13 20:17:55 shatty Exp $ + last mod: $Id: bitrate.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/block.c b/src/add-ons/media/plugins/vorbis/libvorbis/block.c index 376014ef99..c9561870eb 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/block.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/block.c @@ -11,7 +11,7 @@ ******************************************************************** function: PCM data vector blocking, windowing and dis/reassembly - last mod: $Id: block.c,v 1.1 2003/12/13 20:17:55 shatty Exp $ + last mod: $Id: block.c 5664 2003-12-13 20:17:56Z shatty $ Handle windowing, overlap-add, etc of the PCM vectors. This is made more amusing by Vorbis' current two allowed block sizes. diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/codebook.c b/src/add-ons/media/plugins/vorbis/libvorbis/codebook.c index 97dd3e12f4..c046cd0e85 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/codebook.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/codebook.c @@ -11,7 +11,7 @@ ******************************************************************** function: basic codebook pack/unpack/code/decode operations - last mod: $Id: codebook.c,v 1.1 2003/12/13 20:17:55 shatty Exp $ + last mod: $Id: codebook.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/codebook.h b/src/add-ons/media/plugins/vorbis/libvorbis/codebook.h index f71592b4e6..43ce38a6e7 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/codebook.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/codebook.h @@ -11,7 +11,7 @@ ******************************************************************** function: basic shared codebook operations - last mod: $Id: codebook.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: codebook.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/codec_internal.h b/src/add-ons/media/plugins/vorbis/libvorbis/codec_internal.h index c3a2330eca..1b40a11fab 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/codec_internal.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/codec_internal.h @@ -11,7 +11,7 @@ ******************************************************************** function: libvorbis codec headers - last mod: $Id: codec_internal.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: codec_internal.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/envelope.c b/src/add-ons/media/plugins/vorbis/libvorbis/envelope.c index bd6537eb4d..125264eef6 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/envelope.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/envelope.c @@ -11,7 +11,7 @@ ******************************************************************** function: PCM data envelope analysis - last mod: $Id: envelope.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: envelope.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/envelope.h b/src/add-ons/media/plugins/vorbis/libvorbis/envelope.h index 2cc9c6fbc4..c2e0696d39 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/envelope.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/envelope.h @@ -11,7 +11,7 @@ ******************************************************************** function: PCM data envelope analysis and manipulation - last mod: $Id: envelope.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: envelope.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/floor0.c b/src/add-ons/media/plugins/vorbis/libvorbis/floor0.c index bb021fa3ef..30f7c7125d 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/floor0.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/floor0.c @@ -11,7 +11,7 @@ ******************************************************************** function: floor backend 0 implementation - last mod: $Id: floor0.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: floor0.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/floor1.c b/src/add-ons/media/plugins/vorbis/libvorbis/floor1.c index e2a9fd5112..59bb91aae2 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/floor1.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/floor1.c @@ -11,7 +11,7 @@ ******************************************************************** function: floor backend 1 implementation - last mod: $Id: floor1.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: floor1.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/highlevel.h b/src/add-ons/media/plugins/vorbis/libvorbis/highlevel.h index 357b4ecddf..a9fcf9e2a2 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/highlevel.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/highlevel.h @@ -11,7 +11,7 @@ ******************************************************************** function: highlevel encoder setup struct seperated out for vorbisenc clarity - last mod: $Id: highlevel.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: highlevel.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/info.c b/src/add-ons/media/plugins/vorbis/libvorbis/info.c index 75a96d2720..ead92d2f93 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/info.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/info.c @@ -11,7 +11,7 @@ ******************************************************************** function: maintain the info structure, info <-> header packets - last mod: $Id: info.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: info.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/lookup.c b/src/add-ons/media/plugins/vorbis/libvorbis/lookup.c index f67671eac3..4e073dc9d1 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/lookup.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/lookup.c @@ -11,7 +11,7 @@ ******************************************************************** function: lookup based functions - last mod: $Id: lookup.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: lookup.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/lookup.h b/src/add-ons/media/plugins/vorbis/libvorbis/lookup.h index a9b5567faf..5980ce8fe4 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/lookup.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/lookup.h @@ -11,7 +11,7 @@ ******************************************************************** function: lookup based functions - last mod: $Id: lookup.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: lookup.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/lookup_data.h b/src/add-ons/media/plugins/vorbis/libvorbis/lookup_data.h index d3b5bec188..4674b296c7 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/lookup_data.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/lookup_data.h @@ -11,7 +11,7 @@ ******************************************************************** function: lookup data; generated by lookups.pl; edit there - last mod: $Id: lookup_data.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: lookup_data.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/lpc.c b/src/add-ons/media/plugins/vorbis/libvorbis/lpc.c index 750efa587c..9df9e1cda8 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/lpc.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/lpc.c @@ -11,7 +11,7 @@ ******************************************************************** function: LPC low level routines - last mod: $Id: lpc.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: lpc.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/lpc.h b/src/add-ons/media/plugins/vorbis/libvorbis/lpc.h index 38f5231a39..03da2c13f4 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/lpc.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/lpc.h @@ -11,7 +11,7 @@ ******************************************************************** function: LPC low level routines - last mod: $Id: lpc.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: lpc.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/lsp.c b/src/add-ons/media/plugins/vorbis/libvorbis/lsp.c index 3f2f3da143..4214dda45b 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/lsp.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/lsp.c @@ -11,7 +11,7 @@ ******************************************************************** function: LSP (also called LSF) conversion routines - last mod: $Id: lsp.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: lsp.c 5664 2003-12-13 20:17:56Z shatty $ The LSP generation code is taken (with minimal modification and a few bugfixes) from "On the Computation of the LSP Frequencies" by diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/lsp.h b/src/add-ons/media/plugins/vorbis/libvorbis/lsp.h index d5799145c4..10ce2c0ca2 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/lsp.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/lsp.h @@ -11,7 +11,7 @@ ******************************************************************** function: LSP (also called LSF) conversion routines - last mod: $Id: lsp.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: lsp.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/mapping0.c b/src/add-ons/media/plugins/vorbis/libvorbis/mapping0.c index 13d8f25eed..f36cecf7b6 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/mapping0.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/mapping0.c @@ -11,7 +11,7 @@ ******************************************************************** function: channel mapping 0 implementation - last mod: $Id: mapping0.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: mapping0.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/masking.h b/src/add-ons/media/plugins/vorbis/libvorbis/masking.h index 4da7e93681..ac5bfb048f 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/masking.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/masking.h @@ -11,7 +11,7 @@ ******************************************************************** function: masking curve data for psychoacoustics - last mod: $Id: masking.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: masking.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/mdct.c b/src/add-ons/media/plugins/vorbis/libvorbis/mdct.c index 83d7cfe355..3670c759e5 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/mdct.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/mdct.c @@ -12,7 +12,7 @@ function: normalized modified discrete cosine transform power of two length transform only [64 <= n ] - last mod: $Id: mdct.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: mdct.c 5664 2003-12-13 20:17:56Z shatty $ Original algorithm adapted long ago from _The use of multirate filter banks for coding of high quality digital audio_, by T. Sporer, diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/mdct.h b/src/add-ons/media/plugins/vorbis/libvorbis/mdct.h index 18be976327..2f4426fa2c 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/mdct.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/mdct.h @@ -11,7 +11,7 @@ ******************************************************************** function: modified discrete cosine transform prototypes - last mod: $Id: mdct.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: mdct.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/misc.h b/src/add-ons/media/plugins/vorbis/libvorbis/misc.h index f6fff29314..cb1146713c 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/misc.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/misc.h @@ -11,7 +11,7 @@ ******************************************************************** function: miscellaneous prototypes - last mod: $Id: misc.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: misc.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/os.h b/src/add-ons/media/plugins/vorbis/libvorbis/os.h index cf9a02f209..5110a04774 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/os.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/os.h @@ -13,7 +13,7 @@ ******************************************************************** function: #ifdef jail to whip a few platforms into the UNIX ideal. - last mod: $Id$ + last mod: $Id: os.h 28305 2008-10-23 21:46:26Z bonefish $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/psy.c b/src/add-ons/media/plugins/vorbis/libvorbis/psy.c index 67dbd11e27..8541ce9f32 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/psy.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/psy.c @@ -11,7 +11,7 @@ ******************************************************************** function: psychoacoustics not including preecho - last mod: $Id: psy.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: psy.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/psy.h b/src/add-ons/media/plugins/vorbis/libvorbis/psy.h index 4fd953f7a9..777278d732 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/psy.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/psy.h @@ -11,7 +11,7 @@ ******************************************************************** function: random psychoacoustics (not including preecho) - last mod: $Id: psy.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: psy.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/psytune.c b/src/add-ons/media/plugins/vorbis/libvorbis/psytune.c index ffcbf656c9..a61929364e 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/psytune.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/psytune.c @@ -12,7 +12,7 @@ function: simple utility that runs audio through the psychoacoustics without encoding - last mod: $Id: psytune.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: psytune.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/registry.c b/src/add-ons/media/plugins/vorbis/libvorbis/registry.c index a7172c38ee..3b02216acf 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/registry.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/registry.c @@ -11,7 +11,7 @@ ******************************************************************** function: registry for time, floor, res backends and channel mappings - last mod: $Id: registry.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: registry.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/registry.h b/src/add-ons/media/plugins/vorbis/libvorbis/registry.h index f09d61fd44..d10328391c 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/registry.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/registry.h @@ -11,7 +11,7 @@ ******************************************************************** function: registry for time, floor, res backends and channel mappings - last mod: $Id: registry.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: registry.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/res0.c b/src/add-ons/media/plugins/vorbis/libvorbis/res0.c index 1d75b925b1..e58efa4a00 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/res0.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/res0.c @@ -11,7 +11,7 @@ ******************************************************************** function: residue backend 0, 1 and 2 implementation - last mod: $Id: res0.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: res0.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/scales.h b/src/add-ons/media/plugins/vorbis/libvorbis/scales.h index 6c22e4e188..436e52c925 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/scales.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/scales.h @@ -11,7 +11,7 @@ ******************************************************************** function: linear scale -> dB, Bark and Mel scales - last mod: $Id: scales.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: scales.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/sharedbook.c b/src/add-ons/media/plugins/vorbis/libvorbis/sharedbook.c index 7a026a5de6..1797c06033 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/sharedbook.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/sharedbook.c @@ -11,7 +11,7 @@ ******************************************************************** function: basic shared codebook operations - last mod: $Id: sharedbook.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: sharedbook.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/smallft.c b/src/add-ons/media/plugins/vorbis/libvorbis/smallft.c index f96dc496ab..abb829685d 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/smallft.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/smallft.c @@ -11,7 +11,7 @@ ******************************************************************** function: *unnormalized* fft transform - last mod: $Id: smallft.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: smallft.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/smallft.h b/src/add-ons/media/plugins/vorbis/libvorbis/smallft.h index 1a1e38763a..0c39bad2e6 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/smallft.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/smallft.h @@ -11,7 +11,7 @@ ******************************************************************** function: fft transform - last mod: $Id: smallft.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: smallft.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/synthesis.c b/src/add-ons/media/plugins/vorbis/libvorbis/synthesis.c index 1742c27d05..c469812635 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/synthesis.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/synthesis.c @@ -11,7 +11,7 @@ ******************************************************************** function: single-block PCM synthesis - last mod: $Id: synthesis.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: synthesis.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/vorbis/codec.h b/src/add-ons/media/plugins/vorbis/libvorbis/vorbis/codec.h index dfaa9a2691..a8f2952469 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/vorbis/codec.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/vorbis/codec.h @@ -11,7 +11,7 @@ ******************************************************************** function: libvorbis codec headers - last mod: $Id: codec.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: codec.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/vorbisenc.c b/src/add-ons/media/plugins/vorbis/libvorbis/vorbisenc.c index 2da0afe93b..ed16e34cef 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/vorbisenc.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/vorbisenc.c @@ -11,7 +11,7 @@ ******************************************************************** function: simple programmatic interface for encoder mode setup - last mod: $Id: vorbisenc.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: vorbisenc.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/vorbisfile.c b/src/add-ons/media/plugins/vorbis/libvorbis/vorbisfile.c index d5e9812ce5..e19d955567 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/vorbisfile.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/vorbisfile.c @@ -11,7 +11,7 @@ ******************************************************************** function: stdio-based convenience library for opening/seeking/decoding - last mod: $Id: vorbisfile.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: vorbisfile.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/window.c b/src/add-ons/media/plugins/vorbis/libvorbis/window.c index bbe11ea8cf..22194cd507 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/window.c +++ b/src/add-ons/media/plugins/vorbis/libvorbis/window.c @@ -11,7 +11,7 @@ ******************************************************************** function: window functions - last mod: $Id: window.c,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: window.c 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/media/plugins/vorbis/libvorbis/window.h b/src/add-ons/media/plugins/vorbis/libvorbis/window.h index d1f4f4553e..857640a625 100644 --- a/src/add-ons/media/plugins/vorbis/libvorbis/window.h +++ b/src/add-ons/media/plugins/vorbis/libvorbis/window.h @@ -11,7 +11,7 @@ ******************************************************************** function: window functions - last mod: $Id: window.h,v 1.1 2003/12/13 20:17:56 shatty Exp $ + last mod: $Id: window.h 5664 2003-12-13 20:17:56Z shatty $ ********************************************************************/ diff --git a/src/add-ons/print/drivers/canon_lips/lips3/Lips3.cpp b/src/add-ons/print/drivers/canon_lips/lips3/Lips3.cpp index 3c44bdedd4..0b43d29808 100644 --- a/src/add-ons/print/drivers/canon_lips/lips3/Lips3.cpp +++ b/src/add-ons/print/drivers/canon_lips/lips3/Lips3.cpp @@ -1,424 +1,424 @@ -/* - * Lips3.cpp - * Copyright 1999-2000 Y.Takagi. All Rights Reserved. - */ - -#include -#include -#include -#include -#include "Lips3.h" -#include "UIDriver.h" -#include "Compress3.h" -#include "JobData.h" -#include "PrinterData.h" -#include "Lips3Cap.h" -#include "Halftone.h" -#include "ValidRect.h" -#include "DbgMsg.h" - -#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE)) -using namespace std; -#else -#define std -#endif - -LIPS3Driver::LIPS3Driver(BMessage *msg, PrinterData *printer_data, const PrinterCap *printer_cap) - : GraphicsDriver(msg, printer_data, printer_cap) -{ - fHalftone = NULL; -} - -bool LIPS3Driver::startDoc() -{ - try { - beginTextMode(); - jobStart(); - softReset(); - sizeUnitMode(); - selectSizeUnit(); - selectPageFormat(); - paperFeedMode(); - disableAutoFF(); - setNumberOfCopies(); - fHalftone = new Halftone(getJobData()->getSurfaceType(), getJobData()->getGamma(), getJobData()->getInkDensity(), getJobData()->getDitherType()); - return true; - } - catch (TransportException &err) { - return false; - } -} - -bool LIPS3Driver::startPage(int) -{ - try { - fCurrentX = 0; - fCurrentY = 0; - memorizedPosition(); - return true; - } - catch (TransportException &err) { - return false; - } -} - -bool LIPS3Driver::endPage(int) -{ - try { - formFeed(); - return true; - } - catch (TransportException &err) { - return false; - } -} - -bool LIPS3Driver::endDoc(bool) -{ - try { - if (fHalftone) { - delete fHalftone; - } - jobEnd(); - return true; - } - catch (TransportException &err) { - return false; - } -} - -bool LIPS3Driver::nextBand(BBitmap *bitmap, BPoint *offset) -{ - DBGMSG(("> nextBand\n")); - - try { - BRect bounds = bitmap->Bounds(); - - RECT rc; - rc.left = (int)bounds.left; - rc.top = (int)bounds.top; - rc.right = (int)bounds.right; - rc.bottom = (int)bounds.bottom; - - int height = rc.bottom - rc.top + 1; - - int x = (int)offset->x; - int y = (int)offset->y; - - int page_height = getPageHeight(); - - if (y + height > page_height) { - height = page_height - y; - } - - rc.bottom = height - 1; - - DBGMSG(("height = %d\n", height)); - DBGMSG(("x = %d\n", x)); - DBGMSG(("y = %d\n", y)); - - if (get_valid_rect(bitmap, &rc)) { - - DBGMSG(("validate rect = %d, %d, %d, %d\n", - rc.left, rc.top, rc.right, rc.bottom)); - - x = rc.left; - y += rc.top; - - int width = rc.right - rc.left + 1; - int widthByte = (width + 7) / 8; /* byte boundary */ - int height = rc.bottom - rc.top + 1; - int in_size = widthByte * height; - int out_size = (in_size * 6 + 4) / 5; - int delta = bitmap->BytesPerRow(); - - DBGMSG(("width = %d\n", width)); - DBGMSG(("widthByte = %d\n", widthByte)); - DBGMSG(("height = %d\n", height)); - DBGMSG(("in_size = %d\n", in_size)); - DBGMSG(("out_size = %d\n", out_size)); - DBGMSG(("delta = %d\n", delta)); - DBGMSG(("renderobj->get_pixel_depth() = %d\n", fHalftone->getPixelDepth())); - - uchar *ptr = (uchar *)bitmap->Bits() - + rc.top * delta - + (rc.left * fHalftone->getPixelDepth()) / 8; - - int compression_method; - int compressed_size; - const uchar *buffer; - - uchar *in_buffer = new uchar[in_size]; - uchar *out_buffer = new uchar[out_size]; - - auto_ptr _in_buffer (in_buffer); - auto_ptr _out_buffer(out_buffer); - - uchar *ptr2 = (uchar *)in_buffer; - - DBGMSG(("move\n")); - - move(x, y); - - for (int i = rc.top; i <= rc.bottom; i++) { - fHalftone->dither(ptr2, ptr, x, y, width); - ptr += delta; - ptr2 += widthByte; - y++; - } - - compressed_size = compress3(out_buffer, in_buffer, in_size); - - if (compressed_size < in_size) { - compression_method = 9; /* compress3 */ - buffer = out_buffer; - } else if (compressed_size > out_size) { - BAlert *alert = new BAlert("memory overrun!!!", "warning", "OK"); - alert->Go(); - return false; - } else { - compression_method = 0; - buffer = in_buffer; - compressed_size = in_size; - } - - DBGMSG(("compressed_size = %d\n", compressed_size)); - DBGMSG(("widthByte = %d\n", widthByte)); - DBGMSG(("height = %d\n", height)); - DBGMSG(("compression_method = %d\n", compression_method)); - - rasterGraphics( - compressed_size, // size, - widthByte, // widthByte - height, // height, - compression_method, - buffer); - - } else { - DBGMSG(("band bitmap is clean.\n")); - } - - if (y >= page_height) { - offset->x = -1.0; - offset->y = -1.0; - } else { - offset->y += height; - } - - DBGMSG(("< nextBand\n")); - return true; - } - catch (TransportException &err) { - BAlert *alert = new BAlert("", err.what(), "OK"); - alert->Go(); - return false; - } -} - -void LIPS3Driver::beginTextMode() -{ - writeSpoolString("\033%%@"); -} - -void LIPS3Driver::jobStart() -{ - writeSpoolString("\033P31;300;1J\033\\"); -} - -void LIPS3Driver::softReset() -{ - writeSpoolString("\033<"); -} - -void LIPS3Driver::sizeUnitMode() -{ - writeSpoolString("\033[11h"); -} - -void LIPS3Driver::selectSizeUnit() -{ - writeSpoolString("\033[7 I"); -} - -void LIPS3Driver::selectPageFormat() -{ - int i; - int width = 0; - int height = 0; - - switch (getJobData()->getPaper()) { - case JobData::kA3: - i = 12; - break; - - case JobData::kA4: - i = 14; - break; - - case JobData::kA5: - i = 16; - break; - - case JobData::kJapanesePostcard: - i = 18; - break; - - case JobData::kB4: - i = 24; - break; - - case JobData::kB5: - i = 26; - break; - - case JobData::kLetter: - i = 30; - break; - - case JobData::kLegal: - i = 32; - break; - -// case JobData::kExecutive: -// i = 40; -// break; -// -// case JobData::kJEnvYou4: -// i = 50; -// break; -// -// case JobData::kUser: -// i = 90; -// break; -// - default: - i = 80; - width = getJobData()->getPaperRect().IntegerWidth(); - height = getJobData()->getPaperRect().IntegerHeight(); - break; - } - - if (JobData::kLandscape == getJobData()->getOrientation()) - i++; - - if (i < 80) { - writeSpoolString("\033[%d;;p", i); - } else { - writeSpoolString("\033[%d;%d;%dp", i, height, width); - } -} - -void LIPS3Driver::paperFeedMode() -{ - // 0 auto - // -------------- - // 1 MP tray - // 2 lower - // 3 lupper - // -------------- - // 10 MP tray - // 11 casette 1 - // 12 casette 2 - // 13 casette 3 - // 14 casette 4 - // 15 casette 5 - // 16 casette 6 - // 17 casette 7 - - int i; - - switch (getJobData()->getPaperSource()) { - case JobData::kManual: - i = 1; - break; - case JobData::kLower: - i = 2; - break; - case JobData::kUpper: - i = 3; - break; - case JobData::kAuto: - default: - i = 0; - break; - } - - writeSpoolString("\033[%dq", i); -} - -void LIPS3Driver::disableAutoFF() -{ - writeSpoolString("\033[?2h"); -} - -void LIPS3Driver::setNumberOfCopies() -{ - writeSpoolString("\033[%ldv", getJobData()->getCopies()); -} - -void LIPS3Driver::memorizedPosition() -{ - writeSpoolString("\033[0;1;0x"); -} - -void LIPS3Driver::moveAbsoluteHorizontal(int x) -{ - writeSpoolString("\033[%d`", x); -} - -void LIPS3Driver::carriageReturn() -{ - writeSpoolChar('\x0d'); -} - -void LIPS3Driver::moveDown(int dy) -{ - writeSpoolString("\033[%de", dy); -} - -void LIPS3Driver::rasterGraphics( - int compression_size, - int widthbyte, - int height, - int compression_method, - const uchar *buffer) -{ -// 0 RAW -// 9 compress-3 - writeSpoolString( - "\033[%d;%d;%d;%d;%d.r", - compression_size, - widthbyte, - getJobData()->getXres(), - compression_method, - height); - - writeSpoolData(buffer, compression_size); -} - -void LIPS3Driver::formFeed() -{ - writeSpoolChar('\014'); -} - -void LIPS3Driver::jobEnd() -{ - writeSpoolString("\033P0J\033\\"); -} - -void LIPS3Driver::move(int x, int y) -{ - if (fCurrentX != x) { - if (x) { - moveAbsoluteHorizontal(x); - } else { - carriageReturn(); - } - fCurrentX = x; - } - if (fCurrentY != y) { - int dy = y - fCurrentY; - moveDown(dy); - fCurrentY = y; - } -} +/* + * Lips3.cpp + * Copyright 1999-2000 Y.Takagi. All Rights Reserved. + */ + +#include +#include +#include +#include +#include "Lips3.h" +#include "UIDriver.h" +#include "Compress3.h" +#include "JobData.h" +#include "PrinterData.h" +#include "Lips3Cap.h" +#include "Halftone.h" +#include "ValidRect.h" +#include "DbgMsg.h" + +#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE)) +using namespace std; +#else +#define std +#endif + +LIPS3Driver::LIPS3Driver(BMessage *msg, PrinterData *printer_data, const PrinterCap *printer_cap) + : GraphicsDriver(msg, printer_data, printer_cap) +{ + fHalftone = NULL; +} + +bool LIPS3Driver::startDoc() +{ + try { + beginTextMode(); + jobStart(); + softReset(); + sizeUnitMode(); + selectSizeUnit(); + selectPageFormat(); + paperFeedMode(); + disableAutoFF(); + setNumberOfCopies(); + fHalftone = new Halftone(getJobData()->getSurfaceType(), getJobData()->getGamma(), getJobData()->getInkDensity(), getJobData()->getDitherType()); + return true; + } + catch (TransportException &err) { + return false; + } +} + +bool LIPS3Driver::startPage(int) +{ + try { + fCurrentX = 0; + fCurrentY = 0; + memorizedPosition(); + return true; + } + catch (TransportException &err) { + return false; + } +} + +bool LIPS3Driver::endPage(int) +{ + try { + formFeed(); + return true; + } + catch (TransportException &err) { + return false; + } +} + +bool LIPS3Driver::endDoc(bool) +{ + try { + if (fHalftone) { + delete fHalftone; + } + jobEnd(); + return true; + } + catch (TransportException &err) { + return false; + } +} + +bool LIPS3Driver::nextBand(BBitmap *bitmap, BPoint *offset) +{ + DBGMSG(("> nextBand\n")); + + try { + BRect bounds = bitmap->Bounds(); + + RECT rc; + rc.left = (int)bounds.left; + rc.top = (int)bounds.top; + rc.right = (int)bounds.right; + rc.bottom = (int)bounds.bottom; + + int height = rc.bottom - rc.top + 1; + + int x = (int)offset->x; + int y = (int)offset->y; + + int page_height = getPageHeight(); + + if (y + height > page_height) { + height = page_height - y; + } + + rc.bottom = height - 1; + + DBGMSG(("height = %d\n", height)); + DBGMSG(("x = %d\n", x)); + DBGMSG(("y = %d\n", y)); + + if (get_valid_rect(bitmap, &rc)) { + + DBGMSG(("validate rect = %d, %d, %d, %d\n", + rc.left, rc.top, rc.right, rc.bottom)); + + x = rc.left; + y += rc.top; + + int width = rc.right - rc.left + 1; + int widthByte = (width + 7) / 8; /* byte boundary */ + int height = rc.bottom - rc.top + 1; + int in_size = widthByte * height; + int out_size = (in_size * 6 + 4) / 5; + int delta = bitmap->BytesPerRow(); + + DBGMSG(("width = %d\n", width)); + DBGMSG(("widthByte = %d\n", widthByte)); + DBGMSG(("height = %d\n", height)); + DBGMSG(("in_size = %d\n", in_size)); + DBGMSG(("out_size = %d\n", out_size)); + DBGMSG(("delta = %d\n", delta)); + DBGMSG(("renderobj->get_pixel_depth() = %d\n", fHalftone->getPixelDepth())); + + uchar *ptr = (uchar *)bitmap->Bits() + + rc.top * delta + + (rc.left * fHalftone->getPixelDepth()) / 8; + + int compression_method; + int compressed_size; + const uchar *buffer; + + uchar *in_buffer = new uchar[in_size]; + uchar *out_buffer = new uchar[out_size]; + + auto_ptr _in_buffer (in_buffer); + auto_ptr _out_buffer(out_buffer); + + uchar *ptr2 = (uchar *)in_buffer; + + DBGMSG(("move\n")); + + move(x, y); + + for (int i = rc.top; i <= rc.bottom; i++) { + fHalftone->dither(ptr2, ptr, x, y, width); + ptr += delta; + ptr2 += widthByte; + y++; + } + + compressed_size = compress3(out_buffer, in_buffer, in_size); + + if (compressed_size < in_size) { + compression_method = 9; /* compress3 */ + buffer = out_buffer; + } else if (compressed_size > out_size) { + BAlert *alert = new BAlert("memory overrun!!!", "warning", "OK"); + alert->Go(); + return false; + } else { + compression_method = 0; + buffer = in_buffer; + compressed_size = in_size; + } + + DBGMSG(("compressed_size = %d\n", compressed_size)); + DBGMSG(("widthByte = %d\n", widthByte)); + DBGMSG(("height = %d\n", height)); + DBGMSG(("compression_method = %d\n", compression_method)); + + rasterGraphics( + compressed_size, // size, + widthByte, // widthByte + height, // height, + compression_method, + buffer); + + } else { + DBGMSG(("band bitmap is clean.\n")); + } + + if (y >= page_height) { + offset->x = -1.0; + offset->y = -1.0; + } else { + offset->y += height; + } + + DBGMSG(("< nextBand\n")); + return true; + } + catch (TransportException &err) { + BAlert *alert = new BAlert("", err.what(), "OK"); + alert->Go(); + return false; + } +} + +void LIPS3Driver::beginTextMode() +{ + writeSpoolString("\033%%@"); +} + +void LIPS3Driver::jobStart() +{ + writeSpoolString("\033P31;300;1J\033\\"); +} + +void LIPS3Driver::softReset() +{ + writeSpoolString("\033<"); +} + +void LIPS3Driver::sizeUnitMode() +{ + writeSpoolString("\033[11h"); +} + +void LIPS3Driver::selectSizeUnit() +{ + writeSpoolString("\033[7 I"); +} + +void LIPS3Driver::selectPageFormat() +{ + int i; + int width = 0; + int height = 0; + + switch (getJobData()->getPaper()) { + case JobData::kA3: + i = 12; + break; + + case JobData::kA4: + i = 14; + break; + + case JobData::kA5: + i = 16; + break; + + case JobData::kJapanesePostcard: + i = 18; + break; + + case JobData::kB4: + i = 24; + break; + + case JobData::kB5: + i = 26; + break; + + case JobData::kLetter: + i = 30; + break; + + case JobData::kLegal: + i = 32; + break; + +// case JobData::kExecutive: +// i = 40; +// break; +// +// case JobData::kJEnvYou4: +// i = 50; +// break; +// +// case JobData::kUser: +// i = 90; +// break; +// + default: + i = 80; + width = getJobData()->getPaperRect().IntegerWidth(); + height = getJobData()->getPaperRect().IntegerHeight(); + break; + } + + if (JobData::kLandscape == getJobData()->getOrientation()) + i++; + + if (i < 80) { + writeSpoolString("\033[%d;;p", i); + } else { + writeSpoolString("\033[%d;%d;%dp", i, height, width); + } +} + +void LIPS3Driver::paperFeedMode() +{ + // 0 auto + // -------------- + // 1 MP tray + // 2 lower + // 3 lupper + // -------------- + // 10 MP tray + // 11 casette 1 + // 12 casette 2 + // 13 casette 3 + // 14 casette 4 + // 15 casette 5 + // 16 casette 6 + // 17 casette 7 + + int i; + + switch (getJobData()->getPaperSource()) { + case JobData::kManual: + i = 1; + break; + case JobData::kLower: + i = 2; + break; + case JobData::kUpper: + i = 3; + break; + case JobData::kAuto: + default: + i = 0; + break; + } + + writeSpoolString("\033[%dq", i); +} + +void LIPS3Driver::disableAutoFF() +{ + writeSpoolString("\033[?2h"); +} + +void LIPS3Driver::setNumberOfCopies() +{ + writeSpoolString("\033[%ldv", getJobData()->getCopies()); +} + +void LIPS3Driver::memorizedPosition() +{ + writeSpoolString("\033[0;1;0x"); +} + +void LIPS3Driver::moveAbsoluteHorizontal(int x) +{ + writeSpoolString("\033[%d`", x); +} + +void LIPS3Driver::carriageReturn() +{ + writeSpoolChar('\x0d'); +} + +void LIPS3Driver::moveDown(int dy) +{ + writeSpoolString("\033[%de", dy); +} + +void LIPS3Driver::rasterGraphics( + int compression_size, + int widthbyte, + int height, + int compression_method, + const uchar *buffer) +{ +// 0 RAW +// 9 compress-3 + writeSpoolString( + "\033[%d;%d;%d;%d;%d.r", + compression_size, + widthbyte, + getJobData()->getXres(), + compression_method, + height); + + writeSpoolData(buffer, compression_size); +} + +void LIPS3Driver::formFeed() +{ + writeSpoolChar('\014'); +} + +void LIPS3Driver::jobEnd() +{ + writeSpoolString("\033P0J\033\\"); +} + +void LIPS3Driver::move(int x, int y) +{ + if (fCurrentX != x) { + if (x) { + moveAbsoluteHorizontal(x); + } else { + carriageReturn(); + } + fCurrentX = x; + } + if (fCurrentY != y) { + int dy = y - fCurrentY; + moveDown(dy); + fCurrentY = y; + } +} diff --git a/src/add-ons/print/drivers/canon_lips/lips3/Lips3.h b/src/add-ons/print/drivers/canon_lips/lips3/Lips3.h index 102a571ed3..5f7e0a6e88 100644 --- a/src/add-ons/print/drivers/canon_lips/lips3/Lips3.h +++ b/src/add-ons/print/drivers/canon_lips/lips3/Lips3.h @@ -1,53 +1,53 @@ -/* - * Lips3.h - * Copyright 1999-2000 Y.Takagi. All Rights Reserved. - */ - -#ifndef __LIPS3_H -#define __LIPS3_H - -#include "GraphicsDriver.h" - -class Halftone; - -class LIPS3Driver : public GraphicsDriver { -public: - LIPS3Driver(BMessage *msg, PrinterData *printer_data, const PrinterCap *printer_cap); - -protected: - virtual bool startDoc(); - virtual bool startPage(int page); - virtual bool nextBand(BBitmap *bitmap, BPoint *offset); - virtual bool endPage(int page); - virtual bool endDoc(bool success); - -private: - void move(int x, int y); - void beginTextMode(); - void jobStart(); - void softReset(); - void sizeUnitMode(); - void selectSizeUnit(); - void paperFeedMode(); - void selectPageFormat(); - void disableAutoFF(); - void setNumberOfCopies(); - void memorizedPosition(); - void moveAbsoluteHorizontal(int x); - void carriageReturn(); - void moveDown(int dy); - void rasterGraphics( - int size, - int widthbyte, - int height, - int compression_method, - const uchar *buffer); - void formFeed(); - void jobEnd(); - - int fCurrentX; - int fCurrentY; - Halftone *fHalftone; -}; - -#endif /* __LIPS3_H */ +/* + * Lips3.h + * Copyright 1999-2000 Y.Takagi. All Rights Reserved. + */ + +#ifndef __LIPS3_H +#define __LIPS3_H + +#include "GraphicsDriver.h" + +class Halftone; + +class LIPS3Driver : public GraphicsDriver { +public: + LIPS3Driver(BMessage *msg, PrinterData *printer_data, const PrinterCap *printer_cap); + +protected: + virtual bool startDoc(); + virtual bool startPage(int page); + virtual bool nextBand(BBitmap *bitmap, BPoint *offset); + virtual bool endPage(int page); + virtual bool endDoc(bool success); + +private: + void move(int x, int y); + void beginTextMode(); + void jobStart(); + void softReset(); + void sizeUnitMode(); + void selectSizeUnit(); + void paperFeedMode(); + void selectPageFormat(); + void disableAutoFF(); + void setNumberOfCopies(); + void memorizedPosition(); + void moveAbsoluteHorizontal(int x); + void carriageReturn(); + void moveDown(int dy); + void rasterGraphics( + int size, + int widthbyte, + int height, + int compression_method, + const uchar *buffer); + void formFeed(); + void jobEnd(); + + int fCurrentX; + int fCurrentY; + Halftone *fHalftone; +}; + +#endif /* __LIPS3_H */ diff --git a/src/add-ons/print/drivers/canon_lips/lips4/Lips4.cpp b/src/add-ons/print/drivers/canon_lips/lips4/Lips4.cpp index b104ad80fe..248f5982e3 100644 --- a/src/add-ons/print/drivers/canon_lips/lips4/Lips4.cpp +++ b/src/add-ons/print/drivers/canon_lips/lips4/Lips4.cpp @@ -1,472 +1,472 @@ -/* - * Lips4.cpp - * Copyright 1999-2000 Y.Takagi. All Rights Reserved. - */ - -#include -#include -#include -#include -#include "Lips4.h" -#include "PackBits.h" -#include "JobData.h" -#include "PrinterData.h" -#include "Lips4Cap.h" -#include "Halftone.h" -#include "ValidRect.h" -#include "DbgMsg.h" - -#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE)) -using namespace std; -#else -#define std -#endif - -LIPS4Driver::LIPS4Driver(BMessage *msg, PrinterData *printer_data, const PrinterCap *printer_cap) - : GraphicsDriver(msg, printer_data, printer_cap) -{ - fHalftone = NULL; -} - -bool LIPS4Driver::startDoc() -{ - try { - beginTextMode(); - jobStart(); - colorModeDeclaration(); - softReset(); - sizeUnitMode(); - selectSizeUnit(); - paperFeedMode(); - selectPageFormat(); - disableAutoFF(); - setNumberOfCopies(); - sidePrintingControl(); - setBindingMargin(); - fHalftone = new Halftone(getJobData()->getSurfaceType(), getJobData()->getGamma(), getJobData()->getInkDensity(), getJobData()->getDitherType()); - return true; - } - catch (TransportException &err) { - return false; - } -} - -bool LIPS4Driver::startPage(int) -{ - try { - fCurrentX = 0; - fCurrentY = 0; - memorizedPosition(); - return true; - } - catch (TransportException &err) { - return false; - } -} - -bool LIPS4Driver::endPage(int) -{ - try { - formFeed(); - return true; - } - catch (TransportException &err) { - return false; - } -} - -bool LIPS4Driver::endDoc(bool) -{ - try { - if (fHalftone) { - delete fHalftone; - } - jobEnd(); - return true; - } - catch (TransportException &err) { - return false; - } -} - -bool LIPS4Driver::nextBand(BBitmap *bitmap, BPoint *offset) -{ - DBGMSG(("> nextBand\n")); - - try { - - if (bitmap == NULL) { - uchar dummy[1]; - dummy[0] = '\0'; - rasterGraphics(1, 1, 1, 0, dummy); - DBGMSG(("< next_band\n")); - return true; - } - - BRect bounds = bitmap->Bounds(); - - RECT rc; - rc.left = (int)bounds.left; - rc.top = (int)bounds.top; - rc.right = (int)bounds.right; - rc.bottom = (int)bounds.bottom; - - int height = rc.bottom - rc.top + 1; - - int x = (int)offset->x; - int y = (int)offset->y; - - int page_height = getPageHeight(); - - if (y + height > page_height) { - height = page_height - y; - } - - rc.bottom = height - 1; - - DBGMSG(("height = %d\n", height)); - DBGMSG(("x = %d\n", x)); - DBGMSG(("y = %d\n", y)); - - if (get_valid_rect(bitmap, &rc)) { - - DBGMSG(("validate rect = %d, %d, %d, %d\n", - rc.left, rc.top, rc.right, rc.bottom)); - - x = rc.left; - y += rc.top; - - int width = rc.right - rc.left + 1; - int widthByte = (width + 7) / 8; - int height = rc.bottom - rc.top + 1; - int in_size = widthByte * height; - int out_size = (in_size * 6 + 4) / 5; - int delta = bitmap->BytesPerRow(); - - DBGMSG(("width = %d\n", width)); - DBGMSG(("widthByte = %d\n", widthByte)); - DBGMSG(("height = %d\n", height)); - DBGMSG(("in_size = %d\n", in_size)); - DBGMSG(("out_size = %d\n", out_size)); - DBGMSG(("delta = %d\n", delta)); - DBGMSG(("fHalftone_engine->get_pixel_depth() = %d\n", fHalftone->getPixelDepth())); - - uchar *ptr = (uchar *)bitmap->Bits() - + rc.top * delta - + (rc.left * fHalftone->getPixelDepth()) / 8; - - int compression_method; - int compressed_size; - const uchar *buffer; - - uchar *in_buffer = new uchar[in_size]; - uchar *out_buffer = new uchar[out_size]; - - auto_ptr _in_buffer (in_buffer); - auto_ptr _out_buffer(out_buffer); - - uchar *ptr2 = (uchar *)in_buffer; - - DBGMSG(("move\n")); - - move(x, y); - - for (int i = rc.top; i <= rc.bottom; i++) { - fHalftone->dither(ptr2, ptr, x, y, width); - ptr += delta; - ptr2 += widthByte; - y++; - } - - DBGMSG(("PackBits\n")); - - compressed_size = pack_bits(out_buffer, in_buffer, in_size); - - if (compressed_size < in_size) { - compression_method = 11; - buffer = out_buffer; - } else if (compressed_size > out_size) { - BAlert *alert = new BAlert("memory overrun!!!", "warning", "OK"); - alert->Go(); - return false; - } else { - compression_method = 0; - buffer = in_buffer; - compressed_size = in_size; - } - - DBGMSG(("compressed_size = %d\n", compressed_size)); - DBGMSG(("widthByte = %d\n", widthByte)); - DBGMSG(("height = %d\n", height)); - DBGMSG(("compression_method = %d\n", compression_method)); - - rasterGraphics( - compressed_size, // size, - widthByte, // widthByte - height, // height, - compression_method, - buffer); - - } else { - DBGMSG(("band bitmap is clean.\n")); - } - - if (y >= page_height) { - offset->x = -1.0; - offset->y = -1.0; - } else { - offset->y += height; - } - - DBGMSG(("< nextBand\n")); - return true; - } - catch (TransportException &err) { - BAlert *alert = new BAlert("", err.what(), "OK"); - alert->Go(); - return false; - } -} - -void LIPS4Driver::beginTextMode() -{ - writeSpoolString("\033%%@"); -} - -void LIPS4Driver::jobStart() -{ - writeSpoolString("\033P41;%d;1J\033\\", getJobData()->getXres()); -} - -void LIPS4Driver::colorModeDeclaration() -{ -// if (color) -// writeSpoolString("\033[1\"p"); -// else - writeSpoolString("\033[0\"p"); -} - -void LIPS4Driver::softReset() -{ - writeSpoolString("\033<"); -} - -void LIPS4Driver::sizeUnitMode() -{ - writeSpoolString("\033[11h"); -} - -void LIPS4Driver::selectSizeUnit() -{ - writeSpoolString("\033[?7;%d I", getJobData()->getXres()); -} - -void LIPS4Driver::paperFeedMode() -{ - // 0 auto - // -------------- - // 1 MP tray - // 2 lower - // 3 lupper - // -------------- - // 10 MP tray - // 11 casette 1 - // 12 casette 2 - // 13 casette 3 - // 14 casette 4 - // 15 casette 5 - // 16 casette 6 - // 17 casette 7 - - int i; - - switch (getJobData()->getPaperSource()) { - case JobData::kManual: - i = 10; - break; - case JobData::kUpper: - i = 11; - break; - case JobData::kMiddle: - i = 12; - break; - case JobData::kLower: - i = 13; - break; - case JobData::kAuto: - default: - i = 0; - break; - } - - writeSpoolString("\033[%dq", i); -} - -void LIPS4Driver::selectPageFormat() -{ - int i; - - switch (getJobData()->getPaper()) { - case JobData::kA3: - i = 12; - break; - - case JobData::kA4: - i = 14; - break; - - case JobData::kA5: - i = 16; - break; - - case JobData::kJapanesePostcard: - i = 18; - break; - - case JobData::kB4: - i = 24; - break; - - case JobData::kB5: - i = 26; - break; - - case JobData::kLetter: - i = 30; - break; - - case JobData::kLegal: - i = 32; - break; - - case JobData::kExecutive: - i = 40; - break; - - case JobData::kJEnvYou4: - i = 50; - break; - - case JobData::kUser: - i = 90; - break; - - default: - i = 0; - break; - } - - if (JobData::kLandscape == getJobData()->getOrientation()) - i++; - - writeSpoolString("\033[%d;;p", i); -} - -void LIPS4Driver::disableAutoFF() -{ - writeSpoolString("\033[?2h"); -} - -void LIPS4Driver::setNumberOfCopies() -{ - writeSpoolString("\033[%ldv", getJobData()->getCopies()); -} - -void LIPS4Driver::sidePrintingControl() -{ - if (getJobData()->getPrintStyle() == JobData::kSimplex) - writeSpoolString("\033[0#x"); - else - writeSpoolString("\033[2;0#x"); -} - -void LIPS4Driver::setBindingMargin() -{ - if (getJobData()->getPrintStyle() == JobData::kDuplex) { - int i; -// switch (job_data()->binding_location()) { -// case kLongEdgeLeft: - i = 0; -// break; -// case kLongEdgeRight: -// i = 1; -// break; -// case kShortEdgeTop: -// i = 2; -// break; -// case kShortEdgeBottom: -// i = 3; -// break; -// } - writeSpoolString("\033[%d;0#w", i); - } -} - -void LIPS4Driver::memorizedPosition() -{ - writeSpoolString("\033[0;1;0x"); -} - -void LIPS4Driver::moveAbsoluteHorizontal(int x) -{ - writeSpoolString("\033[%ld`", x); -} - -void LIPS4Driver::carriageReturn() -{ - writeSpoolChar('\x0d'); -} - -void LIPS4Driver::moveDown(int dy) -{ - writeSpoolString("\033[%lde", dy); -} - -void LIPS4Driver::rasterGraphics( - int compression_size, - int widthbyte, - int height, - int compression_method, - const uchar *buffer) -{ -// 0 RAW -// 10 RLE -// 11 packbits - - writeSpoolString( - "\033[%ld;%ld;%d;%ld;%ld.r", - compression_size, - widthbyte, - getJobData()->getXres(), - compression_method, - height); - - writeSpoolData(buffer, compression_size); -} - -void LIPS4Driver::formFeed() -{ - writeSpoolChar('\014'); -} - -void LIPS4Driver::jobEnd() -{ - writeSpoolString("\033P0J\033\\"); -} - -void LIPS4Driver::move(int x, int y) -{ - if (fCurrentX != x) { - if (x) { - moveAbsoluteHorizontal(x); - } else { - carriageReturn(); - } - fCurrentX = x; - } - if (fCurrentY != y) { - int dy = y - fCurrentY; - moveDown(dy); - fCurrentY = y; - } -} +/* + * Lips4.cpp + * Copyright 1999-2000 Y.Takagi. All Rights Reserved. + */ + +#include +#include +#include +#include +#include "Lips4.h" +#include "PackBits.h" +#include "JobData.h" +#include "PrinterData.h" +#include "Lips4Cap.h" +#include "Halftone.h" +#include "ValidRect.h" +#include "DbgMsg.h" + +#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE)) +using namespace std; +#else +#define std +#endif + +LIPS4Driver::LIPS4Driver(BMessage *msg, PrinterData *printer_data, const PrinterCap *printer_cap) + : GraphicsDriver(msg, printer_data, printer_cap) +{ + fHalftone = NULL; +} + +bool LIPS4Driver::startDoc() +{ + try { + beginTextMode(); + jobStart(); + colorModeDeclaration(); + softReset(); + sizeUnitMode(); + selectSizeUnit(); + paperFeedMode(); + selectPageFormat(); + disableAutoFF(); + setNumberOfCopies(); + sidePrintingControl(); + setBindingMargin(); + fHalftone = new Halftone(getJobData()->getSurfaceType(), getJobData()->getGamma(), getJobData()->getInkDensity(), getJobData()->getDitherType()); + return true; + } + catch (TransportException &err) { + return false; + } +} + +bool LIPS4Driver::startPage(int) +{ + try { + fCurrentX = 0; + fCurrentY = 0; + memorizedPosition(); + return true; + } + catch (TransportException &err) { + return false; + } +} + +bool LIPS4Driver::endPage(int) +{ + try { + formFeed(); + return true; + } + catch (TransportException &err) { + return false; + } +} + +bool LIPS4Driver::endDoc(bool) +{ + try { + if (fHalftone) { + delete fHalftone; + } + jobEnd(); + return true; + } + catch (TransportException &err) { + return false; + } +} + +bool LIPS4Driver::nextBand(BBitmap *bitmap, BPoint *offset) +{ + DBGMSG(("> nextBand\n")); + + try { + + if (bitmap == NULL) { + uchar dummy[1]; + dummy[0] = '\0'; + rasterGraphics(1, 1, 1, 0, dummy); + DBGMSG(("< next_band\n")); + return true; + } + + BRect bounds = bitmap->Bounds(); + + RECT rc; + rc.left = (int)bounds.left; + rc.top = (int)bounds.top; + rc.right = (int)bounds.right; + rc.bottom = (int)bounds.bottom; + + int height = rc.bottom - rc.top + 1; + + int x = (int)offset->x; + int y = (int)offset->y; + + int page_height = getPageHeight(); + + if (y + height > page_height) { + height = page_height - y; + } + + rc.bottom = height - 1; + + DBGMSG(("height = %d\n", height)); + DBGMSG(("x = %d\n", x)); + DBGMSG(("y = %d\n", y)); + + if (get_valid_rect(bitmap, &rc)) { + + DBGMSG(("validate rect = %d, %d, %d, %d\n", + rc.left, rc.top, rc.right, rc.bottom)); + + x = rc.left; + y += rc.top; + + int width = rc.right - rc.left + 1; + int widthByte = (width + 7) / 8; + int height = rc.bottom - rc.top + 1; + int in_size = widthByte * height; + int out_size = (in_size * 6 + 4) / 5; + int delta = bitmap->BytesPerRow(); + + DBGMSG(("width = %d\n", width)); + DBGMSG(("widthByte = %d\n", widthByte)); + DBGMSG(("height = %d\n", height)); + DBGMSG(("in_size = %d\n", in_size)); + DBGMSG(("out_size = %d\n", out_size)); + DBGMSG(("delta = %d\n", delta)); + DBGMSG(("fHalftone_engine->get_pixel_depth() = %d\n", fHalftone->getPixelDepth())); + + uchar *ptr = (uchar *)bitmap->Bits() + + rc.top * delta + + (rc.left * fHalftone->getPixelDepth()) / 8; + + int compression_method; + int compressed_size; + const uchar *buffer; + + uchar *in_buffer = new uchar[in_size]; + uchar *out_buffer = new uchar[out_size]; + + auto_ptr _in_buffer (in_buffer); + auto_ptr _out_buffer(out_buffer); + + uchar *ptr2 = (uchar *)in_buffer; + + DBGMSG(("move\n")); + + move(x, y); + + for (int i = rc.top; i <= rc.bottom; i++) { + fHalftone->dither(ptr2, ptr, x, y, width); + ptr += delta; + ptr2 += widthByte; + y++; + } + + DBGMSG(("PackBits\n")); + + compressed_size = pack_bits(out_buffer, in_buffer, in_size); + + if (compressed_size < in_size) { + compression_method = 11; + buffer = out_buffer; + } else if (compressed_size > out_size) { + BAlert *alert = new BAlert("memory overrun!!!", "warning", "OK"); + alert->Go(); + return false; + } else { + compression_method = 0; + buffer = in_buffer; + compressed_size = in_size; + } + + DBGMSG(("compressed_size = %d\n", compressed_size)); + DBGMSG(("widthByte = %d\n", widthByte)); + DBGMSG(("height = %d\n", height)); + DBGMSG(("compression_method = %d\n", compression_method)); + + rasterGraphics( + compressed_size, // size, + widthByte, // widthByte + height, // height, + compression_method, + buffer); + + } else { + DBGMSG(("band bitmap is clean.\n")); + } + + if (y >= page_height) { + offset->x = -1.0; + offset->y = -1.0; + } else { + offset->y += height; + } + + DBGMSG(("< nextBand\n")); + return true; + } + catch (TransportException &err) { + BAlert *alert = new BAlert("", err.what(), "OK"); + alert->Go(); + return false; + } +} + +void LIPS4Driver::beginTextMode() +{ + writeSpoolString("\033%%@"); +} + +void LIPS4Driver::jobStart() +{ + writeSpoolString("\033P41;%d;1J\033\\", getJobData()->getXres()); +} + +void LIPS4Driver::colorModeDeclaration() +{ +// if (color) +// writeSpoolString("\033[1\"p"); +// else + writeSpoolString("\033[0\"p"); +} + +void LIPS4Driver::softReset() +{ + writeSpoolString("\033<"); +} + +void LIPS4Driver::sizeUnitMode() +{ + writeSpoolString("\033[11h"); +} + +void LIPS4Driver::selectSizeUnit() +{ + writeSpoolString("\033[?7;%d I", getJobData()->getXres()); +} + +void LIPS4Driver::paperFeedMode() +{ + // 0 auto + // -------------- + // 1 MP tray + // 2 lower + // 3 lupper + // -------------- + // 10 MP tray + // 11 casette 1 + // 12 casette 2 + // 13 casette 3 + // 14 casette 4 + // 15 casette 5 + // 16 casette 6 + // 17 casette 7 + + int i; + + switch (getJobData()->getPaperSource()) { + case JobData::kManual: + i = 10; + break; + case JobData::kUpper: + i = 11; + break; + case JobData::kMiddle: + i = 12; + break; + case JobData::kLower: + i = 13; + break; + case JobData::kAuto: + default: + i = 0; + break; + } + + writeSpoolString("\033[%dq", i); +} + +void LIPS4Driver::selectPageFormat() +{ + int i; + + switch (getJobData()->getPaper()) { + case JobData::kA3: + i = 12; + break; + + case JobData::kA4: + i = 14; + break; + + case JobData::kA5: + i = 16; + break; + + case JobData::kJapanesePostcard: + i = 18; + break; + + case JobData::kB4: + i = 24; + break; + + case JobData::kB5: + i = 26; + break; + + case JobData::kLetter: + i = 30; + break; + + case JobData::kLegal: + i = 32; + break; + + case JobData::kExecutive: + i = 40; + break; + + case JobData::kJEnvYou4: + i = 50; + break; + + case JobData::kUser: + i = 90; + break; + + default: + i = 0; + break; + } + + if (JobData::kLandscape == getJobData()->getOrientation()) + i++; + + writeSpoolString("\033[%d;;p", i); +} + +void LIPS4Driver::disableAutoFF() +{ + writeSpoolString("\033[?2h"); +} + +void LIPS4Driver::setNumberOfCopies() +{ + writeSpoolString("\033[%ldv", getJobData()->getCopies()); +} + +void LIPS4Driver::sidePrintingControl() +{ + if (getJobData()->getPrintStyle() == JobData::kSimplex) + writeSpoolString("\033[0#x"); + else + writeSpoolString("\033[2;0#x"); +} + +void LIPS4Driver::setBindingMargin() +{ + if (getJobData()->getPrintStyle() == JobData::kDuplex) { + int i; +// switch (job_data()->binding_location()) { +// case kLongEdgeLeft: + i = 0; +// break; +// case kLongEdgeRight: +// i = 1; +// break; +// case kShortEdgeTop: +// i = 2; +// break; +// case kShortEdgeBottom: +// i = 3; +// break; +// } + writeSpoolString("\033[%d;0#w", i); + } +} + +void LIPS4Driver::memorizedPosition() +{ + writeSpoolString("\033[0;1;0x"); +} + +void LIPS4Driver::moveAbsoluteHorizontal(int x) +{ + writeSpoolString("\033[%ld`", x); +} + +void LIPS4Driver::carriageReturn() +{ + writeSpoolChar('\x0d'); +} + +void LIPS4Driver::moveDown(int dy) +{ + writeSpoolString("\033[%lde", dy); +} + +void LIPS4Driver::rasterGraphics( + int compression_size, + int widthbyte, + int height, + int compression_method, + const uchar *buffer) +{ +// 0 RAW +// 10 RLE +// 11 packbits + + writeSpoolString( + "\033[%ld;%ld;%d;%ld;%ld.r", + compression_size, + widthbyte, + getJobData()->getXres(), + compression_method, + height); + + writeSpoolData(buffer, compression_size); +} + +void LIPS4Driver::formFeed() +{ + writeSpoolChar('\014'); +} + +void LIPS4Driver::jobEnd() +{ + writeSpoolString("\033P0J\033\\"); +} + +void LIPS4Driver::move(int x, int y) +{ + if (fCurrentX != x) { + if (x) { + moveAbsoluteHorizontal(x); + } else { + carriageReturn(); + } + fCurrentX = x; + } + if (fCurrentY != y) { + int dy = y - fCurrentY; + moveDown(dy); + fCurrentY = y; + } +} diff --git a/src/add-ons/print/drivers/canon_lips/lips4/Lips4.h b/src/add-ons/print/drivers/canon_lips/lips4/Lips4.h index 14a8d1ed6a..e95999b97d 100644 --- a/src/add-ons/print/drivers/canon_lips/lips4/Lips4.h +++ b/src/add-ons/print/drivers/canon_lips/lips4/Lips4.h @@ -1,56 +1,56 @@ -/* - * Lips4.h - * Copyright 1999-2000 Y.Takagi. All Rights Reserved. - */ - -#ifndef __LIPS4_H -#define __LIPS4_H - -#include "GraphicsDriver.h" - -class Halftone; - -class LIPS4Driver : public GraphicsDriver { -public: - LIPS4Driver(BMessage *msg, PrinterData *printer_data, const PrinterCap *cap); - -protected: - virtual bool startDoc(); - virtual bool startPage(int page); - virtual bool nextBand(BBitmap *bitmap, BPoint *offset); - virtual bool endPage(int page); - virtual bool endDoc(bool success); - -private: - void move(int x, int y); - void beginTextMode(); - void jobStart(); - void colorModeDeclaration(); - void softReset(); - void sizeUnitMode(); - void selectSizeUnit(); - void paperFeedMode(); - void selectPageFormat(); - void disableAutoFF(); - void setNumberOfCopies(); - void sidePrintingControl(); - void setBindingMargin(); - void memorizedPosition(); - void moveAbsoluteHorizontal(int x); - void carriageReturn(); - void moveDown(int dy); - void rasterGraphics( - int size, - int widthbyte, - int height, - int compression_method, - const uchar *buffer); - void formFeed(); - void jobEnd(); - - int fCurrentX; - int fCurrentY; - Halftone *fHalftone; -}; - -#endif /* __LIPS4_H */ +/* + * Lips4.h + * Copyright 1999-2000 Y.Takagi. All Rights Reserved. + */ + +#ifndef __LIPS4_H +#define __LIPS4_H + +#include "GraphicsDriver.h" + +class Halftone; + +class LIPS4Driver : public GraphicsDriver { +public: + LIPS4Driver(BMessage *msg, PrinterData *printer_data, const PrinterCap *cap); + +protected: + virtual bool startDoc(); + virtual bool startPage(int page); + virtual bool nextBand(BBitmap *bitmap, BPoint *offset); + virtual bool endPage(int page); + virtual bool endDoc(bool success); + +private: + void move(int x, int y); + void beginTextMode(); + void jobStart(); + void colorModeDeclaration(); + void softReset(); + void sizeUnitMode(); + void selectSizeUnit(); + void paperFeedMode(); + void selectPageFormat(); + void disableAutoFF(); + void setNumberOfCopies(); + void sidePrintingControl(); + void setBindingMargin(); + void memorizedPosition(); + void moveAbsoluteHorizontal(int x); + void carriageReturn(); + void moveDown(int dy); + void rasterGraphics( + int size, + int widthbyte, + int height, + int compression_method, + const uchar *buffer); + void formFeed(); + void jobEnd(); + + int fCurrentX; + int fCurrentY; + Halftone *fHalftone; +}; + +#endif /* __LIPS4_H */ diff --git a/src/add-ons/print/drivers/pcl5/PCL5.cpp b/src/add-ons/print/drivers/pcl5/PCL5.cpp index 5333a24b18..8956f47700 100644 --- a/src/add-ons/print/drivers/pcl5/PCL5.cpp +++ b/src/add-ons/print/drivers/pcl5/PCL5.cpp @@ -1,290 +1,290 @@ -/* - * PCL5.cpp - * Copyright 1999-2000 Y.Takagi. All Rights Reserved. - * Copyright 2003 Michael Pfeiffer. - */ - -#include -#include -#include -#include -#include "PCL5.h" -#include "UIDriver.h" -#include "JobData.h" -#include "PrinterData.h" -#include "PCL5Cap.h" -#include "PackBits.h" -#include "Halftone.h" -#include "ValidRect.h" -#include "DbgMsg.h" - -#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE)) -using namespace std; -#else -#define std -#endif - -PCL5Driver::PCL5Driver(BMessage *msg, PrinterData *printer_data, const PrinterCap *printer_cap) - : GraphicsDriver(msg, printer_data, printer_cap) -{ - fHalftone = NULL; -} - -bool PCL5Driver::startDoc() -{ - try { - jobStart(); - fHalftone = new Halftone(getJobData()->getSurfaceType(), getJobData()->getGamma(), getJobData()->getInkDensity(), getJobData()->getDitherType()); - return true; - } - catch (TransportException &err) { - return false; - } -} - -bool PCL5Driver::startPage(int) -{ - return true; -} - -bool PCL5Driver::endPage(int) -{ - try { - writeSpoolChar('\014'); - return true; - } - catch (TransportException &err) { - return false; - } -} - -bool PCL5Driver::endDoc(bool) -{ - try { - if (fHalftone) { - delete fHalftone; - } - jobEnd(); - return true; - } - catch (TransportException &err) { - return false; - } -} - -bool PCL5Driver::nextBand(BBitmap *bitmap, BPoint *offset) -{ - DBGMSG(("> nextBand\n")); - - try { - BRect bounds = bitmap->Bounds(); - - RECT rc; - rc.left = (int)bounds.left; - rc.top = (int)bounds.top; - rc.right = (int)bounds.right; - rc.bottom = (int)bounds.bottom; - - int height = rc.bottom - rc.top + 1; - - int x = (int)offset->x; - int y = (int)offset->y; - - int page_height = getPageHeight(); - - if (y + height > page_height) { - height = page_height - y; - } - - rc.bottom = height - 1; - - DBGMSG(("height = %d\n", height)); - DBGMSG(("x = %d\n", x)); - DBGMSG(("y = %d\n", y)); - - if (get_valid_rect(bitmap, &rc)) { - - DBGMSG(("validate rect = %d, %d, %d, %d\n", - rc.left, rc.top, rc.right, rc.bottom)); - - x = rc.left; - y += rc.top; - - int width = rc.right - rc.left + 1; - int widthByte = (width + 7) / 8; /* byte boundary */ - int height = rc.bottom - rc.top + 1; - int in_size = widthByte; - int out_size = (widthByte * 6 + 4) / 5; - int delta = bitmap->BytesPerRow(); - - DBGMSG(("width = %d\n", width)); - DBGMSG(("widthByte = %d\n", widthByte)); - DBGMSG(("height = %d\n", height)); - DBGMSG(("in_size = %d\n", in_size)); - DBGMSG(("out_size = %d\n", out_size)); - DBGMSG(("delta = %d\n", delta)); - DBGMSG(("renderobj->get_pixel_depth() = %d\n", fHalftone->getPixelDepth())); - - uchar *ptr = (uchar *)bitmap->Bits() - + rc.top * delta - + (rc.left * fHalftone->getPixelDepth()) / 8; - - int compression_method; - int compressed_size; - const uchar *buffer; - - uchar *in_buffer = new uchar[in_size]; - uchar *out_buffer = new uchar[out_size]; - - auto_ptr _in_buffer (in_buffer); - auto_ptr _out_buffer(out_buffer); - - DBGMSG(("move\n")); - - move(x, y); - startRasterGraphics(width, height); - - const bool color = getJobData()->getColor() == JobData::kColor; - const int num_planes = color ? 3 : 1; - - if (color) { - fHalftone->setPlanes(Halftone::kPlaneRGB1); - fHalftone->setBlackValue(Halftone::kLowValueMeansBlack); - } - - for (int i = rc.top; i <= rc.bottom; i++) { - - for (int plane = 0; plane < num_planes; plane ++) { - - fHalftone->dither(in_buffer, ptr, x, y, width); - - compressed_size = pack_bits(out_buffer, in_buffer, in_size); - - if (compressed_size + bytesToEnterCompressionMethod(2) < in_size + bytesToEnterCompressionMethod(0)) { - compression_method = 2; // back bits - buffer = out_buffer; - } else { - compression_method = 0; // uncompressed - buffer = in_buffer; - compressed_size = in_size; - } - - rasterGraphics( - compression_method, - buffer, - compressed_size, - plane == num_planes - 1); - - } - - ptr += delta; - y++; - } - - endRasterGraphics(); - - } else { - DBGMSG(("band bitmap is clean.\n")); - } - - if (y >= page_height) { - offset->x = -1.0; - offset->y = -1.0; - } else { - offset->y += height; - } - - DBGMSG(("< nextBand\n")); - return true; - } - catch (TransportException &err) { - BAlert *alert = new BAlert("", err.what(), "OK"); - alert->Go(); - return false; - } -} - -void PCL5Driver::jobStart() -{ - const bool color = getJobData()->getColor() == JobData::kColor; - // enter PCL5 - writeSpoolString("\033%%-12345X@PJL ENTER LANGUAGE=PCL\n"); - // reset - writeSpoolString("\033E"); - // dpi - writeSpoolString("\033*t%dR", getJobData()->getXres()); - // unit of measure - writeSpoolString("\033&u%dD", getJobData()->getXres()); - // page size - writeSpoolString("\033&l0A"); - // page orientation - writeSpoolString("\033&l0O"); - if (color) { - // 3 color planes (red, green, blue) - writeSpoolString("\033*r3U"); - } - // raster presentation - writeSpoolString("\033*r0F"); - // top maring and perforation skip - writeSpoolString("\033&l0e0L"); - // clear horizontal margins - writeSpoolString("\0339"); - // number of copies - // writeSpoolString("\033&l%ldL", getJobData()->getCopies()); -} - -void PCL5Driver::startRasterGraphics(int width, int height) -{ - // width - writeSpoolString("\033*r%dS", width); - // height - writeSpoolString("\033*r%dT", height); - // start raster graphics - writeSpoolString("\033*r1A"); - fCompressionMethod = -1; -} - -void PCL5Driver::endRasterGraphics() -{ - writeSpoolString("\033*rB"); -} - -void PCL5Driver::rasterGraphics( - int compression_method, - const uchar *buffer, - int size, - bool lastPlane) -{ - if (fCompressionMethod != compression_method) { - writeSpoolString("\033*b%dM", compression_method); - fCompressionMethod = compression_method; - } - writeSpoolString("\033*b%d", size); - if (lastPlane) { - writeSpoolString("W"); - } else { - writeSpoolString("V"); - } - writeSpoolData(buffer, size); -} - -void PCL5Driver::jobEnd() -{ - writeSpoolString("\033&l1T"); - writeSpoolString("\033E"); -} - -void PCL5Driver::move(int x, int y) -{ - writeSpoolString("\033*p%dx%dY", x, y+75); -} - -int PCL5Driver::bytesToEnterCompressionMethod(int compression_method) -{ - if (fCompressionMethod == compression_method) { - return 0; - } else { - return 5; - } -} - +/* + * PCL5.cpp + * Copyright 1999-2000 Y.Takagi. All Rights Reserved. + * Copyright 2003 Michael Pfeiffer. + */ + +#include +#include +#include +#include +#include "PCL5.h" +#include "UIDriver.h" +#include "JobData.h" +#include "PrinterData.h" +#include "PCL5Cap.h" +#include "PackBits.h" +#include "Halftone.h" +#include "ValidRect.h" +#include "DbgMsg.h" + +#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE)) +using namespace std; +#else +#define std +#endif + +PCL5Driver::PCL5Driver(BMessage *msg, PrinterData *printer_data, const PrinterCap *printer_cap) + : GraphicsDriver(msg, printer_data, printer_cap) +{ + fHalftone = NULL; +} + +bool PCL5Driver::startDoc() +{ + try { + jobStart(); + fHalftone = new Halftone(getJobData()->getSurfaceType(), getJobData()->getGamma(), getJobData()->getInkDensity(), getJobData()->getDitherType()); + return true; + } + catch (TransportException &err) { + return false; + } +} + +bool PCL5Driver::startPage(int) +{ + return true; +} + +bool PCL5Driver::endPage(int) +{ + try { + writeSpoolChar('\014'); + return true; + } + catch (TransportException &err) { + return false; + } +} + +bool PCL5Driver::endDoc(bool) +{ + try { + if (fHalftone) { + delete fHalftone; + } + jobEnd(); + return true; + } + catch (TransportException &err) { + return false; + } +} + +bool PCL5Driver::nextBand(BBitmap *bitmap, BPoint *offset) +{ + DBGMSG(("> nextBand\n")); + + try { + BRect bounds = bitmap->Bounds(); + + RECT rc; + rc.left = (int)bounds.left; + rc.top = (int)bounds.top; + rc.right = (int)bounds.right; + rc.bottom = (int)bounds.bottom; + + int height = rc.bottom - rc.top + 1; + + int x = (int)offset->x; + int y = (int)offset->y; + + int page_height = getPageHeight(); + + if (y + height > page_height) { + height = page_height - y; + } + + rc.bottom = height - 1; + + DBGMSG(("height = %d\n", height)); + DBGMSG(("x = %d\n", x)); + DBGMSG(("y = %d\n", y)); + + if (get_valid_rect(bitmap, &rc)) { + + DBGMSG(("validate rect = %d, %d, %d, %d\n", + rc.left, rc.top, rc.right, rc.bottom)); + + x = rc.left; + y += rc.top; + + int width = rc.right - rc.left + 1; + int widthByte = (width + 7) / 8; /* byte boundary */ + int height = rc.bottom - rc.top + 1; + int in_size = widthByte; + int out_size = (widthByte * 6 + 4) / 5; + int delta = bitmap->BytesPerRow(); + + DBGMSG(("width = %d\n", width)); + DBGMSG(("widthByte = %d\n", widthByte)); + DBGMSG(("height = %d\n", height)); + DBGMSG(("in_size = %d\n", in_size)); + DBGMSG(("out_size = %d\n", out_size)); + DBGMSG(("delta = %d\n", delta)); + DBGMSG(("renderobj->get_pixel_depth() = %d\n", fHalftone->getPixelDepth())); + + uchar *ptr = (uchar *)bitmap->Bits() + + rc.top * delta + + (rc.left * fHalftone->getPixelDepth()) / 8; + + int compression_method; + int compressed_size; + const uchar *buffer; + + uchar *in_buffer = new uchar[in_size]; + uchar *out_buffer = new uchar[out_size]; + + auto_ptr _in_buffer (in_buffer); + auto_ptr _out_buffer(out_buffer); + + DBGMSG(("move\n")); + + move(x, y); + startRasterGraphics(width, height); + + const bool color = getJobData()->getColor() == JobData::kColor; + const int num_planes = color ? 3 : 1; + + if (color) { + fHalftone->setPlanes(Halftone::kPlaneRGB1); + fHalftone->setBlackValue(Halftone::kLowValueMeansBlack); + } + + for (int i = rc.top; i <= rc.bottom; i++) { + + for (int plane = 0; plane < num_planes; plane ++) { + + fHalftone->dither(in_buffer, ptr, x, y, width); + + compressed_size = pack_bits(out_buffer, in_buffer, in_size); + + if (compressed_size + bytesToEnterCompressionMethod(2) < in_size + bytesToEnterCompressionMethod(0)) { + compression_method = 2; // back bits + buffer = out_buffer; + } else { + compression_method = 0; // uncompressed + buffer = in_buffer; + compressed_size = in_size; + } + + rasterGraphics( + compression_method, + buffer, + compressed_size, + plane == num_planes - 1); + + } + + ptr += delta; + y++; + } + + endRasterGraphics(); + + } else { + DBGMSG(("band bitmap is clean.\n")); + } + + if (y >= page_height) { + offset->x = -1.0; + offset->y = -1.0; + } else { + offset->y += height; + } + + DBGMSG(("< nextBand\n")); + return true; + } + catch (TransportException &err) { + BAlert *alert = new BAlert("", err.what(), "OK"); + alert->Go(); + return false; + } +} + +void PCL5Driver::jobStart() +{ + const bool color = getJobData()->getColor() == JobData::kColor; + // enter PCL5 + writeSpoolString("\033%%-12345X@PJL ENTER LANGUAGE=PCL\n"); + // reset + writeSpoolString("\033E"); + // dpi + writeSpoolString("\033*t%dR", getJobData()->getXres()); + // unit of measure + writeSpoolString("\033&u%dD", getJobData()->getXres()); + // page size + writeSpoolString("\033&l0A"); + // page orientation + writeSpoolString("\033&l0O"); + if (color) { + // 3 color planes (red, green, blue) + writeSpoolString("\033*r3U"); + } + // raster presentation + writeSpoolString("\033*r0F"); + // top maring and perforation skip + writeSpoolString("\033&l0e0L"); + // clear horizontal margins + writeSpoolString("\0339"); + // number of copies + // writeSpoolString("\033&l%ldL", getJobData()->getCopies()); +} + +void PCL5Driver::startRasterGraphics(int width, int height) +{ + // width + writeSpoolString("\033*r%dS", width); + // height + writeSpoolString("\033*r%dT", height); + // start raster graphics + writeSpoolString("\033*r1A"); + fCompressionMethod = -1; +} + +void PCL5Driver::endRasterGraphics() +{ + writeSpoolString("\033*rB"); +} + +void PCL5Driver::rasterGraphics( + int compression_method, + const uchar *buffer, + int size, + bool lastPlane) +{ + if (fCompressionMethod != compression_method) { + writeSpoolString("\033*b%dM", compression_method); + fCompressionMethod = compression_method; + } + writeSpoolString("\033*b%d", size); + if (lastPlane) { + writeSpoolString("W"); + } else { + writeSpoolString("V"); + } + writeSpoolData(buffer, size); +} + +void PCL5Driver::jobEnd() +{ + writeSpoolString("\033&l1T"); + writeSpoolString("\033E"); +} + +void PCL5Driver::move(int x, int y) +{ + writeSpoolString("\033*p%dx%dY", x, y+75); +} + +int PCL5Driver::bytesToEnterCompressionMethod(int compression_method) +{ + if (fCompressionMethod == compression_method) { + return 0; + } else { + return 5; + } +} + diff --git a/src/add-ons/print/drivers/pcl5/PCL5.h b/src/add-ons/print/drivers/pcl5/PCL5.h index 1ee66a26c8..45bc07a4ea 100644 --- a/src/add-ons/print/drivers/pcl5/PCL5.h +++ b/src/add-ons/print/drivers/pcl5/PCL5.h @@ -1,41 +1,41 @@ -/* - * PCL5.h - * Copyright 1999-2000 Y.Takagi. All Rights Reserved. - */ - -#ifndef __PCL5_H -#define __PCL5_H - -#include "GraphicsDriver.h" - -class Halftone; - -class PCL5Driver : public GraphicsDriver { -public: - PCL5Driver(BMessage *msg, PrinterData *printer_data, const PrinterCap *printer_cap); - -protected: - virtual bool startDoc(); - virtual bool startPage(int page); - virtual bool nextBand(BBitmap *bitmap, BPoint *offset); - virtual bool endPage(int page); - virtual bool endDoc(bool success); - -private: - void move(int x, int y); - void jobStart(); - void startRasterGraphics(int width, int height); - void endRasterGraphics(); - void rasterGraphics( - int compression_method, - const uchar *buffer, - int size, - bool lastPlane); - void jobEnd(); - int bytesToEnterCompressionMethod(int compression_method); - - int fCompressionMethod; - Halftone *fHalftone; -}; - -#endif /* __PCL5_H */ +/* + * PCL5.h + * Copyright 1999-2000 Y.Takagi. All Rights Reserved. + */ + +#ifndef __PCL5_H +#define __PCL5_H + +#include "GraphicsDriver.h" + +class Halftone; + +class PCL5Driver : public GraphicsDriver { +public: + PCL5Driver(BMessage *msg, PrinterData *printer_data, const PrinterCap *printer_cap); + +protected: + virtual bool startDoc(); + virtual bool startPage(int page); + virtual bool nextBand(BBitmap *bitmap, BPoint *offset); + virtual bool endPage(int page); + virtual bool endDoc(bool success); + +private: + void move(int x, int y); + void jobStart(); + void startRasterGraphics(int width, int height); + void endRasterGraphics(); + void rasterGraphics( + int compression_method, + const uchar *buffer, + int size, + bool lastPlane); + void jobEnd(); + int bytesToEnterCompressionMethod(int compression_method); + + int fCompressionMethod; + Halftone *fHalftone; +}; + +#endif /* __PCL5_H */ diff --git a/src/add-ons/print/drivers/postscript/PS.h b/src/add-ons/print/drivers/postscript/PS.h index dd6370aa66..12caa535be 100644 --- a/src/add-ons/print/drivers/postscript/PS.h +++ b/src/add-ons/print/drivers/postscript/PS.h @@ -1,40 +1,40 @@ -/* - * PS.h - * Copyright 1999-2000 Y.Takagi. All Rights Reserved. - */ - -#ifndef __PS_H -#define __PS_H - -#include "GraphicsDriver.h" - -class Halftone; - -class PSDriver : public GraphicsDriver { -public: - PSDriver(BMessage *msg, PrinterData *printer_data, const PrinterCap *printer_cap); - -protected: - virtual bool startDoc(); - virtual bool startPage(int page); - virtual bool nextBand(BBitmap *bitmap, BPoint *offset); - virtual bool endPage(int page); - virtual bool endDoc(bool success); - -private: - void setupCTM(); - void jobStart(); - void startRasterGraphics(int x, int y, int width, int height, int widthByte); - void endRasterGraphics(); - void rasterGraphics( - int compression_method, - const uchar *buffer, - int size); - void jobEnd(); - - int fPrintedPages; - int fCompressionMethod; - Halftone *fHalftone; -}; - -#endif /* __PS_H */ +/* + * PS.h + * Copyright 1999-2000 Y.Takagi. All Rights Reserved. + */ + +#ifndef __PS_H +#define __PS_H + +#include "GraphicsDriver.h" + +class Halftone; + +class PSDriver : public GraphicsDriver { +public: + PSDriver(BMessage *msg, PrinterData *printer_data, const PrinterCap *printer_cap); + +protected: + virtual bool startDoc(); + virtual bool startPage(int page); + virtual bool nextBand(BBitmap *bitmap, BPoint *offset); + virtual bool endPage(int page); + virtual bool endDoc(bool success); + +private: + void setupCTM(); + void jobStart(); + void startRasterGraphics(int x, int y, int width, int height, int widthByte); + void endRasterGraphics(); + void rasterGraphics( + int compression_method, + const uchar *buffer, + int size); + void jobEnd(); + + int fPrintedPages; + int fCompressionMethod; + Halftone *fHalftone; +}; + +#endif /* __PS_H */ diff --git a/src/add-ons/print/transports/ipp/IppDefs.h b/src/add-ons/print/transports/ipp/IppDefs.h index 56601dcd0c..e4f020475a 100644 --- a/src/add-ons/print/transports/ipp/IppDefs.h +++ b/src/add-ons/print/transports/ipp/IppDefs.h @@ -1,11 +1,11 @@ -// Sun, 18 Jun 2000 -// Y.Takagi - -#ifndef __IppDefs_H -#define __IppDefs_H - -#define SPOOL_PATH "printer_file" -#define IPP_URL "_ipp/URL" -#define IPP_JOB_ID "_ipp/job_id" - -#endif //__IppDefs_H +// Sun, 18 Jun 2000 +// Y.Takagi + +#ifndef __IppDefs_H +#define __IppDefs_H + +#define SPOOL_PATH "printer_file" +#define IPP_URL "_ipp/URL" +#define IPP_JOB_ID "_ipp/job_id" + +#endif //__IppDefs_H diff --git a/src/add-ons/print/transports/ipp/IppSetupDlg.h b/src/add-ons/print/transports/ipp/IppSetupDlg.h index 02e6c89089..41b87906d3 100644 --- a/src/add-ons/print/transports/ipp/IppSetupDlg.h +++ b/src/add-ons/print/transports/ipp/IppSetupDlg.h @@ -1,24 +1,24 @@ -// Sun, 18 Jun 2000 -// Y.Takagi - -#ifndef __IppSetupDlg_H -#define __IppSetupDlg_H - -#include - -class BDirectory; - -class IppSetupDlg : public BWindow { -public: - IppSetupDlg(BDirectory *); - ~IppSetupDlg() {} - virtual bool QuitRequested(); - virtual void MessageReceived(BMessage *message); - int Go(); - -private: - int result; - long semaphore; -}; - -#endif // __IppSetupDlg_H +// Sun, 18 Jun 2000 +// Y.Takagi + +#ifndef __IppSetupDlg_H +#define __IppSetupDlg_H + +#include + +class BDirectory; + +class IppSetupDlg : public BWindow { +public: + IppSetupDlg(BDirectory *); + ~IppSetupDlg() {} + virtual bool QuitRequested(); + virtual void MessageReceived(BMessage *message); + int Go(); + +private: + int result; + long semaphore; +}; + +#endif // __IppSetupDlg_H diff --git a/src/add-ons/print/transports/ipp/IppURLConnection.h b/src/add-ons/print/transports/ipp/IppURLConnection.h index 5322906a9c..73e4497d9e 100644 --- a/src/add-ons/print/transports/ipp/IppURLConnection.h +++ b/src/add-ons/print/transports/ipp/IppURLConnection.h @@ -1,34 +1,34 @@ -// Sun, 18 Jun 2000 -// Y.Takagi - -#ifndef __IppURLConnection_H -#define __IppURLConnection_H - -#include "HttpURLConnection.h" - -class IppContent; - -class IppURLConnection : public HttpURLConnection { -public: - IppURLConnection(const URL &url); - ~IppURLConnection(); - - void setIppRequest(IppContent *); - const IppContent *getIppResponse() const; - - int length(); - - ostream &printIppRequest(ostream &); - ostream &printIppResponse(ostream &); - -protected: - virtual void setRequest(); - virtual void setContent(); - virtual void getContent(); - -private: - IppContent *__ippRequest; - IppContent *__ippResponse; -}; - -#endif // __IppURLConnection_H +// Sun, 18 Jun 2000 +// Y.Takagi + +#ifndef __IppURLConnection_H +#define __IppURLConnection_H + +#include "HttpURLConnection.h" + +class IppContent; + +class IppURLConnection : public HttpURLConnection { +public: + IppURLConnection(const URL &url); + ~IppURLConnection(); + + void setIppRequest(IppContent *); + const IppContent *getIppResponse() const; + + int length(); + + ostream &printIppRequest(ostream &); + ostream &printIppResponse(ostream &); + +protected: + virtual void setRequest(); + virtual void setContent(); + virtual void getContent(); + +private: + IppContent *__ippRequest; + IppContent *__ippResponse; +}; + +#endif // __IppURLConnection_H diff --git a/src/add-ons/print/transports/lpr/LprDefs.h b/src/add-ons/print/transports/lpr/LprDefs.h index adfcc474fa..a393d1d63b 100644 --- a/src/add-ons/print/transports/lpr/LprDefs.h +++ b/src/add-ons/print/transports/lpr/LprDefs.h @@ -1,12 +1,12 @@ -// Sun, 18 Jun 2000 -// Y.Takagi - -#ifndef __LprDefs_H -#define __LprDefs_H - -#define SPOOL_PATH "printer_file" -#define LPR_SERVER_NAME "_lpr/server_name" -#define LPR_QUEUE_NAME "_lpr/queue_name" -#define LPR_JOB_ID "_lpr/job_id" - -#endif //__LprDefs_H +// Sun, 18 Jun 2000 +// Y.Takagi + +#ifndef __LprDefs_H +#define __LprDefs_H + +#define SPOOL_PATH "printer_file" +#define LPR_SERVER_NAME "_lpr/server_name" +#define LPR_QUEUE_NAME "_lpr/queue_name" +#define LPR_JOB_ID "_lpr/job_id" + +#endif //__LprDefs_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jas_getopt.c b/src/add-ons/translators/jpeg2000/libjasper/jas_getopt.c index 7f579b3ef1..139efad64e 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jas_getopt.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jas_getopt.c @@ -113,7 +113,7 @@ /* * Command Line Option Parsing Library * - * $Id$ + * $Id: jas_getopt.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jas_image.c b/src/add-ons/translators/jpeg2000/libjasper/jas_image.c index f115753766..54ce5dc83c 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jas_image.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jas_image.c @@ -113,7 +113,7 @@ /* * Image Library * - * $Id$ + * $Id: jas_image.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jas_malloc.c b/src/add-ons/translators/jpeg2000/libjasper/jas_malloc.c index 43c4d3cdd5..a84c3c9877 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jas_malloc.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jas_malloc.c @@ -113,7 +113,7 @@ /* * Memory Allocator * - * $Id$ + * $Id: jas_malloc.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jas_seq.c b/src/add-ons/translators/jpeg2000/libjasper/jas_seq.c index b8e3c94b19..bdfe39c947 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jas_seq.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jas_seq.c @@ -113,7 +113,7 @@ /* * Sequence/Matrix Library * - * $Id$ + * $Id: jas_seq.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jas_stream.c b/src/add-ons/translators/jpeg2000/libjasper/jas_stream.c index 6713043643..1c3961595c 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jas_stream.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jas_stream.c @@ -113,7 +113,7 @@ /* * I/O Stream Library * - * $Id$ + * $Id: jas_stream.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jas_string.c b/src/add-ons/translators/jpeg2000/libjasper/jas_string.c index 945731a10f..df26a1a11b 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jas_string.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jas_string.c @@ -113,7 +113,7 @@ /* * String Library * - * $Id$ + * $Id: jas_string.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jas_tvp.c b/src/add-ons/translators/jpeg2000/libjasper/jas_tvp.c index 37b8abed43..e2dd2b23fd 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jas_tvp.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jas_tvp.c @@ -111,7 +111,7 @@ /* * Tag-Value Parser Library * - * $Id$ + * $Id: jas_tvp.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_debug.h b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_debug.h index 0b076132d9..ab015eba18 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_debug.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_debug.h @@ -111,7 +111,7 @@ /* * Debugging-Related Code * - * $Id$ + * $Id: jas_debug.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JAS_DEBUG_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_fix.h b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_fix.h index 9599eb1cd3..86d55388d5 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_fix.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_fix.h @@ -113,7 +113,7 @@ /* * Fixed-Point Number Class * - * $Id$ + * $Id: jas_fix.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JAS_FIX_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_getopt.h b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_getopt.h index 4f272dc9bf..c4b636f448 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_getopt.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_getopt.h @@ -113,7 +113,7 @@ /* * Command Line Option Parsing Code * - * $Id$ + * $Id: jas_getopt.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JAS_GETOPT_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_image.h b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_image.h index 4abc678fea..81b98e9c06 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_image.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_image.h @@ -113,7 +113,7 @@ /* * Image Class * - * $Id$ + * $Id: jas_image.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JAS_IMAGE_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_malloc.h b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_malloc.h index fe5b6172c9..1b13384893 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_malloc.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_malloc.h @@ -113,7 +113,7 @@ /* * Memory Allocator * - * $Id$ + * $Id: jas_malloc.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JAS_MALLOC_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_math.h b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_math.h index a43051e5aa..7b3c7e561a 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_math.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_math.h @@ -113,7 +113,7 @@ /* * Math-Related Code * - * $Id$ + * $Id: jas_math.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JAS_MATH_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_seq.h b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_seq.h index d4a935abac..6ba1be5386 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_seq.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_seq.h @@ -113,7 +113,7 @@ /* * Sequence/Matrix Library * - * $Id$ + * $Id: jas_seq.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JAS_SEQ_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_stream.h b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_stream.h index 0845140be7..c2fa6657ca 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_stream.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_stream.h @@ -113,7 +113,7 @@ /* * I/O Stream Class * - * $Id$ + * $Id: jas_stream.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JAS_STREAM_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_string.h b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_string.h index 55b611ba05..44d9991f71 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_string.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_string.h @@ -113,7 +113,7 @@ /* * String Library * - * $Id$ + * $Id: jas_string.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JAS_STRING_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_tvp.h b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_tvp.h index b132980cbf..547eafcc9c 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_tvp.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_tvp.h @@ -111,7 +111,7 @@ /* * Tag/Value Parser * - * $Id$ + * $Id: jas_tvp.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JAS_TVP_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_types.h b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_types.h index 8ee940fb8f..241ed4241e 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_types.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_types.h @@ -113,7 +113,7 @@ /* * Primitive Types * - * $Id$ + * $Id: jas_types.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JAS_TYPES_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_version.h b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_version.h index 39fa895f0d..6e334e8e16 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_version.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_version.h @@ -111,7 +111,7 @@ */ /* - * $Id$ + * $Id: jas_version.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JAS_VERSION_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jp2_cod.c b/src/add-ons/translators/jpeg2000/libjasper/jp2_cod.c index 414cd6ab99..b0f2703b92 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jp2_cod.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jp2_cod.c @@ -113,7 +113,7 @@ /* * JP2 Library * - * $Id$ + * $Id: jp2_cod.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jp2_cod.h b/src/add-ons/translators/jpeg2000/libjasper/jp2_cod.h index 34cfdb45d6..1b0f2366ba 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jp2_cod.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jp2_cod.h @@ -113,7 +113,7 @@ /* * JP2 Library * - * $Id$ + * $Id: jp2_cod.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JP2_COD_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jp2_dec.c b/src/add-ons/translators/jpeg2000/libjasper/jp2_dec.c index d1a7236be3..44bfb46668 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jp2_dec.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jp2_dec.c @@ -113,7 +113,7 @@ /* * JP2 Library * - * $Id$ + * $Id: jp2_dec.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jp2_enc.c b/src/add-ons/translators/jpeg2000/libjasper/jp2_enc.c index d65aedef2a..ed260a593a 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jp2_enc.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jp2_enc.c @@ -113,7 +113,7 @@ /* * JP2 Library * - * $Id$ + * $Id: jp2_enc.c 17515 2006-05-19 15:52:21Z axeld $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_bs.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_bs.c index 11ef5c47bf..35ff908723 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_bs.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_bs.c @@ -113,7 +113,7 @@ /* * Bit Stream Class * - * $Id$ + * $Id: jpc_bs.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_bs.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_bs.h index 5369889b6f..79d0b9e5d3 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_bs.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_bs.h @@ -113,7 +113,7 @@ /* * Bit Stream Class * - * $Id$ + * $Id: jpc_bs.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_BS_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_cod.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_cod.h index 9b3ddbee39..d196610c0e 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_cod.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_cod.h @@ -111,7 +111,7 @@ */ /* - * $Id$ + * $Id: jpc_cod.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_COD_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_cs.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_cs.c index 7dee748610..c9e0bd1bf3 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_cs.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_cs.c @@ -113,7 +113,7 @@ /* * JPEG-2000 Code Stream Library * - * $Id$ + * $Id: jpc_cs.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_cs.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_cs.h index f636631828..c0d127a7c8 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_cs.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_cs.h @@ -113,7 +113,7 @@ /* * JPEG-2000 Code Stream Library * - * $Id$ + * $Id: jpc_cs.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_CS_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_dec.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_dec.c index 3dc45a7622..70082923fc 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_dec.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_dec.c @@ -111,7 +111,7 @@ */ /* - * $Id$ + * $Id: jpc_dec.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_dec.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_dec.h index 9f9106d783..230a5b65b6 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_dec.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_dec.h @@ -113,7 +113,7 @@ /* * JPEG-2000 Decoder * - * $Id$ + * $Id: jpc_dec.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_DEC_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_enc.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_enc.c index 3912804d06..5949c49d1b 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_enc.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_enc.c @@ -111,7 +111,7 @@ */ /* - * $Id$ + * $Id: jpc_enc.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_enc.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_enc.h index 4b5fa5fa8b..3e819fd27c 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_enc.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_enc.h @@ -111,7 +111,7 @@ */ /* - * $Id$ + * $Id: jpc_enc.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_ENC_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_fix.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_fix.h index 5ff0c9f89e..1de0da5a96 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_fix.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_fix.h @@ -113,7 +113,7 @@ /* * Fixed-Point Number Class * - * $Id$ + * $Id: jpc_fix.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_FIX_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_flt.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_flt.h index 088eb00c4e..65025e39a8 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_flt.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_flt.h @@ -113,7 +113,7 @@ /* * Floating-Point Class * - * $Id$ + * $Id: jpc_flt.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_FLT_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_math.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_math.c index d860847d70..438ac1bdbe 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_math.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_math.c @@ -113,7 +113,7 @@ /* * Math Library * - * $Id$ + * $Id: jpc_math.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_mct.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_mct.c index 7c16c3e5f8..3ebe2c8b0f 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_mct.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_mct.c @@ -113,7 +113,7 @@ /* * Multicomponent Transform Code * - * $Id$ + * $Id: jpc_mct.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_mct.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_mct.h index d03d6ce15c..8bc373f50a 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_mct.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_mct.h @@ -113,7 +113,7 @@ /* * Multicomponent Transform Code * - * $Id$ + * $Id: jpc_mct.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_MCT_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_mqcod.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_mqcod.c index 535eaa2d14..6317fea2bc 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_mqcod.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_mqcod.c @@ -113,7 +113,7 @@ /* * MQ Arithmetic Coder * - * $Id$ + * $Id: jpc_mqcod.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_mqcod.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_mqcod.h index 4ac31ef571..be1ae0163e 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_mqcod.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_mqcod.h @@ -113,7 +113,7 @@ /* * MQ Arithmetic Coder * - * $Id$ + * $Id: jpc_mqcod.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_MQCOD_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_mqdec.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_mqdec.c index 68d930a408..ac3828948b 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_mqdec.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_mqdec.c @@ -113,7 +113,7 @@ /* * MQ Arithmetic Decoder * - * $Id$ + * $Id: jpc_mqdec.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_mqdec.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_mqdec.h index 653576a0a8..dc6285dc65 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_mqdec.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_mqdec.h @@ -113,7 +113,7 @@ /* * MQ Arithmetic Decoder * - * $Id$ + * $Id: jpc_mqdec.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_MQDEC_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_mqenc.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_mqenc.c index 0219a000cb..7a716a8b7e 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_mqenc.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_mqenc.c @@ -113,7 +113,7 @@ /* * MQ Arithmetic Encoder * - * $Id$ + * $Id: jpc_mqenc.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_mqenc.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_mqenc.h index 1421ae4dbb..955143d038 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_mqenc.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_mqenc.h @@ -113,7 +113,7 @@ /* * MQ Arithmetic Encoder * - * $Id$ + * $Id: jpc_mqenc.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_MQENC_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_qmfb.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_qmfb.c index ca4f04fcf3..f67d4b5140 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_qmfb.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_qmfb.c @@ -113,7 +113,7 @@ /* * Quadrature Mirror-Image Filter Bank (QMFB) Library * - * $Id$ + * $Id: jpc_qmfb.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_qmfb.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_qmfb.h index e10b6c13b7..19541a4e9d 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_qmfb.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_qmfb.h @@ -113,7 +113,7 @@ /* * Quadrature Mirror-Image Filter Bank (QMFB) Routines * - * $Id$ + * $Id: jpc_qmfb.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_QMFB_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_t1cod.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_t1cod.c index 0b2123f0d8..2344a55eb6 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_t1cod.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_t1cod.c @@ -111,7 +111,7 @@ */ /* - * $Id$ + * $Id: jpc_t1cod.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_t1cod.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_t1cod.h index 45f4894648..1405efa024 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_t1cod.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_t1cod.h @@ -111,7 +111,7 @@ */ /* - * $Id$ + * $Id: jpc_t1cod.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_T1COD_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_t1dec.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_t1dec.c index 01a54ea8fc..6d5179e8fc 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_t1dec.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_t1dec.c @@ -113,7 +113,7 @@ /* * Tier 1 Decoder * - * $Id$ + * $Id: jpc_t1dec.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_t1dec.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_t1dec.h index e28a1f57d6..9c10d21392 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_t1dec.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_t1dec.h @@ -113,7 +113,7 @@ /* * Tier 1 Decoder * - * $Id$ + * $Id: jpc_t1dec.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_T1DEC_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_t1enc.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_t1enc.c index c0102b5ec0..216dfa65f7 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_t1enc.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_t1enc.c @@ -113,7 +113,7 @@ /* * Tier 1 Encoder * - * $Id$ + * $Id: jpc_t1enc.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_t1enc.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_t1enc.h index 9ce5ed278f..e78d5db0b8 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_t1enc.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_t1enc.h @@ -113,7 +113,7 @@ /* * Tier 1 Encoder * - * $Id$ + * $Id: jpc_t1enc.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_T1ENC_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_t2cod.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_t2cod.c index 31b55ea979..3a4dd9e301 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_t2cod.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_t2cod.c @@ -113,7 +113,7 @@ /* * Tier-2 Coding Library * - * $Id$ + * $Id: jpc_t2cod.c 14449 2005-10-20 12:15:56Z stippi $ */ #include "jasper/jas_math.h" diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_t2cod.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_t2cod.h index 05ae5c44d4..b674936db1 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_t2cod.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_t2cod.h @@ -113,7 +113,7 @@ /* * Tier-2 Coding Library * - * $Id$ + * $Id: jpc_t2cod.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_T2COD_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_t2dec.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_t2dec.c index 65c2ad75c2..9f6807d1eb 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_t2dec.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_t2dec.c @@ -113,7 +113,7 @@ /* * Tier 2 Decoder * - * $Id$ + * $Id: jpc_t2dec.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_t2dec.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_t2dec.h index 923d7c1a2c..4ece64045d 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_t2dec.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_t2dec.h @@ -113,7 +113,7 @@ /* * Tier 2 Decoder * - * $Id$ + * $Id: jpc_t2dec.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_T2DEC_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_t2enc.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_t2enc.c index 1444dc7b14..f3cfc1917d 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_t2enc.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_t2enc.c @@ -113,7 +113,7 @@ /* * Tier 2 Encoder * - * $Id$ + * $Id: jpc_t2enc.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_t2enc.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_t2enc.h index e97f8c06a5..8366fddf65 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_t2enc.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_t2enc.h @@ -113,7 +113,7 @@ /* * Tier 2 Encoder * - * $Id$ + * $Id: jpc_t2enc.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_T2ENC_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_tagtree.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_tagtree.c index 07c6dca206..3990eb9ee0 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_tagtree.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_tagtree.c @@ -113,7 +113,7 @@ /* * Tag Tree Library * - * $Id$ + * $Id: jpc_tagtree.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_tagtree.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_tagtree.h index 1892b13f88..951b855b61 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_tagtree.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_tagtree.h @@ -113,7 +113,7 @@ /* * Tag Tree Library * - * $Id$ + * $Id: jpc_tagtree.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_TAGTREE_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_tsfb.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_tsfb.c index 1acd38618f..b2ba75d568 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_tsfb.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_tsfb.c @@ -113,7 +113,7 @@ /* * Tree-Structured Filter Bank (TSFB) Library * - * $Id$ + * $Id: jpc_tsfb.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_tsfb.h b/src/add-ons/translators/jpeg2000/libjasper/jpc_tsfb.h index 8670c22e6a..7631a127a3 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_tsfb.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_tsfb.h @@ -113,7 +113,7 @@ /* * Tree-Structured Filter Bank (TSFB) Library * - * $Id$ + * $Id: jpc_tsfb.h 14449 2005-10-20 12:15:56Z stippi $ */ #ifndef JPC_TSFB_H diff --git a/src/add-ons/translators/jpeg2000/libjasper/jpc_util.c b/src/add-ons/translators/jpeg2000/libjasper/jpc_util.c index 274b44414f..847c90e6fc 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jpc_util.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jpc_util.c @@ -111,7 +111,7 @@ */ /* - * $Id$ + * $Id: jpc_util.c 14449 2005-10-20 12:15:56Z stippi $ */ /******************************************************************************\ diff --git a/src/add-ons/translators/sgi/SGIImage.h b/src/add-ons/translators/sgi/SGIImage.h index 0a97116d95..de7afea2d6 100644 --- a/src/add-ons/translators/sgi/SGIImage.h +++ b/src/add-ons/translators/sgi/SGIImage.h @@ -34,7 +34,7 @@ /*****************************************************************************/ /* - * "$Id$" + * "$Id: SGIImage.h 14449 2005-10-20 12:15:56Z stippi $" * * Revision History: * diff --git a/src/add-ons/translators/tiff/t4.h b/src/add-ons/translators/tiff/t4.h index fa4f5f75d0..5193484f50 100644 --- a/src/add-ons/translators/tiff/t4.h +++ b/src/add-ons/translators/tiff/t4.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: t4.h 14449 2005-10-20 12:15:56Z stippi $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/add-ons/translators/tiff/tif_fax3.h b/src/add-ons/translators/tiff/tif_fax3.h index e64b145deb..677a7d2ca2 100644 --- a/src/add-ons/translators/tiff/tif_fax3.h +++ b/src/add-ons/translators/tiff/tif_fax3.h @@ -1,4 +1,4 @@ -/* $Id$ */ +/* $Id: tif_fax3.h 14449 2005-10-20 12:15:56Z stippi $ */ /* * Copyright (c) 1990-1997 Sam Leffler diff --git a/src/bin/bash/lib/sh/inet_aton.c b/src/bin/bash/lib/sh/inet_aton.c index 3b233a9a18..2b004530e8 100644 --- a/src/bin/bash/lib/sh/inet_aton.c +++ b/src/bin/bash/lib/sh/inet_aton.c @@ -57,7 +57,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93"; -static char rcsid[] = "$Id$"; +static char rcsid[] = "$Id: inet_aton.c 28305 2008-10-23 21:46:26Z bonefish $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/src/bin/bash/support/texi2dvi b/src/bin/bash/support/texi2dvi index 2272d0f1df..2325ba846a 100644 --- a/src/bin/bash/support/texi2dvi +++ b/src/bin/bash/support/texi2dvi @@ -1,6 +1,6 @@ #! /bin/sh # texi2dvi --- produce DVI (or PDF) files from Texinfo (or LaTeX) sources. -# $Id: texi2dvi,v 1.1 2004/06/07 09:07:25 korli Exp $ +# $Id: texi2dvi 7792 2004-06-07 09:07:27Z korli $ # # Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc. # diff --git a/src/bin/bash/support/texi2html b/src/bin/bash/support/texi2html index 19b572e516..f979e7ad17 100644 --- a/src/bin/bash/support/texi2html +++ b/src/bin/bash/support/texi2html @@ -36,7 +36,7 @@ require 5.0; #--############################################################################## # CVS version: -# $Id: texi2html,v 1.1 2004/06/07 09:07:25 korli Exp $ +# $Id: texi2html 7792 2004-06-07 09:07:27Z korli $ # Homepage: $T2H_HOMEPAGE = < # -# $Id: texi2html,v 1.1 2004/06/07 09:07:25 korli Exp $ +# $Id: texi2html 7792 2004-06-07 09:07:27Z korli $ ###################################################################### # stuff which can also be set by command-line options @@ -1510,7 +1510,7 @@ package Getopt::MySimple; # -------------------------------------------------------------------------- # Locally modified by obachman (Display type instead of env, order by cmp) -# $Id: texi2html,v 1.1 2004/06/07 09:07:25 korli Exp $ +# $Id: texi2html 7792 2004-06-07 09:07:27Z korli $ # use strict; # no strict 'refs'; diff --git a/src/bin/comm.c b/src/bin/comm.c index 656af25906..7142b83132 100644 --- a/src/bin/comm.c +++ b/src/bin/comm.c @@ -1,230 +1,230 @@ -/* - * Copyright (c) 1989, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Case Larsen. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef lint -static const char copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n The Regents of the University of California. All rights reserved.\n"; -#endif - -#if 1 -#ifndef lint -static char sccsid[] = "From: @(#)comm.c 8.4 (Berkeley) 5/4/95"; -#endif -#endif - -//#include -//__FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/comm/comm.c,v 1.20 2002/07/28 15:28:38 dwmalone Exp $"); - -#include -//#include -#include -#include -#include -#include -#include -#include -#define LINE_MAX 99999 -#define MAXLINELEN (LINE_MAX + 1) - -const char *tabs[] = { "", "\t", "\t\t" }; - -FILE *file(const char *); -void show(FILE *, const char *, char *); -int stricoll(const char *, const char *); -static void usage(void); -static void printversion(void); - -int -main(int argc, char *argv[]) -{ - int comp, file1done = 0, file2done = 0, read1, read2; - int ch, flag1, flag2, flag3, iflag; - FILE *fp1, *fp2; - const char *col1, *col2, *col3; - char line1[MAXLINELEN], line2[MAXLINELEN]; - const char **p; - - flag1 = flag2 = flag3 = 1; - iflag = 0; - - (void) setlocale(LC_ALL, ""); - - while ((ch = getopt(argc, argv, "123ivh")) != -1) - switch(ch) { - case '1': - flag1 = 0; - break; - case '2': - flag2 = 0; - break; - case '3': - flag3 = 0; - break; - case 'i': - iflag = 1; - break; - case 'v': - printversion(); - break; - default: - usage(); - } - - argc -= optind; - argv += optind; - - if (argc != 2) - usage(); - - fp1 = file(argv[0]); - fp2 = file(argv[1]); - - /* for each column printed, add another tab offset */ - p = tabs; - col1 = col2 = col3 = NULL; - if (flag1) - col1 = *p++; - if (flag2) - col2 = *p++; - if (flag3) - col3 = *p; - - for (read1 = read2 = 1;;) { - /* read next line, check for EOF */ - if (read1) - file1done = !fgets(line1, MAXLINELEN, fp1); - if (read2) - file2done = !fgets(line2, MAXLINELEN, fp2); - - /* if one file done, display the rest of the other file */ - if (file1done) { - if (!file2done && col2) - show(fp2, col2, line2); - break; - } - if (file2done) { - if (!file1done && col1) - show(fp1, col1, line1); - break; - } - - /* lines are the same */ - if(iflag) - comp = stricoll(line1, line2); - else - comp = strcoll(line1, line2); - - if (!comp) { - read1 = read2 = 1; - if (col3) - (void)printf("%s%s", col3, line1); - continue; - } - - /* lines are different */ - if (comp < 0) { - read1 = 1; - read2 = 0; - if (col1) - (void)printf("%s%s", col1, line1); - } else { - read1 = 0; - read2 = 1; - if (col2) - (void)printf("%s%s", col2, line2); - } - } - exit(0); -} - -void -show(FILE *fp, const char *offset, char *buf) -{ - - do { - (void)printf("%s%s", offset, buf); - } while (fgets(buf, MAXLINELEN, fp)); -} - -FILE * -file(const char *name) -{ - FILE *fp; - - if (!strcmp(name, "-")) - return (stdin); - if ((fp = fopen(name, "r")) == NULL) { - sprintf("%s", name); - } - return (fp); -} - -static void -usage(void) -{ - (void)fprintf(stderr, "Usage: /bin/comm [OPTION]... LEFT_FILE RIGHT_FILE -Compare sorted files LEFT_FILE and RIGHT_FILE line by line. - - -1 suppress lines unique to left file - -2 suppress lines unique to right file - -3 suppress lines unique to both files - -help display this help and exit - -version output version information and exit - "); - exit(1); -} - -static void -printversion(void) -{ - (void)fprintf(stderr, copyright); - (void)fprintf(stderr, "\nVersion : %s\n", sccsid); - exit(1); -} - -int -stricoll(const char *s1, const char *s2) -{ - char *p, line1[MAXLINELEN], line2[MAXLINELEN]; - - for (p = line1; *s1; s1++) - *p++ = tolower((unsigned char)*s1); - *p = '\0'; - for (p = line2; *s2; s2++) - *p++ = tolower((unsigned char)*s2); - *p = '\0'; - return strcoll(line1, line2); -} - +/* + * Copyright (c) 1989, 1993, 1994 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Case Larsen. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef lint +static const char copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n The Regents of the University of California. All rights reserved.\n"; +#endif + +#if 1 +#ifndef lint +static char sccsid[] = "From: @(#)comm.c 8.4 (Berkeley) 5/4/95"; +#endif +#endif + +//#include +//__FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/comm/comm.c,v 1.20 2002/07/28 15:28:38 dwmalone Exp $"); + +#include +//#include +#include +#include +#include +#include +#include +#include +#define LINE_MAX 99999 +#define MAXLINELEN (LINE_MAX + 1) + +const char *tabs[] = { "", "\t", "\t\t" }; + +FILE *file(const char *); +void show(FILE *, const char *, char *); +int stricoll(const char *, const char *); +static void usage(void); +static void printversion(void); + +int +main(int argc, char *argv[]) +{ + int comp, file1done = 0, file2done = 0, read1, read2; + int ch, flag1, flag2, flag3, iflag; + FILE *fp1, *fp2; + const char *col1, *col2, *col3; + char line1[MAXLINELEN], line2[MAXLINELEN]; + const char **p; + + flag1 = flag2 = flag3 = 1; + iflag = 0; + + (void) setlocale(LC_ALL, ""); + + while ((ch = getopt(argc, argv, "123ivh")) != -1) + switch(ch) { + case '1': + flag1 = 0; + break; + case '2': + flag2 = 0; + break; + case '3': + flag3 = 0; + break; + case 'i': + iflag = 1; + break; + case 'v': + printversion(); + break; + default: + usage(); + } + + argc -= optind; + argv += optind; + + if (argc != 2) + usage(); + + fp1 = file(argv[0]); + fp2 = file(argv[1]); + + /* for each column printed, add another tab offset */ + p = tabs; + col1 = col2 = col3 = NULL; + if (flag1) + col1 = *p++; + if (flag2) + col2 = *p++; + if (flag3) + col3 = *p; + + for (read1 = read2 = 1;;) { + /* read next line, check for EOF */ + if (read1) + file1done = !fgets(line1, MAXLINELEN, fp1); + if (read2) + file2done = !fgets(line2, MAXLINELEN, fp2); + + /* if one file done, display the rest of the other file */ + if (file1done) { + if (!file2done && col2) + show(fp2, col2, line2); + break; + } + if (file2done) { + if (!file1done && col1) + show(fp1, col1, line1); + break; + } + + /* lines are the same */ + if(iflag) + comp = stricoll(line1, line2); + else + comp = strcoll(line1, line2); + + if (!comp) { + read1 = read2 = 1; + if (col3) + (void)printf("%s%s", col3, line1); + continue; + } + + /* lines are different */ + if (comp < 0) { + read1 = 1; + read2 = 0; + if (col1) + (void)printf("%s%s", col1, line1); + } else { + read1 = 0; + read2 = 1; + if (col2) + (void)printf("%s%s", col2, line2); + } + } + exit(0); +} + +void +show(FILE *fp, const char *offset, char *buf) +{ + + do { + (void)printf("%s%s", offset, buf); + } while (fgets(buf, MAXLINELEN, fp)); +} + +FILE * +file(const char *name) +{ + FILE *fp; + + if (!strcmp(name, "-")) + return (stdin); + if ((fp = fopen(name, "r")) == NULL) { + sprintf("%s", name); + } + return (fp); +} + +static void +usage(void) +{ + (void)fprintf(stderr, "Usage: /bin/comm [OPTION]... LEFT_FILE RIGHT_FILE +Compare sorted files LEFT_FILE and RIGHT_FILE line by line. + + -1 suppress lines unique to left file + -2 suppress lines unique to right file + -3 suppress lines unique to both files + -help display this help and exit + -version output version information and exit + "); + exit(1); +} + +static void +printversion(void) +{ + (void)fprintf(stderr, copyright); + (void)fprintf(stderr, "\nVersion : %s\n", sccsid); + exit(1); +} + +int +stricoll(const char *s1, const char *s2) +{ + char *p, line1[MAXLINELEN], line2[MAXLINELEN]; + + for (p = line1; *s1; s1++) + *p++ = tolower((unsigned char)*s1); + *p = '\0'; + for (p = line2; *s2; s2++) + *p++ = tolower((unsigned char)*s2); + *p = '\0'; + return strcoll(line1, line2); +} + diff --git a/src/bin/coreutils/ChangeLog b/src/bin/coreutils/ChangeLog index 5ea137f43b..6fae0aa48b 100644 --- a/src/bin/coreutils/ChangeLog +++ b/src/bin/coreutils/ChangeLog @@ -1894,7 +1894,7 @@ maint: improve release-related process and documentation * README-release: Fix typo. it's "maintainer-clean". Refer to HACKING for full list of dependencies. - Use cvs add's -ko option to inhibit $Id$-style keyword expansion. + Use cvs add's -ko option to inhibit $Id: ChangeLog 32796 2009-08-28 22:30:24Z korli $-style keyword expansion. * maint.mk (web-manual): Factor out definition of $(manual_title). (vc-dist): Set XZ_OPT=-9ev for the final "make dist". * cfg.mk (manual_title): Define it here. diff --git a/src/bin/csplit.c b/src/bin/csplit.c index b5413ca7a1..9d52fb7e01 100644 --- a/src/bin/csplit.c +++ b/src/bin/csplit.c @@ -1,483 +1,483 @@ -/*- - * Copyright (c) 2002 Tim J. Robbins. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * csplit -- split files based on context - * - * This utility splits its input into numbered output files by line number - * or by a regular expression. Regular expression matches have an optional - * offset with them, allowing the split to occur a specified number of - * lines before or after the match. - * - * To handle negative offsets, we stop reading when the match occurs and - * store the offset that the file should have been split at, then use - * this output file as input until all the "overflowed" lines have been read. - * The file is then closed and truncated to the correct length. - * - * We assume that the output files can be seeked upon (ie. they cannot be - * symlinks to named pipes or character devices), but make no such - * assumption about the input. - */ - -/* - - Ported to OpenBeOS by Sikosis - phil@sikosis.com - - (C)2004 OpenBeOS - Released under the MIT License - -*/ - -// -#define REG_BASIC 0 - -//#include -//__FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/csplit/csplit.c,v 1.7 2002/07/28 15:41:15 dwmalone Exp $"); - -#include - -#include -//#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -void cleanup(void); -void do_lineno(const char *); -void do_rexp(const char *); -char *getline(void); -void handlesig(int); -FILE *newfile(void); -void toomuch(FILE *, long); -void usage(void); - -/* - * Command line options - */ -const char *prefix; /* File name prefix */ -long sufflen; /* Number of decimal digits for suffix */ -int sflag; /* Suppress output of file names */ -int kflag; /* Keep output if error occurs */ - -/* - * Other miscellaneous globals (XXX too many) - */ -long lineno; /* Current line number in input file */ -long reps; /* Number of repetitions for this pattern */ -long nfiles; /* Number of files output so far */ -long maxfiles; /* Maximum number of files we can create */ -char currfile[PATH_MAX]; /* Current output file */ -const char *infn; /* Name of the input file */ -FILE *infile; /* Input file handle */ -FILE *overfile; /* Overflow file for toomuch() */ -off_t truncofs; /* Offset this file should be truncated at */ -int doclean; /* Should cleanup() remove output? */ - -int -main(int argc, char *argv[]) -{ - struct sigaction sa; - long i; - int ch; - const char *expr; - char *ep, *p; - FILE *ofp; - - setlocale(LC_ALL, ""); - - kflag = sflag = 0; - prefix = "xx"; - sufflen = 2; - while ((ch = getopt(argc, argv, "ksf:n:")) > 0) { - switch (ch) { - case 'f': - prefix = optarg; - break; - case 'k': - kflag = 1; - break; - case 'n': - errno = 0; - sufflen = strtol(optarg, &ep, 10); - if (sufflen <= 0 || *ep != '\0' || errno != 0) - errx(1, "%s: bad suffix length", optarg); - break; - case 's': - sflag = 1; - break; - default: - usage(); - /*NOTREACHED*/ - } - } - - if (sufflen + strlen(prefix) >= PATH_MAX) - errx(1, "name too long"); - - argc -= optind; - argv += optind; - - if ((infn = *argv++) == NULL) - usage(); - if (strcmp(infn, "-") == 0) { - infile = stdin; - infn = "stdin"; - } else if ((infile = fopen(infn, "r")) == NULL) - err(1, "%s", infn); - - if (!kflag) { - doclean = 1; - atexit(cleanup); - sa.sa_flags = 0; - sa.sa_handler = handlesig; - sigemptyset(&sa.sa_mask); - sigaddset(&sa.sa_mask, SIGHUP); - sigaddset(&sa.sa_mask, SIGINT); - sigaddset(&sa.sa_mask, SIGTERM); - sigaction(SIGHUP, &sa, NULL); - sigaction(SIGINT, &sa, NULL); - sigaction(SIGTERM, &sa, NULL); - } - - lineno = 0; - nfiles = 0; - truncofs = 0; - overfile = NULL; - - /* Ensure 10^sufflen < LONG_MAX. */ - for (maxfiles = 1, i = 0; i < sufflen; i++) { - if (maxfiles > LONG_MAX / 10) - errx(1, "%ld: suffix too long (limit %ld)", - sufflen, i); - maxfiles *= 10; - } - - /* Create files based on supplied patterns. */ - while (nfiles < maxfiles - 1 && (expr = *argv++) != NULL) { - /* Look ahead & see if this pattern has any repetitions. */ - if (*argv != NULL && **argv == '{') { - errno = 0; - reps = strtol(*argv + 1, &ep, 10); - if (reps < 0 || *ep != '}' || errno != 0) - errx(1, "%s: bad repetition count", *argv + 1); - argv++; - } else - reps = 0; - - if (*expr == '/' || *expr == '%') { - do - do_rexp(expr); - while (reps-- != 0 && nfiles < maxfiles - 1); - } else if (isdigit((unsigned char)*expr)) - do_lineno(expr); - else - errx(1, "%s: unrecognised pattern", expr); - } - - /* Copy the rest into a new file. */ - if (!feof(infile)) { - ofp = newfile(); - while ((p = getline()) != NULL && fputs(p, ofp) == 0) - ; - if (!sflag) - printf("%jd\n", (intmax_t)ftello(ofp)); - if (fclose(ofp) != 0) - err(1, "%s", currfile); - } - - toomuch(NULL, 0); - doclean = 0; - - return (0); -} - -void -usage(void) -{ - - fprintf(stderr, -"usage: csplit [-ks] [-f prefix] [-n number] file args ...\n"); - exit(1); -} - -void -//handlesig(int sig __unused) // parse error before `__unused' -handlesig(int sig) -{ - const char msg[] = "csplit: caught signal, cleaning up\n"; - - write(STDERR_FILENO, msg, sizeof(msg) - 1); - cleanup(); - _exit(2); -} - -/* Create a new output file. */ -FILE * -newfile(void) -{ - FILE *fp; - - if ((size_t)snprintf(currfile, sizeof(currfile), "%s%0*ld", prefix, - (int)sufflen, nfiles) >= sizeof(currfile)) { - errno = ENAMETOOLONG; - err(1, NULL); - } - if ((fp = fopen(currfile, "w+")) == NULL) - err(1, "%s", currfile); - nfiles++; - - return (fp); -} - -/* Remove partial output, called before exiting. */ -void -cleanup(void) -{ - char fnbuf[PATH_MAX]; - long i; - - if (!doclean) - return; - - /* - * NOTE: One cannot portably assume to be able to call snprintf() - * from inside a signal handler. It does, however, appear to be safe - * to do on FreeBSD. The solution to this problem is worse than the - * problem itself. - */ - - for (i = 0; i < nfiles; i++) { - snprintf(fnbuf, sizeof(fnbuf), "%s%0*ld", prefix, - (int)sufflen, i); - unlink(fnbuf); - } -} - -/* Read a line from the input into a static buffer. */ -char * -getline(void) -{ - //static char lbuf[LINE_MAX]; // `LINE_MAX' undeclared (first use in this function) - static char lbuf[255]; // assume 255 - please fix if someone knows - FILE *src; - - src = overfile != NULL ? overfile : infile; - -again: if (fgets(lbuf, sizeof(lbuf), src) == NULL) { - if (src == overfile) { - src = infile; - goto again; - } - return (NULL); - } - if (ferror(src)) - err(1, "%s", infn); - lineno++; - - return (lbuf); -} - -/* Conceptually rewind the input (as obtained by getline()) back `n' lines. */ -void -toomuch(FILE *ofp, long n) -{ - char buf[BUFSIZ]; - size_t i, nread; - - if (overfile != NULL) { - /* - * Truncate the previous file we overflowed into back to - * the correct length, close it. - */ - if (fflush(overfile) != 0) - err(1, "overflow"); - if (ftruncate(fileno(overfile), truncofs) != 0) - err(1, "overflow"); - if (fclose(overfile) != 0) - err(1, "overflow"); - overfile = NULL; - } - - if (n == 0) - /* Just tidying up */ - return; - - lineno -= n; - - /* - * Wind the overflow file backwards to `n' lines before the - * current one. - */ - do { - if (ftello(ofp) < (off_t)sizeof(buf)) - rewind(ofp); - else - fseek(ofp, -(long)sizeof(buf), SEEK_CUR); - if (ferror(ofp)) - errx(1, "%s: can't seek", currfile); - if ((nread = fread(buf, 1, sizeof(buf), ofp)) == 0) - errx(1, "can't read overflowed output"); - if (fseek(ofp, -(long)nread, SEEK_CUR) != 0) - err(1, "%s", currfile); - for (i = 1; i <= nread; i++) - if (buf[nread - i] == '\n' && n-- == 0) - break; - if (ftello(ofp) == 0) - break; - } while (n > 0); - if (fseek(ofp, nread - i + 1, SEEK_CUR) != 0) - err(1, "%s", currfile); - - /* - * getline() will read from here. Next call will truncate to - * truncofs in this file. - */ - overfile = ofp; - truncofs = ftello(overfile); -} - -/* Handle splits for /regexp/ and %regexp% patterns. */ -void -do_rexp(const char *expr) -{ - regex_t cre; - intmax_t nwritten; - long ofs; - int first; - char *ecopy, *ep, *p, *pofs, *re; - FILE *ofp; - - if ((ecopy = strdup(expr)) == NULL) - err(1, "strdup"); - - re = ecopy + 1; - if ((pofs = strrchr(ecopy, *expr)) == NULL || pofs[-1] == '\\') - errx(1, "%s: missing trailing %c", expr, *expr); - *pofs++ = '\0'; - - if (*pofs != '\0') { - errno = 0; - ofs = strtol(pofs, &ep, 10); - if (*ep != '\0' || errno != 0) - errx(1, "%s: bad offset", pofs); - } else - ofs = 0; - - if (regcomp(&cre, re, REG_BASIC|REG_NOSUB) != 0) - errx(1, "%s: bad regular expression", re); - - if (*expr == '/') - /* /regexp/: Save results to a file. */ - ofp = newfile(); - else { - /* %regexp%: Make a temporary file for overflow. */ - if ((ofp = tmpfile()) == NULL) - err(1, "tmpfile"); - } - - /* Read and output lines until we get a match. */ - first = 1; - while ((p = getline()) != NULL) { - if (fputs(p, ofp) != 0) - break; - if (!first && regexec(&cre, p, 0, NULL, 0) == 0) - break; - first = 0; - } - - if (p == NULL) - errx(1, "%s: no match", re); - - if (ofs <= 0) { - /* - * Negative (or zero) offset: throw back any lines we should - * not have read yet. - */ - if (p != NULL) { - toomuch(ofp, -ofs + 1); - nwritten = (intmax_t)truncofs; - } else - nwritten = (intmax_t)ftello(ofp); - } else { - /* - * Positive offset: copy the requested number of lines - * after the match. - */ - while (--ofs > 0 && (p = getline()) != NULL) - fputs(p, ofp); - toomuch(NULL, 0); - nwritten = (intmax_t)ftello(ofp); - if (fclose(ofp) != 0) - err(1, "%s", currfile); - } - - if (!sflag && *expr == '/') - printf("%jd\n", nwritten); - - regfree(&cre); - free(ecopy); -} - -/* Handle splits based on line number. */ -void -do_lineno(const char *expr) -{ - long lastline, tgtline; - char *ep, *p; - FILE *ofp; - - errno = 0; - tgtline = strtol(expr, &ep, 10); - if (tgtline <= 0 || errno != 0 || *ep != '\0') - errx(1, "%s: bad line number", expr); - lastline = tgtline; - if (lastline <= lineno) - errx(1, "%s: can't go backwards", expr); - - while (nfiles < maxfiles - 1) { - ofp = newfile(); - while (lineno + 1 != lastline) { - if ((p = getline()) == NULL) - errx(1, "%ld: out of range", lastline); - if (fputs(p, ofp) != 0) - break; - } - if (!sflag) - printf("%jd\n", (intmax_t)ftello(ofp)); - if (fclose(ofp) != 0) - err(1, "%s", currfile); - if (reps-- == 0) - break; - lastline += tgtline; - } -} - +/*- + * Copyright (c) 2002 Tim J. Robbins. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * csplit -- split files based on context + * + * This utility splits its input into numbered output files by line number + * or by a regular expression. Regular expression matches have an optional + * offset with them, allowing the split to occur a specified number of + * lines before or after the match. + * + * To handle negative offsets, we stop reading when the match occurs and + * store the offset that the file should have been split at, then use + * this output file as input until all the "overflowed" lines have been read. + * The file is then closed and truncated to the correct length. + * + * We assume that the output files can be seeked upon (ie. they cannot be + * symlinks to named pipes or character devices), but make no such + * assumption about the input. + */ + +/* + + Ported to OpenBeOS by Sikosis - phil@sikosis.com + + (C)2004 OpenBeOS - Released under the MIT License + +*/ + +// +#define REG_BASIC 0 + +//#include +//__FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/csplit/csplit.c,v 1.7 2002/07/28 15:41:15 dwmalone Exp $"); + +#include + +#include +//#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +void cleanup(void); +void do_lineno(const char *); +void do_rexp(const char *); +char *getline(void); +void handlesig(int); +FILE *newfile(void); +void toomuch(FILE *, long); +void usage(void); + +/* + * Command line options + */ +const char *prefix; /* File name prefix */ +long sufflen; /* Number of decimal digits for suffix */ +int sflag; /* Suppress output of file names */ +int kflag; /* Keep output if error occurs */ + +/* + * Other miscellaneous globals (XXX too many) + */ +long lineno; /* Current line number in input file */ +long reps; /* Number of repetitions for this pattern */ +long nfiles; /* Number of files output so far */ +long maxfiles; /* Maximum number of files we can create */ +char currfile[PATH_MAX]; /* Current output file */ +const char *infn; /* Name of the input file */ +FILE *infile; /* Input file handle */ +FILE *overfile; /* Overflow file for toomuch() */ +off_t truncofs; /* Offset this file should be truncated at */ +int doclean; /* Should cleanup() remove output? */ + +int +main(int argc, char *argv[]) +{ + struct sigaction sa; + long i; + int ch; + const char *expr; + char *ep, *p; + FILE *ofp; + + setlocale(LC_ALL, ""); + + kflag = sflag = 0; + prefix = "xx"; + sufflen = 2; + while ((ch = getopt(argc, argv, "ksf:n:")) > 0) { + switch (ch) { + case 'f': + prefix = optarg; + break; + case 'k': + kflag = 1; + break; + case 'n': + errno = 0; + sufflen = strtol(optarg, &ep, 10); + if (sufflen <= 0 || *ep != '\0' || errno != 0) + errx(1, "%s: bad suffix length", optarg); + break; + case 's': + sflag = 1; + break; + default: + usage(); + /*NOTREACHED*/ + } + } + + if (sufflen + strlen(prefix) >= PATH_MAX) + errx(1, "name too long"); + + argc -= optind; + argv += optind; + + if ((infn = *argv++) == NULL) + usage(); + if (strcmp(infn, "-") == 0) { + infile = stdin; + infn = "stdin"; + } else if ((infile = fopen(infn, "r")) == NULL) + err(1, "%s", infn); + + if (!kflag) { + doclean = 1; + atexit(cleanup); + sa.sa_flags = 0; + sa.sa_handler = handlesig; + sigemptyset(&sa.sa_mask); + sigaddset(&sa.sa_mask, SIGHUP); + sigaddset(&sa.sa_mask, SIGINT); + sigaddset(&sa.sa_mask, SIGTERM); + sigaction(SIGHUP, &sa, NULL); + sigaction(SIGINT, &sa, NULL); + sigaction(SIGTERM, &sa, NULL); + } + + lineno = 0; + nfiles = 0; + truncofs = 0; + overfile = NULL; + + /* Ensure 10^sufflen < LONG_MAX. */ + for (maxfiles = 1, i = 0; i < sufflen; i++) { + if (maxfiles > LONG_MAX / 10) + errx(1, "%ld: suffix too long (limit %ld)", + sufflen, i); + maxfiles *= 10; + } + + /* Create files based on supplied patterns. */ + while (nfiles < maxfiles - 1 && (expr = *argv++) != NULL) { + /* Look ahead & see if this pattern has any repetitions. */ + if (*argv != NULL && **argv == '{') { + errno = 0; + reps = strtol(*argv + 1, &ep, 10); + if (reps < 0 || *ep != '}' || errno != 0) + errx(1, "%s: bad repetition count", *argv + 1); + argv++; + } else + reps = 0; + + if (*expr == '/' || *expr == '%') { + do + do_rexp(expr); + while (reps-- != 0 && nfiles < maxfiles - 1); + } else if (isdigit((unsigned char)*expr)) + do_lineno(expr); + else + errx(1, "%s: unrecognised pattern", expr); + } + + /* Copy the rest into a new file. */ + if (!feof(infile)) { + ofp = newfile(); + while ((p = getline()) != NULL && fputs(p, ofp) == 0) + ; + if (!sflag) + printf("%jd\n", (intmax_t)ftello(ofp)); + if (fclose(ofp) != 0) + err(1, "%s", currfile); + } + + toomuch(NULL, 0); + doclean = 0; + + return (0); +} + +void +usage(void) +{ + + fprintf(stderr, +"usage: csplit [-ks] [-f prefix] [-n number] file args ...\n"); + exit(1); +} + +void +//handlesig(int sig __unused) // parse error before `__unused' +handlesig(int sig) +{ + const char msg[] = "csplit: caught signal, cleaning up\n"; + + write(STDERR_FILENO, msg, sizeof(msg) - 1); + cleanup(); + _exit(2); +} + +/* Create a new output file. */ +FILE * +newfile(void) +{ + FILE *fp; + + if ((size_t)snprintf(currfile, sizeof(currfile), "%s%0*ld", prefix, + (int)sufflen, nfiles) >= sizeof(currfile)) { + errno = ENAMETOOLONG; + err(1, NULL); + } + if ((fp = fopen(currfile, "w+")) == NULL) + err(1, "%s", currfile); + nfiles++; + + return (fp); +} + +/* Remove partial output, called before exiting. */ +void +cleanup(void) +{ + char fnbuf[PATH_MAX]; + long i; + + if (!doclean) + return; + + /* + * NOTE: One cannot portably assume to be able to call snprintf() + * from inside a signal handler. It does, however, appear to be safe + * to do on FreeBSD. The solution to this problem is worse than the + * problem itself. + */ + + for (i = 0; i < nfiles; i++) { + snprintf(fnbuf, sizeof(fnbuf), "%s%0*ld", prefix, + (int)sufflen, i); + unlink(fnbuf); + } +} + +/* Read a line from the input into a static buffer. */ +char * +getline(void) +{ + //static char lbuf[LINE_MAX]; // `LINE_MAX' undeclared (first use in this function) + static char lbuf[255]; // assume 255 - please fix if someone knows + FILE *src; + + src = overfile != NULL ? overfile : infile; + +again: if (fgets(lbuf, sizeof(lbuf), src) == NULL) { + if (src == overfile) { + src = infile; + goto again; + } + return (NULL); + } + if (ferror(src)) + err(1, "%s", infn); + lineno++; + + return (lbuf); +} + +/* Conceptually rewind the input (as obtained by getline()) back `n' lines. */ +void +toomuch(FILE *ofp, long n) +{ + char buf[BUFSIZ]; + size_t i, nread; + + if (overfile != NULL) { + /* + * Truncate the previous file we overflowed into back to + * the correct length, close it. + */ + if (fflush(overfile) != 0) + err(1, "overflow"); + if (ftruncate(fileno(overfile), truncofs) != 0) + err(1, "overflow"); + if (fclose(overfile) != 0) + err(1, "overflow"); + overfile = NULL; + } + + if (n == 0) + /* Just tidying up */ + return; + + lineno -= n; + + /* + * Wind the overflow file backwards to `n' lines before the + * current one. + */ + do { + if (ftello(ofp) < (off_t)sizeof(buf)) + rewind(ofp); + else + fseek(ofp, -(long)sizeof(buf), SEEK_CUR); + if (ferror(ofp)) + errx(1, "%s: can't seek", currfile); + if ((nread = fread(buf, 1, sizeof(buf), ofp)) == 0) + errx(1, "can't read overflowed output"); + if (fseek(ofp, -(long)nread, SEEK_CUR) != 0) + err(1, "%s", currfile); + for (i = 1; i <= nread; i++) + if (buf[nread - i] == '\n' && n-- == 0) + break; + if (ftello(ofp) == 0) + break; + } while (n > 0); + if (fseek(ofp, nread - i + 1, SEEK_CUR) != 0) + err(1, "%s", currfile); + + /* + * getline() will read from here. Next call will truncate to + * truncofs in this file. + */ + overfile = ofp; + truncofs = ftello(overfile); +} + +/* Handle splits for /regexp/ and %regexp% patterns. */ +void +do_rexp(const char *expr) +{ + regex_t cre; + intmax_t nwritten; + long ofs; + int first; + char *ecopy, *ep, *p, *pofs, *re; + FILE *ofp; + + if ((ecopy = strdup(expr)) == NULL) + err(1, "strdup"); + + re = ecopy + 1; + if ((pofs = strrchr(ecopy, *expr)) == NULL || pofs[-1] == '\\') + errx(1, "%s: missing trailing %c", expr, *expr); + *pofs++ = '\0'; + + if (*pofs != '\0') { + errno = 0; + ofs = strtol(pofs, &ep, 10); + if (*ep != '\0' || errno != 0) + errx(1, "%s: bad offset", pofs); + } else + ofs = 0; + + if (regcomp(&cre, re, REG_BASIC|REG_NOSUB) != 0) + errx(1, "%s: bad regular expression", re); + + if (*expr == '/') + /* /regexp/: Save results to a file. */ + ofp = newfile(); + else { + /* %regexp%: Make a temporary file for overflow. */ + if ((ofp = tmpfile()) == NULL) + err(1, "tmpfile"); + } + + /* Read and output lines until we get a match. */ + first = 1; + while ((p = getline()) != NULL) { + if (fputs(p, ofp) != 0) + break; + if (!first && regexec(&cre, p, 0, NULL, 0) == 0) + break; + first = 0; + } + + if (p == NULL) + errx(1, "%s: no match", re); + + if (ofs <= 0) { + /* + * Negative (or zero) offset: throw back any lines we should + * not have read yet. + */ + if (p != NULL) { + toomuch(ofp, -ofs + 1); + nwritten = (intmax_t)truncofs; + } else + nwritten = (intmax_t)ftello(ofp); + } else { + /* + * Positive offset: copy the requested number of lines + * after the match. + */ + while (--ofs > 0 && (p = getline()) != NULL) + fputs(p, ofp); + toomuch(NULL, 0); + nwritten = (intmax_t)ftello(ofp); + if (fclose(ofp) != 0) + err(1, "%s", currfile); + } + + if (!sflag && *expr == '/') + printf("%jd\n", nwritten); + + regfree(&cre); + free(ecopy); +} + +/* Handle splits based on line number. */ +void +do_lineno(const char *expr) +{ + long lastline, tgtline; + char *ep, *p; + FILE *ofp; + + errno = 0; + tgtline = strtol(expr, &ep, 10); + if (tgtline <= 0 || errno != 0 || *ep != '\0') + errx(1, "%s: bad line number", expr); + lastline = tgtline; + if (lastline <= lineno) + errx(1, "%s: can't go backwards", expr); + + while (nfiles < maxfiles - 1) { + ofp = newfile(); + while (lineno + 1 != lastline) { + if ((p = getline()) == NULL) + errx(1, "%ld: out of range", lastline); + if (fputs(p, ofp) != 0) + break; + } + if (!sflag) + printf("%jd\n", (intmax_t)ftello(ofp)); + if (fclose(ofp) != 0) + err(1, "%s", currfile); + if (reps-- == 0) + break; + lastline += tgtline; + } +} + diff --git a/src/bin/diffutils/config/mkinstalldirs b/src/bin/diffutils/config/mkinstalldirs index b275d09083..f1bfec2397 100755 --- a/src/bin/diffutils/config/mkinstalldirs +++ b/src/bin/diffutils/config/mkinstalldirs @@ -4,7 +4,7 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.1 2004/03/02 00:45:49 michaelphipps Exp $ +# $Id: mkinstalldirs 6847 2004-03-02 00:45:50Z michaelphipps $ errstatus=0 dirmode="" diff --git a/src/bin/diffutils/doc/diff.texi b/src/bin/diffutils/doc/diff.texi index fe20fd55f9..444e5d8f35 100644 --- a/src/bin/diffutils/doc/diff.texi +++ b/src/bin/diffutils/doc/diff.texi @@ -1,5 +1,5 @@ \input texinfo @c -*-texinfo-*- -@comment $Id: diff.texi,v 1.1 2004/03/02 00:45:49 michaelphipps Exp $ +@comment $Id: diff.texi 6847 2004-03-02 00:45:50Z michaelphipps $ @comment %**start of header @setfilename diff.info @include version.texi diff --git a/src/bin/diffutils/ms/config.bat b/src/bin/diffutils/ms/config.bat index 4c9ba4bc93..bc1c46c2fb 100644 --- a/src/bin/diffutils/ms/config.bat +++ b/src/bin/diffutils/ms/config.bat @@ -1,261 +1,261 @@ -@echo off - -echo Configuring GNU Diffutils for DJGPP v2.x... - -Rem Copyright (C) 2001 Free Software Foundation, Inc. - -Rem This program is free software; you can redistribute it and/or modify -Rem it under the terms of the GNU General Public License as published by -Rem the Free Software Foundation; either version 2, or (at your option) -Rem any later version. - -Rem This program is distributed in the hope that it will be useful, -Rem but WITHOUT ANY WARRANTY; without even the implied warranty of -Rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -Rem GNU General Public License for more details. - -Rem You should have received a copy of the GNU General Public License -Rem along with this program; if not, write to the Free Software -Rem Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -Rem 02111-1307, USA. - -Rem Written by Eli Zaretskii. - - -Rem The small_env tests protect against fixed and too small size -Rem of the environment in stock DOS shell. - -Rem Find out if NLS is wanted or not, -Rem if dependency-tracking is wanted or not, -Rem if cache is wanted or not -Rem and where the sources are. -set ARGS= -set NLS=disabled -if not "%NLS%" == "disabled" goto small_env -set CACHE=enabled -if not "%CACHE%" == "enabled" goto small_env -set DEPENDENCY_TRACKING=disabled -if not "%DEPENDENCY_TRACKING%" == "disabled" goto small_env -set XSRC=. -if not "%XSRC%" == "." goto small_env - -Rem Loop over all arguments. -Rem Special arguments are: NLS, XSRC CACHE and DEPS. -Rem All other arguments are stored into ARGS. -:arg_loop -set SPECIAL_ARG_SEEN=0 -if not "%SPECIAL_ARG_SEEN%" == "0" goto small_env -if "%1" == "NLS" goto nls_on -if not "%1" == "nls" goto CacheOpt -:nls_on -if "%1" == "nls" set NLS=enabled -if "%1" == "NLS" set NLS=enabled -if not "%NLS%" == "enabled" goto small_env -set SPECIAL_ARG_SEEN=1 -if not "%SPECIAL_ARG_SEEN%" == "1" goto small_env -shift -:CacheOpt -set SPECIAL_ARG_SEEN=0 -if not "%SPECIAL_ARG_SEEN%" == "0" goto small_env -if "%1" == "no-cache" goto cache_off -if "%1" == "no-CACHE" goto cache_off -if not "%1" == "NO-CACHE" goto dependency_opt -:cache_off -if "%1" == "no-cache" set CACHE=disabled -if "%1" == "no-CACHE" set CACHE=disabled -if "%1" == "NO-CACHE" set CACHE=disabled -if not "%CACHE%" == "disabled" goto small_env -set SPECIAL_ARG_SEEN=1 -if not "%SPECIAL_ARG_SEEN%" == "1" goto small_env -shift -:dependency_opt -set SPECIAL_ARG_SEEN=0 -if not "%SPECIAL_ARG_SEEN%" == "0" goto small_env -if "%1" == "dep" goto dep_off -if not "%1" == "DEP" goto src_dir_opt -:dep_off -if "%1" == "dep" set DEPENDENCY_TRACKING=enabled -if "%1" == "DEP" set DEPENDENCY_TRACKING=enabled -if not "%DEPENDENCY_TRACKING%" == "enabled" goto small_env -set SPECIAL_ARG_SEEN=1 -if not "%SPECIAL_ARG_SEEN%" == "1" goto small_env -shift -:src_dir_opt -set SPECIAL_ARG_SEEN=0 -if not "%SPECIAL_ARG_SEEN%" == "0" goto small_env -echo %1 | grep -q "/" -if errorlevel 1 goto collect_arg -set XSRC=%1 -if not "%XSRC%" == "%1" goto small_env -set SPECIAL_ARG_SEEN=1 -if not "%SPECIAL_ARG_SEEN%" == "1" goto small_env -:collect_arg -if "%SPECIAL_ARG_SEEN%" == "0" set _ARGS=%ARGS% %1 -if "%SPECIAL_ARG_SEEN%" == "0" if not "%_ARGS%" == "%ARGS% %1" goto small_env -echo %_ARGS% | grep -q "[^ ]" -if not errorlevel 0 set ARGS=%_ARGS% -set _ARGS= -shift -if not "%1" == "" goto arg_loop -set SPECIAL_ARG_SEEN= - -Rem Create a response file for the configure script. -echo --srcdir=%XSRC% > arguments -if "%CACHE%" == "enabled" echo --config-cache >> arguments -if "%DEPENDENCY_TRACKING%" == "enabled" echo --enable-dependency-tracking >> arguments -if "%DEPENDENCY_TRACKING%" == "disabled" echo --disable-dependency-tracking >> arguments -if not "%ARGS%" == "" echo %ARGS% >> arguments -set ARGS= -set CACHE= -set DEPENDENCY_TRACKING= - -if "%XSRC%" == "." goto in_place - -:not_in_place -redir -e /dev/null update %XSRC%/configure.orig ./configure -test -f ./configure -if errorlevel 1 update %XSRC%/configure ./configure - -:in_place -Rem Update configuration files -echo Updating configuration scripts... -test -f ./configure.orig -if errorlevel 1 update configure configure.orig -sed -f %XSRC%/ms/config.sed configure.orig > configure -if errorlevel 1 goto sed_error - -Rem Make sure they have a config.site file -set CONFIG_SITE=%XSRC%/ms/config.site -if not "%CONFIG_SITE%" == "%XSRC%/ms/config.site" goto small_env - -Rem Make sure crucial file names are not munged by unpacking -test -f %XSRC%/po/Makefile.in.in -if not errorlevel 1 mv -f %XSRC%/po/Makefile.in.in %XSRC%/po/Makefile.in-in -test -f %XSRC%/m4/Makefile.am.in -if not errorlevel 1 mv -f %XSRC%/m4/Makefile.am.in %XSRC%/m4/Makefile.am-in - -Rem This is required because DOS/Windows are case-insensitive -Rem to file names, and "make install" will do nothing if Make -Rem finds a file called `install'. -if exist INSTALL ren INSTALL INSTALL.txt - -Rem Set HOME to a sane default so configure stops complaining. -if not "%HOME%" == "" goto HostName -set HOME=%XSRC%/ms -if not "%HOME%" == "%XSRC%/ms" goto small_env -echo No HOME found in the environment, using default value - -:HostName -Rem Set HOSTNAME so it shows in config.status -if not "%HOSTNAME%" == "" goto hostdone -if "%windir%" == "" goto msdos -set OS=MS-Windows -if not "%OS%" == "MS-Windows" goto small_env -goto haveos -:msdos -set OS=MS-DOS -if not "%OS%" == "MS-DOS" goto small_env -:haveos -if not "%USERNAME%" == "" goto haveuname -if not "%USER%" == "" goto haveuser -echo No USERNAME and no USER found in the environment, using default values -set HOSTNAME=Unknown PC -if not "%HOSTNAME%" == "Unknown PC" goto small_env -goto userdone -:haveuser -set HOSTNAME=%USER%'s PC -if not "%HOSTNAME%" == "%USER%'s PC" goto small_env -goto userdone -:haveuname -set HOSTNAME=%USERNAME%'s PC -if not "%HOSTNAME%" == "%USERNAME%'s PC" goto small_env -:userdone -set _HOSTNAME=%HOSTNAME%, %OS% -if not "%_HOSTNAME%" == "%HOSTNAME%, %OS%" goto small_env -set HOSTNAME=%_HOSTNAME% -:hostdone -set _HOSTNAME= -set OS= - -Rem install-sh is required by the configure script but clashes with the -Rem various Makefile install-foo targets, so we MUST have it before the -Rem script runs and rename it afterwards -test -f %XSRC%/install-sh -if not errorlevel 1 goto no_ren0 -test -f %XSRC%/install-sh.sh -if not errorlevel 1 mv -f %XSRC%/install-sh.sh %XSRC%/install-sh -:no_ren0 - -if "%NLS%" == "disabled" goto without_NLS - -:with_NLS -Rem Check for the needed libraries and binaries. -test -x /dev/env/DJDIR/bin/msgfmt.exe -if not errorlevel 0 goto missing_NLS_tools -test -x /dev/env/DJDIR/bin/xgettext.exe -if not errorlevel 0 goto missing_NLS_tools -test -f /dev/env/DJDIR/include/libcharset.h -if not errorlevel 0 goto missing_NLS_tools -test -f /dev/env/DJDIR/lib/libcharset.a -if not errorlevel 0 goto missing_NLS_tools -test -f /dev/env/DJDIR/include/iconv.h -if not errorlevel 0 goto missing_NLS_tools -test -f /dev/env/DJDIR/lib/libiconv.a -if not errorlevel 0 goto missing_NLS_tools -test -f /dev/env/DJDIR/include/libintl.h -if not errorlevel 0 goto missing_NLS_tools -test -f /dev/env/DJDIR/lib/libintl.a -if not errorlevel 0 goto missing_NLS_tools - -Rem Recreate the files in the %XSRC%/po subdir with our ported tools. -redir -e /dev/null rm %XSRC%/po/*.gmo -redir -e /dev/null rm %XSRC%/po/diffutil*.pot -redir -e /dev/null rm %XSRC%/po/cat-id-tbl.c -redir -e /dev/null rm %XSRC%/po/stamp-cat-id - -Rem Update the arguments file for the configure script. -Rem We prefer without-included-gettext because libintl.a from gettext package -Rem is the only one that is guaranteed to have been ported to DJGPP. -echo --enable-nls --without-included-gettext >> arguments -goto configure_package - -:missing_NLS_tools -echo Needed libs/tools for NLS not found. Configuring without NLS. -:without_NLS -Rem Update the arguments file for the configure script. -echo --disable-nls >> arguments - -:configure_package -echo Running the ./configure script... -sh ./configure @arguments -if errorlevel 1 goto cfg_error -rm arguments -echo Done. -goto End - -:sed_error -echo ./configure script editing failed! -goto End - -:cfg_error -echo ./configure script exited abnormally! -goto End - -:small_env -echo Your environment size is too small. Enlarge it and run me again. -echo Configuration NOT done! - -:End -test -f %XSRC%/install-sh.sh -if not errorlevel 1 goto no_ren1 -test -f %XSRC%/install-sh -if not errorlevel 1 mv -f %XSRC%/install-sh %XSRC%/install-sh.sh -:no_ren1 -if "%HOME%" == "%XSRC%/ms" set HOME= -set ARGS= -set CONFIG_SITE= -set HOSTNAME= -set NLS= -set CACHE= -set DEPENDENCY_TRACKING= -set XSRC= +@echo off + +echo Configuring GNU Diffutils for DJGPP v2.x... + +Rem Copyright (C) 2001 Free Software Foundation, Inc. + +Rem This program is free software; you can redistribute it and/or modify +Rem it under the terms of the GNU General Public License as published by +Rem the Free Software Foundation; either version 2, or (at your option) +Rem any later version. + +Rem This program is distributed in the hope that it will be useful, +Rem but WITHOUT ANY WARRANTY; without even the implied warranty of +Rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +Rem GNU General Public License for more details. + +Rem You should have received a copy of the GNU General Public License +Rem along with this program; if not, write to the Free Software +Rem Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +Rem 02111-1307, USA. + +Rem Written by Eli Zaretskii. + + +Rem The small_env tests protect against fixed and too small size +Rem of the environment in stock DOS shell. + +Rem Find out if NLS is wanted or not, +Rem if dependency-tracking is wanted or not, +Rem if cache is wanted or not +Rem and where the sources are. +set ARGS= +set NLS=disabled +if not "%NLS%" == "disabled" goto small_env +set CACHE=enabled +if not "%CACHE%" == "enabled" goto small_env +set DEPENDENCY_TRACKING=disabled +if not "%DEPENDENCY_TRACKING%" == "disabled" goto small_env +set XSRC=. +if not "%XSRC%" == "." goto small_env + +Rem Loop over all arguments. +Rem Special arguments are: NLS, XSRC CACHE and DEPS. +Rem All other arguments are stored into ARGS. +:arg_loop +set SPECIAL_ARG_SEEN=0 +if not "%SPECIAL_ARG_SEEN%" == "0" goto small_env +if "%1" == "NLS" goto nls_on +if not "%1" == "nls" goto CacheOpt +:nls_on +if "%1" == "nls" set NLS=enabled +if "%1" == "NLS" set NLS=enabled +if not "%NLS%" == "enabled" goto small_env +set SPECIAL_ARG_SEEN=1 +if not "%SPECIAL_ARG_SEEN%" == "1" goto small_env +shift +:CacheOpt +set SPECIAL_ARG_SEEN=0 +if not "%SPECIAL_ARG_SEEN%" == "0" goto small_env +if "%1" == "no-cache" goto cache_off +if "%1" == "no-CACHE" goto cache_off +if not "%1" == "NO-CACHE" goto dependency_opt +:cache_off +if "%1" == "no-cache" set CACHE=disabled +if "%1" == "no-CACHE" set CACHE=disabled +if "%1" == "NO-CACHE" set CACHE=disabled +if not "%CACHE%" == "disabled" goto small_env +set SPECIAL_ARG_SEEN=1 +if not "%SPECIAL_ARG_SEEN%" == "1" goto small_env +shift +:dependency_opt +set SPECIAL_ARG_SEEN=0 +if not "%SPECIAL_ARG_SEEN%" == "0" goto small_env +if "%1" == "dep" goto dep_off +if not "%1" == "DEP" goto src_dir_opt +:dep_off +if "%1" == "dep" set DEPENDENCY_TRACKING=enabled +if "%1" == "DEP" set DEPENDENCY_TRACKING=enabled +if not "%DEPENDENCY_TRACKING%" == "enabled" goto small_env +set SPECIAL_ARG_SEEN=1 +if not "%SPECIAL_ARG_SEEN%" == "1" goto small_env +shift +:src_dir_opt +set SPECIAL_ARG_SEEN=0 +if not "%SPECIAL_ARG_SEEN%" == "0" goto small_env +echo %1 | grep -q "/" +if errorlevel 1 goto collect_arg +set XSRC=%1 +if not "%XSRC%" == "%1" goto small_env +set SPECIAL_ARG_SEEN=1 +if not "%SPECIAL_ARG_SEEN%" == "1" goto small_env +:collect_arg +if "%SPECIAL_ARG_SEEN%" == "0" set _ARGS=%ARGS% %1 +if "%SPECIAL_ARG_SEEN%" == "0" if not "%_ARGS%" == "%ARGS% %1" goto small_env +echo %_ARGS% | grep -q "[^ ]" +if not errorlevel 0 set ARGS=%_ARGS% +set _ARGS= +shift +if not "%1" == "" goto arg_loop +set SPECIAL_ARG_SEEN= + +Rem Create a response file for the configure script. +echo --srcdir=%XSRC% > arguments +if "%CACHE%" == "enabled" echo --config-cache >> arguments +if "%DEPENDENCY_TRACKING%" == "enabled" echo --enable-dependency-tracking >> arguments +if "%DEPENDENCY_TRACKING%" == "disabled" echo --disable-dependency-tracking >> arguments +if not "%ARGS%" == "" echo %ARGS% >> arguments +set ARGS= +set CACHE= +set DEPENDENCY_TRACKING= + +if "%XSRC%" == "." goto in_place + +:not_in_place +redir -e /dev/null update %XSRC%/configure.orig ./configure +test -f ./configure +if errorlevel 1 update %XSRC%/configure ./configure + +:in_place +Rem Update configuration files +echo Updating configuration scripts... +test -f ./configure.orig +if errorlevel 1 update configure configure.orig +sed -f %XSRC%/ms/config.sed configure.orig > configure +if errorlevel 1 goto sed_error + +Rem Make sure they have a config.site file +set CONFIG_SITE=%XSRC%/ms/config.site +if not "%CONFIG_SITE%" == "%XSRC%/ms/config.site" goto small_env + +Rem Make sure crucial file names are not munged by unpacking +test -f %XSRC%/po/Makefile.in.in +if not errorlevel 1 mv -f %XSRC%/po/Makefile.in.in %XSRC%/po/Makefile.in-in +test -f %XSRC%/m4/Makefile.am.in +if not errorlevel 1 mv -f %XSRC%/m4/Makefile.am.in %XSRC%/m4/Makefile.am-in + +Rem This is required because DOS/Windows are case-insensitive +Rem to file names, and "make install" will do nothing if Make +Rem finds a file called `install'. +if exist INSTALL ren INSTALL INSTALL.txt + +Rem Set HOME to a sane default so configure stops complaining. +if not "%HOME%" == "" goto HostName +set HOME=%XSRC%/ms +if not "%HOME%" == "%XSRC%/ms" goto small_env +echo No HOME found in the environment, using default value + +:HostName +Rem Set HOSTNAME so it shows in config.status +if not "%HOSTNAME%" == "" goto hostdone +if "%windir%" == "" goto msdos +set OS=MS-Windows +if not "%OS%" == "MS-Windows" goto small_env +goto haveos +:msdos +set OS=MS-DOS +if not "%OS%" == "MS-DOS" goto small_env +:haveos +if not "%USERNAME%" == "" goto haveuname +if not "%USER%" == "" goto haveuser +echo No USERNAME and no USER found in the environment, using default values +set HOSTNAME=Unknown PC +if not "%HOSTNAME%" == "Unknown PC" goto small_env +goto userdone +:haveuser +set HOSTNAME=%USER%'s PC +if not "%HOSTNAME%" == "%USER%'s PC" goto small_env +goto userdone +:haveuname +set HOSTNAME=%USERNAME%'s PC +if not "%HOSTNAME%" == "%USERNAME%'s PC" goto small_env +:userdone +set _HOSTNAME=%HOSTNAME%, %OS% +if not "%_HOSTNAME%" == "%HOSTNAME%, %OS%" goto small_env +set HOSTNAME=%_HOSTNAME% +:hostdone +set _HOSTNAME= +set OS= + +Rem install-sh is required by the configure script but clashes with the +Rem various Makefile install-foo targets, so we MUST have it before the +Rem script runs and rename it afterwards +test -f %XSRC%/install-sh +if not errorlevel 1 goto no_ren0 +test -f %XSRC%/install-sh.sh +if not errorlevel 1 mv -f %XSRC%/install-sh.sh %XSRC%/install-sh +:no_ren0 + +if "%NLS%" == "disabled" goto without_NLS + +:with_NLS +Rem Check for the needed libraries and binaries. +test -x /dev/env/DJDIR/bin/msgfmt.exe +if not errorlevel 0 goto missing_NLS_tools +test -x /dev/env/DJDIR/bin/xgettext.exe +if not errorlevel 0 goto missing_NLS_tools +test -f /dev/env/DJDIR/include/libcharset.h +if not errorlevel 0 goto missing_NLS_tools +test -f /dev/env/DJDIR/lib/libcharset.a +if not errorlevel 0 goto missing_NLS_tools +test -f /dev/env/DJDIR/include/iconv.h +if not errorlevel 0 goto missing_NLS_tools +test -f /dev/env/DJDIR/lib/libiconv.a +if not errorlevel 0 goto missing_NLS_tools +test -f /dev/env/DJDIR/include/libintl.h +if not errorlevel 0 goto missing_NLS_tools +test -f /dev/env/DJDIR/lib/libintl.a +if not errorlevel 0 goto missing_NLS_tools + +Rem Recreate the files in the %XSRC%/po subdir with our ported tools. +redir -e /dev/null rm %XSRC%/po/*.gmo +redir -e /dev/null rm %XSRC%/po/diffutil*.pot +redir -e /dev/null rm %XSRC%/po/cat-id-tbl.c +redir -e /dev/null rm %XSRC%/po/stamp-cat-id + +Rem Update the arguments file for the configure script. +Rem We prefer without-included-gettext because libintl.a from gettext package +Rem is the only one that is guaranteed to have been ported to DJGPP. +echo --enable-nls --without-included-gettext >> arguments +goto configure_package + +:missing_NLS_tools +echo Needed libs/tools for NLS not found. Configuring without NLS. +:without_NLS +Rem Update the arguments file for the configure script. +echo --disable-nls >> arguments + +:configure_package +echo Running the ./configure script... +sh ./configure @arguments +if errorlevel 1 goto cfg_error +rm arguments +echo Done. +goto End + +:sed_error +echo ./configure script editing failed! +goto End + +:cfg_error +echo ./configure script exited abnormally! +goto End + +:small_env +echo Your environment size is too small. Enlarge it and run me again. +echo Configuration NOT done! + +:End +test -f %XSRC%/install-sh.sh +if not errorlevel 1 goto no_ren1 +test -f %XSRC%/install-sh +if not errorlevel 1 mv -f %XSRC%/install-sh %XSRC%/install-sh.sh +:no_ren1 +if "%HOME%" == "%XSRC%/ms" set HOME= +set ARGS= +set CONFIG_SITE= +set HOSTNAME= +set NLS= +set CACHE= +set DEPENDENCY_TRACKING= +set XSRC= diff --git a/src/bin/gawk/ansi2knr.c b/src/bin/gawk/ansi2knr.c index 16d3858bc1..a6b6daafc6 100644 --- a/src/bin/gawk/ansi2knr.c +++ b/src/bin/gawk/ansi2knr.c @@ -1,6 +1,6 @@ /* Copyright (C) 1989, 2000 Aladdin Enterprises. All rights reserved. */ -/*$Id: ansi2knr.c,v 1.1 2004/06/11 08:57:30 korli Exp $*/ +/*$Id: ansi2knr.c 7900 2004-06-11 08:57:30Z korli $*/ /* Convert ANSI C function definitions to K&R ("traditional C") syntax */ /* diff --git a/src/bin/grep/doc/grep.1 b/src/bin/grep/doc/grep.1 index ab4531ed6a..87d20a31df 100644 --- a/src/bin/grep/doc/grep.1 +++ b/src/bin/grep/doc/grep.1 @@ -12,7 +12,7 @@ .de Id .ds Dt \\$4 .. -.Id $Id: grep.1,v 1.2 2004/06/30 20:42:54 korli Exp $ +.Id $Id: grep.1 8245 2004-06-30 20:42:57Z korli $ .TH GREP 1 \*(Dt "GNU Project" .SH NAME grep, egrep, fgrep \- print lines matching a pattern diff --git a/src/bin/grep/mkinstalldirs b/src/bin/grep/mkinstalldirs index d36fdfdc3f..1b2fff3fdb 100755 --- a/src/bin/grep/mkinstalldirs +++ b/src/bin/grep/mkinstalldirs @@ -4,7 +4,7 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.2 2004/06/30 20:42:55 korli Exp $ +# $Id: mkinstalldirs 8245 2004-06-30 20:42:57Z korli $ errstatus=0 diff --git a/src/bin/grep/po/sl.po b/src/bin/grep/po/sl.po index a3273ee246..57a7081a42 100644 --- a/src/bin/grep/po/sl.po +++ b/src/bin/grep/po/sl.po @@ -2,7 +2,7 @@ # Copyright (C) 1996, 1999, 2000 Free Software Foundation, Inc. # Primo¾ Peterlin , 1996, 1999, 2000. # -# $Id: sl.po,v 1.2 2004/06/30 20:42:54 korli Exp $ +# $Id: sl.po 8245 2004-06-30 20:42:57Z korli $ # msgid "" msgstr "" diff --git a/src/bin/grep/po/sv.po b/src/bin/grep/po/sv.po index ac06f58dec..6985bf8c4d 100644 --- a/src/bin/grep/po/sv.po +++ b/src/bin/grep/po/sv.po @@ -2,7 +2,7 @@ # Copyright (C) 2001 Free Software Foundation, Inc. # Thomas Olsson , 1996. # Daniel Resare , 1998, 1999, 2000, 2001 -# $Id: sv.po,v 1.2 2004/06/30 20:42:54 korli Exp $ +# $Id: sv.po 8245 2004-06-30 20:42:57Z korli $ # msgid "" msgstr "" diff --git a/src/bin/grep/src/ansi2knr.c b/src/bin/grep/src/ansi2knr.c index 2e2f13ea9b..6ee2dce804 100644 --- a/src/bin/grep/src/ansi2knr.c +++ b/src/bin/grep/src/ansi2knr.c @@ -1,6 +1,6 @@ /* Copyright (C) 1989, 1997, 1998, 1999 Aladdin Enterprises. All rights reserved. */ -/*$Id: ansi2knr.c,v 1.2 2004/06/30 20:42:53 korli Exp $*/ +/*$Id: ansi2knr.c 8245 2004-06-30 20:42:57Z korli $*/ /* Convert ANSI C function definitions to K&R ("traditional C") syntax */ /* diff --git a/src/bin/gzip/bits.c b/src/bin/gzip/bits.c index c58d0c75e4..df75bd3d66 100644 --- a/src/bin/gzip/bits.c +++ b/src/bin/gzip/bits.c @@ -60,7 +60,7 @@ #endif #ifdef RCSID -static char rcsid[] = "$Id: bits.c,v 1.1 2003/06/11 15:56:08 darkwyrm Exp $"; +static char rcsid[] = "$Id: bits.c 3476 2003-06-11 15:56:10Z darkwyrm $"; #endif /* =========================================================================== diff --git a/src/bin/gzip/crypt.c b/src/bin/gzip/crypt.c index 1a3cc327ef..3ab4ef60e2 100644 --- a/src/bin/gzip/crypt.c +++ b/src/bin/gzip/crypt.c @@ -2,5 +2,5 @@ * Hardly worth copyrighting :-) */ #ifdef RCSID -static char rcsid[] = "$Id: crypt.c,v 1.1 2003/06/11 15:56:08 darkwyrm Exp $"; +static char rcsid[] = "$Id: crypt.c 3476 2003-06-11 15:56:10Z darkwyrm $"; #endif diff --git a/src/bin/gzip/deflate.c b/src/bin/gzip/deflate.c index f6c6e5d057..5c7022e1b3 100644 --- a/src/bin/gzip/deflate.c +++ b/src/bin/gzip/deflate.c @@ -68,7 +68,7 @@ #include "lzw.h" /* just for consistency checking */ #ifdef RCSID -static char rcsid[] = "$Id: deflate.c,v 1.1 2003/06/11 15:56:08 darkwyrm Exp $"; +static char rcsid[] = "$Id: deflate.c 3476 2003-06-11 15:56:10Z darkwyrm $"; #endif /* =========================================================================== diff --git a/src/bin/gzip/gzip.c b/src/bin/gzip/gzip.c index ea8d464683..bfc4a93ad0 100644 --- a/src/bin/gzip/gzip.c +++ b/src/bin/gzip/gzip.c @@ -45,7 +45,7 @@ static char *license_msg[] = { */ #ifdef RCSID -static char rcsid[] = "$Id$"; +static char rcsid[] = "$Id: gzip.c 27050 2008-08-18 21:16:33Z korli $"; #endif #include diff --git a/src/bin/gzip/inflate.c b/src/bin/gzip/inflate.c index 12a2b4a145..979e364f39 100644 --- a/src/bin/gzip/inflate.c +++ b/src/bin/gzip/inflate.c @@ -97,7 +97,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: inflate.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $"; +static char rcsid[] = "$Id: inflate.c 3476 2003-06-11 15:56:10Z darkwyrm $"; #endif #include diff --git a/src/bin/gzip/lzw.c b/src/bin/gzip/lzw.c index 7ec0aaf427..3b84f1c65e 100644 --- a/src/bin/gzip/lzw.c +++ b/src/bin/gzip/lzw.c @@ -3,7 +3,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: lzw.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $"; +static char rcsid[] = "$Id: lzw.c 3476 2003-06-11 15:56:10Z darkwyrm $"; #endif #include "tailor.h" diff --git a/src/bin/gzip/match.S b/src/bin/gzip/match.S index 95f0d97ef2..44ad5efbeb 100644 --- a/src/bin/gzip/match.S +++ b/src/bin/gzip/match.S @@ -9,7 +9,7 @@ * Kristoffer Eriksson */ -/* $Id: match.S,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $ */ +/* $Id: match.S 3476 2003-06-11 15:56:10Z darkwyrm $ */ /* Preprocess with -DNO_UNDERLINE if your C compiler does not prefix * external symbols with an underline character '_'. diff --git a/src/bin/gzip/revision.h b/src/bin/gzip/revision.h index 7d9d6347ce..5925ff337c 100644 --- a/src/bin/gzip/revision.h +++ b/src/bin/gzip/revision.h @@ -13,4 +13,4 @@ # undef LZW #endif -/* $Id: revision.h,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $ */ +/* $Id: revision.h 3476 2003-06-11 15:56:10Z darkwyrm $ */ diff --git a/src/bin/gzip/tailor.h b/src/bin/gzip/tailor.h index 46d4ad6cfa..a0ca1292e5 100644 --- a/src/bin/gzip/tailor.h +++ b/src/bin/gzip/tailor.h @@ -8,7 +8,7 @@ * The target dependent functions should be defined in tailor.c. */ -/* $Id: tailor.h,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $ */ +/* $Id: tailor.h 3476 2003-06-11 15:56:10Z darkwyrm $ */ #if defined(__MSDOS__) && !defined(MSDOS) # define MSDOS diff --git a/src/bin/gzip/trees.c b/src/bin/gzip/trees.c index 93766c26c2..6f71488263 100644 --- a/src/bin/gzip/trees.c +++ b/src/bin/gzip/trees.c @@ -59,7 +59,7 @@ #include "gzip.h" #ifdef RCSID -static char rcsid[] = "$Id: trees.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $"; +static char rcsid[] = "$Id: trees.c 3476 2003-06-11 15:56:10Z darkwyrm $"; #endif /* =========================================================================== diff --git a/src/bin/gzip/unlzh.c b/src/bin/gzip/unlzh.c index 7391494592..47af14b6cb 100644 --- a/src/bin/gzip/unlzh.c +++ b/src/bin/gzip/unlzh.c @@ -4,7 +4,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: unlzh.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $"; +static char rcsid[] = "$Id: unlzh.c 3476 2003-06-11 15:56:10Z darkwyrm $"; #endif #include diff --git a/src/bin/gzip/unlzw.c b/src/bin/gzip/unlzw.c index bc053d314a..e029efa9c8 100644 --- a/src/bin/gzip/unlzw.c +++ b/src/bin/gzip/unlzw.c @@ -8,7 +8,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: unlzw.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $"; +static char rcsid[] = "$Id: unlzw.c 3476 2003-06-11 15:56:10Z darkwyrm $"; #endif #include diff --git a/src/bin/gzip/unpack.c b/src/bin/gzip/unpack.c index 4490ad5d38..06c2011c8f 100644 --- a/src/bin/gzip/unpack.c +++ b/src/bin/gzip/unpack.c @@ -5,7 +5,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: unpack.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $"; +static char rcsid[] = "$Id: unpack.c 3476 2003-06-11 15:56:10Z darkwyrm $"; #endif #include "tailor.h" diff --git a/src/bin/gzip/unzip.c b/src/bin/gzip/unzip.c index 1f61265b49..2532c55205 100644 --- a/src/bin/gzip/unzip.c +++ b/src/bin/gzip/unzip.c @@ -14,7 +14,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: unzip.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $"; +static char rcsid[] = "$Id: unzip.c 3476 2003-06-11 15:56:10Z darkwyrm $"; #endif #include "tailor.h" diff --git a/src/bin/gzip/util.c b/src/bin/gzip/util.c index 12fd244351..a2caf1170e 100644 --- a/src/bin/gzip/util.c +++ b/src/bin/gzip/util.c @@ -5,7 +5,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: util.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $"; +static char rcsid[] = "$Id: util.c 3476 2003-06-11 15:56:10Z darkwyrm $"; #endif #include diff --git a/src/bin/gzip/zip.c b/src/bin/gzip/zip.c index 9979c7cb15..175e529998 100644 --- a/src/bin/gzip/zip.c +++ b/src/bin/gzip/zip.c @@ -5,7 +5,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: zip.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $"; +static char rcsid[] = "$Id: zip.c 3476 2003-06-11 15:56:10Z darkwyrm $"; #endif #include diff --git a/src/bin/mail_utils/mail2mbox.rdef b/src/bin/mail_utils/mail2mbox.rdef index 3d88bea8b0..c99fcde8d8 100644 --- a/src/bin/mail_utils/mail2mbox.rdef +++ b/src/bin/mail_utils/mail2mbox.rdef @@ -1,5 +1,5 @@ /* Resources for the bemailtombox program, mostly for the icon. - $Id$ */ + $Id: mail2mbox.rdef 33194 2009-09-19 20:59:04Z kirilla $ */ resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY; @@ -11,8 +11,8 @@ resource app_version { minor = 0, variety = B_APPV_FINAL, internal = 1, - short_info = "BeMailToMbox $Rev$", - long_info = "BeMailToMbox - BeMail to Unix mailbox file converter. $Id$" + short_info = "BeMailToMbox $Rev: 33194 $", + long_info = "BeMailToMbox - BeMail to Unix mailbox file converter. $Id: mail2mbox.rdef 33194 2009-09-19 20:59:04Z kirilla $" }; resource large_icon array { diff --git a/src/bin/mail_utils/mbox2mail.rdef b/src/bin/mail_utils/mbox2mail.rdef index 1854859c07..69eaea2f3d 100644 --- a/src/bin/mail_utils/mbox2mail.rdef +++ b/src/bin/mail_utils/mbox2mail.rdef @@ -1,5 +1,5 @@ /* Resources for the mboxtobemail program, mostly for the icon. - $Id$ */ + $Id: mbox2mail.rdef 33194 2009-09-19 20:59:04Z kirilla $ */ resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY; @@ -11,8 +11,8 @@ resource app_version { minor = 0, variety = B_APPV_FINAL, internal = 1, - short_info = "MboxToBeMail $Rev$", - long_info = "MboxToBeMail - Unix mailbox to BeMail file converter. $Id$" + short_info = "MboxToBeMail $Rev: 33194 $", + long_info = "MboxToBeMail - Unix mailbox to BeMail file converter. $Id: mbox2mail.rdef 33194 2009-09-19 20:59:04Z kirilla $" }; diff --git a/src/bin/mail_utils/spamdbm.cpp b/src/bin/mail_utils/spamdbm.cpp index 88c3eb4fcc..82c00a6763 100644 --- a/src/bin/mail_utils/spamdbm.cpp +++ b/src/bin/mail_utils/spamdbm.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id$ + * $Id: spamdbm.cpp 30630 2009-05-05 01:31:01Z bga $ * * This is a BeOS program for classifying e-mail messages as spam (unwanted * junk mail) or as genuine mail using a Bayesian statistical approach. There @@ -1593,7 +1593,7 @@ ostream& PrintUsage (ostream& OutputStream) OutputStream << "Copyright © 2002 by Alexander G. M. Smith. "; OutputStream << "Released to the public domain.\n\n"; WrapTextToStream (OutputStream, "Compiled on " __DATE__ " at " __TIME__ -". $Id$ $HeadURL$"); +". $Id: spamdbm.cpp 30630 2009-05-05 01:31:01Z bga $ $HeadURL: http://svn.haiku-os.org/haiku/haiku/trunk/src/bin/mail_utils/spamdbm.cpp $"); OutputStream << "\n" "This is a program for classifying e-mail messages as spam (junk mail which\n" "you don't want to read) and regular genuine messages. It can learn what's\n" @@ -2520,7 +2520,7 @@ doesn't want their meat product associated with junk e-mail.\n\n" uses to extract words from messages. In particular, HTML is now handled.\n\n" "Released to the public domain, with no warranty.\n" -"$Revision$\n" +"$Revision: 30630 $\n" "Compiled on " __DATE__ " at " __TIME__ ".", "Done"); if (AboutAlertPntr != NULL) { @@ -3625,7 +3625,7 @@ status_t ABSApp::LoadSaveDatabase (bool DoLoad, char *ErrorMessage) { CurrentTime = time (NULL); if (fprintf (DatabaseFile, "%s V1 (word, age, genuine count, spam count)\t" - "Written by SpamDBM $Revision$\t" + "Written by SpamDBM $Revision: 30630 $\t" "Compiled on " __DATE__ " at " __TIME__ "\tThis file saved on %s", g_DatabaseRecognitionString, ctime (&CurrentTime)) <= 0) { diff --git a/src/bin/mail_utils/spamdbm.rdef b/src/bin/mail_utils/spamdbm.rdef index 1b2306064d..90734291db 100644 --- a/src/bin/mail_utils/spamdbm.rdef +++ b/src/bin/mail_utils/spamdbm.rdef @@ -1,6 +1,6 @@ /* Resources for the spamdbm program, mostly icons and file type associations that make it work properly. - $Id$ */ + $Id: spamdbm.rdef 13961 2005-08-14 02:25:28Z agmsmith $ */ resource app_flags B_SINGLE_LAUNCH; @@ -12,8 +12,8 @@ resource app_version { minor = 0, variety = B_APPV_FINAL, internal = 1, - short_info = "SpamDBM $Rev$", - long_info = "SpamDBM - a spam analysis database manager for Haiku. $Id$" + short_info = "SpamDBM $Rev: 13961 $", + long_info = "SpamDBM - a spam analysis database manager for Haiku. $Id: spamdbm.rdef 13961 2005-08-14 02:25:28Z agmsmith $" }; resource file_types message { diff --git a/src/bin/network/traceroute/traceroute.c b/src/bin/network/traceroute/traceroute.c index 4a57d2cee5..dbfe48d542 100644 --- a/src/bin/network/traceroute/traceroute.c +++ b/src/bin/network/traceroute/traceroute.c @@ -24,7 +24,7 @@ static const char copyright[] = "@(#) Copyright (c) 1988, 1989, 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000\n\ The Regents of the University of California. All rights reserved.\n"; static const char rcsid[] = - "@(#)$Id$ (LBL)"; + "@(#)$Id: traceroute.c 20492 2007-04-01 11:51:14Z axeld $ (LBL)"; #endif /* diff --git a/src/bin/patch/common.h b/src/bin/patch/common.h index 64b88fce91..f381d479f1 100644 --- a/src/bin/patch/common.h +++ b/src/bin/patch/common.h @@ -1,6 +1,6 @@ /* common definitions for `patch' */ -/* $Id: common.h,v 1.1 2004/06/16 21:22:10 korli Exp $ */ +/* $Id: common.h 8008 2004-06-16 21:22:10Z korli $ */ /* Copyright 1986, 1988 Larry Wall Copyright 1990, 1991-1993, 1997-1998, 1999 Free Software Foundation, Inc. diff --git a/src/bin/patch/inp.c b/src/bin/patch/inp.c index cd3b2e75f3..b64559147f 100644 --- a/src/bin/patch/inp.c +++ b/src/bin/patch/inp.c @@ -1,6 +1,6 @@ /* inputting files to be patched */ -/* $Id: inp.c,v 1.1 2004/06/16 21:22:10 korli Exp $ */ +/* $Id: inp.c 8008 2004-06-16 21:22:10Z korli $ */ /* Copyright 1986, 1988 Larry Wall Copyright 1991, 1992-1993, 1997-1998, 1999 Free Software Foundation, Inc. diff --git a/src/bin/patch/inp.h b/src/bin/patch/inp.h index bee582c21e..6a4f41d521 100644 --- a/src/bin/patch/inp.h +++ b/src/bin/patch/inp.h @@ -1,6 +1,6 @@ /* inputting files to be patched */ -/* $Id: inp.h,v 1.1 2004/06/16 21:22:10 korli Exp $ */ +/* $Id: inp.h 8008 2004-06-16 21:22:10Z korli $ */ XTERN LINENUM input_lines; /* how long is input file in lines */ diff --git a/src/bin/patch/maketime.c b/src/bin/patch/maketime.c index 40974c5e49..2cb9eef4da 100644 --- a/src/bin/patch/maketime.c +++ b/src/bin/patch/maketime.c @@ -64,7 +64,7 @@ #include char const maket_id[] = - "$Id: maketime.c,v 1.1 2004/06/16 21:22:10 korli Exp $"; + "$Id: maketime.c 8008 2004-06-16 21:22:10Z korli $"; static int isleap P ((int)); static int month_days P ((struct tm const *)); diff --git a/src/bin/patch/partime.c b/src/bin/patch/partime.c index da692233c0..e905e25c7d 100644 --- a/src/bin/patch/partime.c +++ b/src/bin/patch/partime.c @@ -75,7 +75,7 @@ #include char const partime_id[] = - "$Id: partime.c,v 1.1 2004/06/16 21:22:10 korli Exp $"; + "$Id: partime.c 8008 2004-06-16 21:22:10Z korli $"; /* Lookup tables for names of months, weekdays, time zones. */ diff --git a/src/bin/patch/patch.c b/src/bin/patch/patch.c index 07ced59d28..44d9c85e4d 100644 --- a/src/bin/patch/patch.c +++ b/src/bin/patch/patch.c @@ -1,6 +1,6 @@ /* patch - a program to apply diffs to original files */ -/* $Id: patch.c,v 1.1 2004/06/16 21:22:10 korli Exp $ */ +/* $Id: patch.c 8008 2004-06-16 21:22:10Z korli $ */ /* Copyright 1984, 1985-1987, 1988 Larry Wall Copyright 1989, 1990-1993, 1997-1998, 1999 Free Software Foundation, Inc. diff --git a/src/bin/patch/patch.man b/src/bin/patch/patch.man index b5ded6188e..6a21c3d15b 100644 --- a/src/bin/patch/patch.man +++ b/src/bin/patch/patch.man @@ -2,7 +2,7 @@ .de Id .ds Dt \\$4 .. -.Id $Id: patch.man,v 1.1 2004/06/16 21:22:10 korli Exp $ +.Id $Id: patch.man 8008 2004-06-16 21:22:10Z korli $ .ds = \-\^\- .de Sp .if t .sp .3 diff --git a/src/bin/patch/pch.c b/src/bin/patch/pch.c index 3e9f80cc37..ef7c8e5af4 100644 --- a/src/bin/patch/pch.c +++ b/src/bin/patch/pch.c @@ -1,6 +1,6 @@ /* reading patches */ -/* $Id: pch.c,v 1.1 2004/06/16 21:22:10 korli Exp $ */ +/* $Id: pch.c 8008 2004-06-16 21:22:10Z korli $ */ /* Copyright 1986, 1987, 1988 Larry Wall Copyright 1990, 1991-1993, 1997-1998, 1999 Free Software Foundation, Inc. diff --git a/src/bin/patch/pch.h b/src/bin/patch/pch.h index 0e8b87c5b2..8581a9cf53 100644 --- a/src/bin/patch/pch.h +++ b/src/bin/patch/pch.h @@ -1,6 +1,6 @@ /* reading patches */ -/* $Id: pch.h,v 1.1 2004/06/16 21:22:10 korli Exp $ */ +/* $Id: pch.h 8008 2004-06-16 21:22:10Z korli $ */ LINENUM pch_end PARAMS ((void)); LINENUM pch_first PARAMS ((void)); diff --git a/src/bin/patch/util.c b/src/bin/patch/util.c index 34e51c4147..f9538de363 100644 --- a/src/bin/patch/util.c +++ b/src/bin/patch/util.c @@ -1,6 +1,6 @@ /* utility functions for `patch' */ -/* $Id: util.c,v 1.1 2004/06/16 21:22:10 korli Exp $ */ +/* $Id: util.c 8008 2004-06-16 21:22:10Z korli $ */ /* Copyright 1986 Larry Wall Copyright 1992, 1993, 1997-1998, 1999 Free Software Foundation, Inc. diff --git a/src/bin/patch/util.h b/src/bin/patch/util.h index 4217a665e9..9215cd3854 100644 --- a/src/bin/patch/util.h +++ b/src/bin/patch/util.h @@ -1,6 +1,6 @@ /* utility functions for `patch' */ -/* $Id: util.h,v 1.1 2004/06/16 21:22:10 korli Exp $ */ +/* $Id: util.h 8008 2004-06-16 21:22:10Z korli $ */ /* An upper bound on the print length of a signed decimal line number. Add one for the sign. */ diff --git a/src/bin/patch/version.c b/src/bin/patch/version.c index 98891f8c6f..1cf6dda9d0 100644 --- a/src/bin/patch/version.c +++ b/src/bin/patch/version.c @@ -1,6 +1,6 @@ /* Print the version number. */ -/* $Id: version.c,v 1.1 2004/06/16 21:22:10 korli Exp $ */ +/* $Id: version.c 8008 2004-06-16 21:22:10Z korli $ */ #define XTERN extern #include diff --git a/src/bin/patch/version.h b/src/bin/patch/version.h index ad639a0758..94d8d84307 100644 --- a/src/bin/patch/version.h +++ b/src/bin/patch/version.h @@ -1,5 +1,5 @@ /* Print the version number. */ -/* $Id: version.h,v 1.1 2004/06/16 21:22:10 korli Exp $ */ +/* $Id: version.h 8008 2004-06-16 21:22:10Z korli $ */ void version PARAMS ((void)); diff --git a/src/bin/pc/lex.h b/src/bin/pc/lex.h index a1d29cb069..c25a567a64 100644 --- a/src/bin/pc/lex.h +++ b/src/bin/pc/lex.h @@ -1,32 +1,32 @@ -#define PLUS '+' -#define MINUS '-' -#define OR '|' -#define SHIFT_L '<' -#define SHIFT_R '>' - -#define TIMES '*' -#define DIVISION '/' -#define MODULO '%' -#define AND '&' -#define XOR '^' - -#define NEGATIVE '-' -#define BANG '!' -#define TWIDDLE '~' - -#define NOTHING '\0' - -#define LPAREN '(' -#define RPAREN ')' - -#define EQUAL '=' - -#define LESS_THAN '<' -#define GREATER_THAN '>' - -#define SEMI_COLON ';' -#define COMMA ',' - -#define SINGLE_QUOTE '\'' - -#define USE_LAST_RESULT '.' +#define PLUS '+' +#define MINUS '-' +#define OR '|' +#define SHIFT_L '<' +#define SHIFT_R '>' + +#define TIMES '*' +#define DIVISION '/' +#define MODULO '%' +#define AND '&' +#define XOR '^' + +#define NEGATIVE '-' +#define BANG '!' +#define TWIDDLE '~' + +#define NOTHING '\0' + +#define LPAREN '(' +#define RPAREN ')' + +#define EQUAL '=' + +#define LESS_THAN '<' +#define GREATER_THAN '>' + +#define SEMI_COLON ';' +#define COMMA ',' + +#define SINGLE_QUOTE '\'' + +#define USE_LAST_RESULT '.' diff --git a/src/bin/rcs/ci.c b/src/bin/rcs/ci.c index 6b5c49a2bd..89f8c677f5 100644 --- a/src/bin/rcs/ci.c +++ b/src/bin/rcs/ci.c @@ -278,7 +278,7 @@ static struct hshentry newdelta; /* new delta to be inserted */ static struct stat workstat; static struct Symrev *assoclst, **nextassoc; -mainProg(ciId, "ci", "$Id: ci.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $") +mainProg(ciId, "ci", "$Id: ci.c 3476 2003-06-11 15:56:10Z darkwyrm $") { static char const cmdusage[] = "\nci usage: ci -{fIklMqru}[rev] -d[date] -mmsg -{nN}name -sstate -ttext -T -Vn -wwho -xsuff -zzone file ..."; diff --git a/src/bin/rcs/co.c b/src/bin/rcs/co.c index 6674d4ea11..48152e14de 100644 --- a/src/bin/rcs/co.c +++ b/src/bin/rcs/co.c @@ -195,7 +195,7 @@ static struct hshentries *gendeltas; /* deltas to be generated */ static struct hshentry *targetdelta; /* final delta to be generated */ static struct stat workstat; -mainProg(coId, "co", "$Id: co.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $") +mainProg(coId, "co", "$Id: co.c 3476 2003-06-11 15:56:10Z darkwyrm $") { static char const cmdusage[] = "\nco usage: co -{fIlMpqru}[rev] -ddate -jjoins -ksubst -sstate -T -w[who] -Vn -xsuff -zzone file ..."; diff --git a/src/bin/rcs/conf.h b/src/bin/rcs/conf.h index e99702b548..5251510599 100644 --- a/src/bin/rcs/conf.h +++ b/src/bin/rcs/conf.h @@ -1,6 +1,6 @@ /* RCS compile-time configuration */ - /* $Id$ */ + /* $Id: conf.h 28305 2008-10-23 21:46:26Z bonefish $ */ /* * This file is generated automatically. diff --git a/src/bin/rcs/conf.heg b/src/bin/rcs/conf.heg index c2cdc3b889..6e5f16b7c0 100644 --- a/src/bin/rcs/conf.heg +++ b/src/bin/rcs/conf.heg @@ -1,6 +1,6 @@ /* example RCS compile-time configuration */ - /* $Id$ */ + /* $Id: conf.heg 28305 2008-10-23 21:46:26Z bonefish $ */ /* * This example RCS compile-time configuration describes a host that conforms diff --git a/src/bin/rcs/ident.c b/src/bin/rcs/ident.c index 4c9090a414..cad97a02fd 100644 --- a/src/bin/rcs/ident.c +++ b/src/bin/rcs/ident.c @@ -106,7 +106,7 @@ static int match P((FILE*)); static int scanfile P((FILE*,char const*,int)); static void reportError P((char const*)); -mainProg(identId, "ident", "$Id: ident.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $") +mainProg(identId, "ident", "$Id: ident.c 3476 2003-06-11 15:56:10Z darkwyrm $") /* Ident searches the named files for all occurrences * of the pattern $@: text $ where @ is a keyword. */ diff --git a/src/bin/rcs/maketime.c b/src/bin/rcs/maketime.c index a1c08ad0dc..81ed9608d2 100644 --- a/src/bin/rcs/maketime.c +++ b/src/bin/rcs/maketime.c @@ -43,7 +43,7 @@ Report problems and direct all questions to: #include "maketime.h" char const maketId[] - = "$Id: maketime.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $"; + = "$Id: maketime.c 3476 2003-06-11 15:56:10Z darkwyrm $"; static int isleap P((int)); static int month_days P((struct tm const*)); diff --git a/src/bin/rcs/merge.c b/src/bin/rcs/merge.c index f93332fddc..8d69d73992 100644 --- a/src/bin/rcs/merge.c +++ b/src/bin/rcs/merge.c @@ -41,7 +41,7 @@ badoption(a) } -mainProg(mergeId, "merge", "$Id: merge.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $") +mainProg(mergeId, "merge", "$Id: merge.c 3476 2003-06-11 15:56:10Z darkwyrm $") { register char const *a; char const *arg[3], *label[3], *edarg = 0; diff --git a/src/bin/rcs/merger.c b/src/bin/rcs/merger.c index 64299bddb5..8df2a3f56b 100644 --- a/src/bin/rcs/merger.c +++ b/src/bin/rcs/merger.c @@ -28,7 +28,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(mergerId, "$Id: merger.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $") +libId(mergerId, "$Id: merger.c 3476 2003-06-11 15:56:10Z darkwyrm $") static char const *normalize_arg P((char const*,char**)); static char const * diff --git a/src/bin/rcs/partime.c b/src/bin/rcs/partime.c index ab7fba7917..52b2f25584 100644 --- a/src/bin/rcs/partime.c +++ b/src/bin/rcs/partime.c @@ -46,7 +46,7 @@ Report problems and direct all questions to: #include "partime.h" char const partimeId[] - = "$Id: partime.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $"; + = "$Id: partime.c 3476 2003-06-11 15:56:10Z darkwyrm $"; /* Lookup tables for names of months, weekdays, time zones. */ diff --git a/src/bin/rcs/rcs.c b/src/bin/rcs/rcs.c index a551ef28ce..7c82e90181 100644 --- a/src/bin/rcs/rcs.c +++ b/src/bin/rcs/rcs.c @@ -279,7 +279,7 @@ static struct delrevpair delrev; static struct hshentry *cuthead, *cuttail, *delstrt; static struct hshentries *gendeltas; -mainProg(rcsId, "rcs", "$Id: rcs.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $") +mainProg(rcsId, "rcs", "$Id: rcs.c 3476 2003-06-11 15:56:10Z darkwyrm $") { static char const cmdusage[] = "\nrcs usage: rcs -{ae}logins -Afile -{blu}[rev] -cstring -{iILqTU} -ksubst -mrev:msg -{nN}name[:[rev]] -orange -sstate[:rev] -t[text] -Vn -xsuff -zzone file ..."; diff --git a/src/bin/rcs/rcsbase.h b/src/bin/rcs/rcsbase.h index 7c0ddee9ec..4b86f06bdc 100644 --- a/src/bin/rcs/rcsbase.h +++ b/src/bin/rcs/rcsbase.h @@ -1,6 +1,6 @@ /* RCS common definitions and data structures */ -#define RCSBASE "$Id: rcsbase.h,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $" +#define RCSBASE "$Id: rcsbase.h 3476 2003-06-11 15:56:10Z darkwyrm $" /* Copyright 1982, 1988, 1989 Walter Tichy Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert diff --git a/src/bin/rcs/rcsclean.c b/src/bin/rcs/rcsclean.c index 879277524e..572fac56e4 100644 --- a/src/bin/rcs/rcsclean.c +++ b/src/bin/rcs/rcsclean.c @@ -38,7 +38,7 @@ static void cleanup P((void)); static RILE *workptr; static int exitstatus; -mainProg(rcscleanId, "rcsclean", "$Id: rcsclean.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $") +mainProg(rcscleanId, "rcsclean", "$Id: rcsclean.c 3476 2003-06-11 15:56:10Z darkwyrm $") { static char const usage[] = "\nrcsclean: usage: rcsclean -ksubst -{nqru}[rev] -T -Vn -xsuff -zzone file ..."; diff --git a/src/bin/rcs/rcsdiff.c b/src/bin/rcs/rcsdiff.c index 0898ff3bfd..0d62c37c0c 100644 --- a/src/bin/rcs/rcsdiff.c +++ b/src/bin/rcs/rcsdiff.c @@ -155,7 +155,7 @@ static int exitstatus; static RILE *workptr; static struct stat workstat; -mainProg(rcsdiffId, "rcsdiff", "$Id: rcsdiff.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $") +mainProg(rcsdiffId, "rcsdiff", "$Id: rcsdiff.c 3476 2003-06-11 15:56:10Z darkwyrm $") { static char const cmdusage[] = "\nrcsdiff usage: rcsdiff -ksubst -q -rrev1 [-rrev2] -Vn -xsuff -zzone [diff options] file ..."; diff --git a/src/bin/rcs/rcsedit.c b/src/bin/rcs/rcsedit.c index 7e60af6a20..b781b12be8 100644 --- a/src/bin/rcs/rcsedit.c +++ b/src/bin/rcs/rcsedit.c @@ -205,7 +205,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(editId, "$Id: rcsedit.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $") +libId(editId, "$Id: rcsedit.c 3476 2003-06-11 15:56:10Z darkwyrm $") static void editEndsPrematurely P((void)) exiting; static void editLineNumberOverflow P((void)) exiting; diff --git a/src/bin/rcs/rcsfcmp.c b/src/bin/rcs/rcsfcmp.c index 9f118728e3..3e2a6ef2ce 100644 --- a/src/bin/rcs/rcsfcmp.c +++ b/src/bin/rcs/rcsfcmp.c @@ -122,7 +122,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(fcmpId, "$Id: rcsfcmp.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $") +libId(fcmpId, "$Id: rcsfcmp.c 3476 2003-06-11 15:56:10Z darkwyrm $") static int discardkeyval P((int,RILE*)); static int diff --git a/src/bin/rcs/rcsfnms.c b/src/bin/rcs/rcsfnms.c index 568c29c004..b40e22d28e 100644 --- a/src/bin/rcs/rcsfnms.c +++ b/src/bin/rcs/rcsfnms.c @@ -181,7 +181,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(fnmsId, "$Id: rcsfnms.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $") +libId(fnmsId, "$Id: rcsfnms.c 3476 2003-06-11 15:56:10Z darkwyrm $") static char const *bindex P((char const*,int)); static int fin2open P((char const*, size_t, char const*, size_t, char const*, size_t, RILE*(*)P((struct buf*,struct stat*,int)), int)); diff --git a/src/bin/rcs/rcsfreeze.sh b/src/bin/rcs/rcsfreeze.sh index 7c1bb066cb..7b34bebb6e 100755 --- a/src/bin/rcs/rcsfreeze.sh +++ b/src/bin/rcs/rcsfreeze.sh @@ -2,7 +2,7 @@ # rcsfreeze - assign a symbolic revision number to a configuration of RCS files -# $Id: rcsfreeze.sh,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $ +# $Id: rcsfreeze.sh 3476 2003-06-11 15:56:10Z darkwyrm $ # The idea is to run rcsfreeze each time a new version is checked # in. A unique symbolic revision number (C_[number], where number diff --git a/src/bin/rcs/rcsgen.c b/src/bin/rcs/rcsgen.c index d68c0b59a0..237b676739 100644 --- a/src/bin/rcs/rcsgen.c +++ b/src/bin/rcs/rcsgen.c @@ -144,7 +144,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(genId, "$Id: rcsgen.c,v 1.1 2003/06/11 15:56:09 darkwyrm Exp $") +libId(genId, "$Id: rcsgen.c 3476 2003-06-11 15:56:10Z darkwyrm $") int interactiveflag; /* Should we act as if stdin is a tty? */ struct buf curlogbuf; /* buffer for current log message */ diff --git a/src/bin/rcs/rcskeep.c b/src/bin/rcs/rcskeep.c index 7b9d905089..38cca95e7a 100644 --- a/src/bin/rcs/rcskeep.c +++ b/src/bin/rcs/rcskeep.c @@ -102,7 +102,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(keepId, "$Id: rcskeep.c,v 1.1 2003/06/11 15:56:10 darkwyrm Exp $") +libId(keepId, "$Id: rcskeep.c 3476 2003-06-11 15:56:10Z darkwyrm $") static int badly_terminated P((void)); static int checknum P((char const*)); diff --git a/src/bin/rcs/rcskeys.c b/src/bin/rcs/rcskeys.c index 450d3b709b..ded2f2e9e7 100644 --- a/src/bin/rcs/rcskeys.c +++ b/src/bin/rcs/rcskeys.c @@ -67,7 +67,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(keysId, "$Id: rcskeys.c,v 1.1 2003/06/11 15:56:10 darkwyrm Exp $") +libId(keysId, "$Id: rcskeys.c 3476 2003-06-11 15:56:10Z darkwyrm $") char const *const Keyword[] = { diff --git a/src/bin/rcs/rcslex.c b/src/bin/rcs/rcslex.c index 8ca7173053..1fc1c9b268 100644 --- a/src/bin/rcs/rcslex.c +++ b/src/bin/rcs/rcslex.c @@ -172,7 +172,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(lexId, "$Id: rcslex.c,v 1.1 2003/06/11 15:56:10 darkwyrm Exp $") +libId(lexId, "$Id: rcslex.c 3476 2003-06-11 15:56:10Z darkwyrm $") static char *checkidentifier P((char*,int,int)); static void errsay P((char const*)); diff --git a/src/bin/rcs/rcsmap.c b/src/bin/rcs/rcsmap.c index a63cfd94c9..682ae6f506 100644 --- a/src/bin/rcs/rcsmap.c +++ b/src/bin/rcs/rcsmap.c @@ -29,7 +29,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(mapId, "$Id: rcsmap.c,v 1.1 2003/06/11 15:56:10 darkwyrm Exp $") +libId(mapId, "$Id: rcsmap.c 3476 2003-06-11 15:56:10Z darkwyrm $") /* map of character types */ /* ISO 8859/1 (Latin-1) */ diff --git a/src/bin/rcs/rcsmerge.c b/src/bin/rcs/rcsmerge.c index 057fc5b2d9..1353af1d25 100644 --- a/src/bin/rcs/rcsmerge.c +++ b/src/bin/rcs/rcsmerge.c @@ -121,7 +121,7 @@ Report problems and direct all questions to: static char const co[] = CO; -mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c,v 1.1 2003/06/11 15:56:10 darkwyrm Exp $") +mainProg(rcsmergeId, "rcsmerge", "$Id: rcsmerge.c 3476 2003-06-11 15:56:10Z darkwyrm $") { static char const cmdusage[] = "\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] -ksubst -{pq}[rev] -Vn -xsuff -zzone file"; diff --git a/src/bin/rcs/rcsrev.c b/src/bin/rcs/rcsrev.c index 5b7599e9f6..e0013ac018 100644 --- a/src/bin/rcs/rcsrev.c +++ b/src/bin/rcs/rcsrev.c @@ -109,7 +109,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(revId, "$Id: rcsrev.c,v 1.1 2003/06/11 15:56:10 darkwyrm Exp $") +libId(revId, "$Id: rcsrev.c 3476 2003-06-11 15:56:10Z darkwyrm $") static char const *branchtip P((char const*)); static char const *lookupsym P((char const*)); diff --git a/src/bin/rcs/rcssyn.c b/src/bin/rcs/rcssyn.c index f424197f1c..1f1144b7a0 100644 --- a/src/bin/rcs/rcssyn.c +++ b/src/bin/rcs/rcssyn.c @@ -157,7 +157,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(synId, "$Id: rcssyn.c,v 1.1 2003/06/11 15:56:10 darkwyrm Exp $") +libId(synId, "$Id: rcssyn.c 3476 2003-06-11 15:56:10Z darkwyrm $") static char const *getkeyval P((char const*,enum tokens,int)); static int getdelta P((void)); diff --git a/src/bin/rcs/rcstest b/src/bin/rcs/rcstest index 0d8161f402..36537b2bc2 100755 --- a/src/bin/rcs/rcstest +++ b/src/bin/rcs/rcstest @@ -15,7 +15,7 @@ # The current directory and ./RCS must be readable, writable, and searchable. -# $Id: rcstest,v 1.1 2003/06/11 15:56:10 darkwyrm Exp $ +# $Id: rcstest 3476 2003-06-11 15:56:10Z darkwyrm $ # Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert diff --git a/src/bin/rcs/rcstime.c b/src/bin/rcs/rcstime.c index 168fc28ffe..c28b297a64 100644 --- a/src/bin/rcs/rcstime.c +++ b/src/bin/rcs/rcstime.c @@ -30,7 +30,7 @@ Report problems and direct all questions to: #include "partime.h" #include "maketime.h" -libId(rcstimeId, "$Id: rcstime.c,v 1.1 2003/06/11 15:56:10 darkwyrm Exp $") +libId(rcstimeId, "$Id: rcstime.c 3476 2003-06-11 15:56:10Z darkwyrm $") static long zone_offset; /* seconds east of UTC, or TM_LOCAL_ZONE */ static int use_zone_offset; /* if zero, use UTC without zone indication */ diff --git a/src/bin/rcs/rcsutil.c b/src/bin/rcs/rcsutil.c index f359da65be..5c934b1645 100644 --- a/src/bin/rcs/rcsutil.c +++ b/src/bin/rcs/rcsutil.c @@ -190,7 +190,7 @@ Report problems and direct all questions to: #include "rcsbase.h" -libId(utilId, "$Id: rcsutil.c,v 1.1 2003/06/11 15:56:10 darkwyrm Exp $") +libId(utilId, "$Id: rcsutil.c 3476 2003-06-11 15:56:10Z darkwyrm $") #if !has_memcmp int diff --git a/src/bin/rcs/rlog.c b/src/bin/rcs/rlog.c index 2253c86e98..6ce919e068 100644 --- a/src/bin/rcs/rlog.c +++ b/src/bin/rcs/rlog.c @@ -222,7 +222,7 @@ static struct rcslockers *lockerlist; static struct stateattri *statelist; -mainProg(rlogId, "rlog", "$Id: rlog.c,v 1.1 2003/06/11 15:56:10 darkwyrm Exp $") +mainProg(rlogId, "rlog", "$Id: rlog.c 3476 2003-06-11 15:56:10Z darkwyrm $") { static char const cmdusage[] = "\nrlog usage: rlog -{bhLNRt} -ddates -l[lockers] -r[revs] -sstates -Vn -w[logins] -xsuff -zzone file ..."; diff --git a/src/bin/sed/config/texi2dvi b/src/bin/sed/config/texi2dvi index c3793a358d..a64f56b628 100755 --- a/src/bin/sed/config/texi2dvi +++ b/src/bin/sed/config/texi2dvi @@ -1,6 +1,6 @@ #! /bin/sh # texi2dvi --- produce DVI (or PDF) files from Texinfo (or LaTeX) sources. -# $Id: texi2dvi,v 1.1 2004/03/02 02:47:14 michaelphipps Exp $ +# $Id: texi2dvi 6850 2004-03-02 02:47:16Z michaelphipps $ # # Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2001, 02 # Free Software Foundation, Inc. diff --git a/src/bin/sed/po/sl.po b/src/bin/sed/po/sl.po index 4073262206..7392ef3469 100644 --- a/src/bin/sed/po/sl.po +++ b/src/bin/sed/po/sl.po @@ -1,7 +1,7 @@ # -*- mode:po; coding:iso-latin-2;-*- Slovenian message catalogue for GNU sed. # Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. # Primo¾ Peterlin , 2000, 2001, 2002, 2003. -# $Id: sl.po,v 1.1 2004/03/02 02:47:15 michaelphipps Exp $ +# $Id: sl.po 6850 2004-03-02 02:47:16Z michaelphipps $ # msgid "" msgstr "" diff --git a/src/bin/unzip/crc32.c b/src/bin/unzip/crc32.c index 4ca9a49f2c..66f8356b23 100644 --- a/src/bin/unzip/crc32.c +++ b/src/bin/unzip/crc32.c @@ -11,7 +11,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id: crc32.c,v 1.1 2002/09/21 14:54:45 darkwyrm Exp $ */ +/* $Id: crc32.c 1101 2002-09-21 14:54:45Z darkwyrm $ */ #define __CRC32_C /* identifies this source module */ diff --git a/src/bin/unzip/crctab.c b/src/bin/unzip/crctab.c index 53ba1e3bd5..f573447008 100644 --- a/src/bin/unzip/crctab.c +++ b/src/bin/unzip/crctab.c @@ -11,7 +11,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id: crctab.c,v 1.1 2002/09/21 14:54:45 darkwyrm Exp $ */ +/* $Id: crctab.c 1101 2002-09-21 14:54:45Z darkwyrm $ */ /* Generate a table for a byte-wise 32-bit CRC calculation on the polynomial: diff --git a/src/bin/vim/runtime/colors/desert.vim b/src/bin/vim/runtime/colors/desert.vim index 3d5db19148..fe2d2b3af6 100644 --- a/src/bin/vim/runtime/colors/desert.vim +++ b/src/bin/vim/runtime/colors/desert.vim @@ -1,9 +1,9 @@ " Vim color file " Maintainer: Hans Fugal -" Last Change: $Date: 2004/07/13 23:28:24 $ -" Last Change: $Date: 2004/07/13 23:28:24 $ +" Last Change: $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ +" Last Change: $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " URL: http://hans.fugal.net/vim/colors/desert.vim -" Version: $Id: desert.vim,v 1.1 2004/07/13 23:28:24 korli Exp $ +" Version: $Id: desert.vim 8393 2004-07-13 23:28:30Z korli $ " cool help screens " :he group-name diff --git a/src/bin/vim/runtime/compiler/fortran_g77.vim b/src/bin/vim/runtime/compiler/fortran_g77.vim index 28987de70a..b61999d20d 100644 --- a/src/bin/vim/runtime/compiler/fortran_g77.vim +++ b/src/bin/vim/runtime/compiler/fortran_g77.vim @@ -1,7 +1,7 @@ " Vim compiler file " Compiler: g77 (GNU Fortran) " Maintainer: Ralf Wildenhues -" Last Change: $Date: 2004/07/13 23:28:22 $ +" Last Change: $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " $Revision: 1.1 $ if exists("current_compiler") diff --git a/src/bin/vim/runtime/compiler/splint.vim b/src/bin/vim/runtime/compiler/splint.vim index 6335c6fa71..d617e8e291 100644 --- a/src/bin/vim/runtime/compiler/splint.vim +++ b/src/bin/vim/runtime/compiler/splint.vim @@ -2,7 +2,7 @@ " Compiler: splint/lclint (C source code checker) " Maintainer: Ralf Wildenhues " Splint Home: http://www.splint.org/ -" Last Change: $Date: 2004/07/13 23:28:21 $ +" Last Change: $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " $Revision: 1.1 $ if exists("current_compiler") diff --git a/src/bin/vim/runtime/ftplugin/ada.vim b/src/bin/vim/runtime/ftplugin/ada.vim index e08307c6e8..ac25ccf590 100644 --- a/src/bin/vim/runtime/ftplugin/ada.vim +++ b/src/bin/vim/runtime/ftplugin/ada.vim @@ -2,7 +2,7 @@ " Language: Ada " Maintainer: Neil Bird " Last Change: 2003 May 11 -" Version: $Id: ada.vim,v 1.1 2004/07/13 23:28:05 korli Exp $ +" Version: $Id: ada.vim 8393 2004-07-13 23:28:30Z korli $ " Look for the latest version at http://vim.sourceforge.net/ " " Perform Ada specific completion & tagging. diff --git a/src/bin/vim/runtime/indent/ada.vim b/src/bin/vim/runtime/indent/ada.vim index 08d1d707b0..4f995a4cbf 100644 --- a/src/bin/vim/runtime/indent/ada.vim +++ b/src/bin/vim/runtime/indent/ada.vim @@ -2,7 +2,7 @@ " Language: Ada " Maintainer: Neil Bird " Last Change: 2003 May 20 -" Version: $Id: ada.vim,v 1.1 2004/07/13 23:28:23 korli Exp $ +" Version: $Id: ada.vim 8393 2004-07-13 23:28:30Z korli $ " Look for the latest version at http://vim.sourceforge.net/ " " ToDo: diff --git a/src/bin/vim/runtime/indent/eiffel.vim b/src/bin/vim/runtime/indent/eiffel.vim index b651eeceb7..99159905b7 100644 --- a/src/bin/vim/runtime/indent/eiffel.vim +++ b/src/bin/vim/runtime/indent/eiffel.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Eiffel " Maintainer: David Clarke -" $Date: 2004/07/13 23:28:22 $ +" $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " $Revision: 1.1 $ " URL: http://gadicath.webhop.net/other/eiffel.vim diff --git a/src/bin/vim/runtime/lang/af/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/af/LC_MESSAGES/vim.mo index cf85b3308f..ba737359b5 100644 Binary files a/src/bin/vim/runtime/lang/af/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/af/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/ca/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/ca/LC_MESSAGES/vim.mo index 3384769bae..673d43797c 100644 Binary files a/src/bin/vim/runtime/lang/ca/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/ca/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/cs/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/cs/LC_MESSAGES/vim.mo index 309c81272a..3c9079728a 100644 Binary files a/src/bin/vim/runtime/lang/cs/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/cs/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/de/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/de/LC_MESSAGES/vim.mo index f2c44a61de..6556556a51 100644 Binary files a/src/bin/vim/runtime/lang/de/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/de/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/en_GB/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/en_GB/LC_MESSAGES/vim.mo index e32cfc514c..781af56b6a 100644 Binary files a/src/bin/vim/runtime/lang/en_GB/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/en_GB/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/es/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/es/LC_MESSAGES/vim.mo index 05a114ace4..b8b874539b 100644 Binary files a/src/bin/vim/runtime/lang/es/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/es/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/fr/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/fr/LC_MESSAGES/vim.mo index 5db607ce58..4dded7a405 100644 Binary files a/src/bin/vim/runtime/lang/fr/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/fr/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/it/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/it/LC_MESSAGES/vim.mo index 3dfc0cc20f..fde66c995a 100644 Binary files a/src/bin/vim/runtime/lang/it/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/it/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/ja/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/ja/LC_MESSAGES/vim.mo index 2a4837eb77..40d33463bb 100644 Binary files a/src/bin/vim/runtime/lang/ja/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/ja/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/ko/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/ko/LC_MESSAGES/vim.mo index 42920e9324..56c34cf86c 100644 Binary files a/src/bin/vim/runtime/lang/ko/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/ko/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/menu_cs_cz.iso_8859-2.vim b/src/bin/vim/runtime/lang/menu_cs_cz.iso_8859-2.vim index fe3bdb18a1..732f9c3c12 100644 --- a/src/bin/vim/runtime/lang/menu_cs_cz.iso_8859-2.vim +++ b/src/bin/vim/runtime/lang/menu_cs_cz.iso_8859-2.vim @@ -2,7 +2,7 @@ " Maintainer: Jiri Brezina " vim:set foldmethod=marker: " $Revision: 1.1 $ -" $Date: 2004/07/13 23:28:06 $ +" $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " Quit when menu translations have already been done. if exists("did_menu_trans") diff --git a/src/bin/vim/runtime/lang/menu_czech_czech_republic.1250.vim b/src/bin/vim/runtime/lang/menu_czech_czech_republic.1250.vim index 04b2a1be61..5978b1e1d8 100644 --- a/src/bin/vim/runtime/lang/menu_czech_czech_republic.1250.vim +++ b/src/bin/vim/runtime/lang/menu_czech_czech_republic.1250.vim @@ -2,7 +2,7 @@ " Maintainer: Jiri Brezina " vim:set foldmethod=marker: " $Revision: 1.1 $ -" $Date: 2004/07/13 23:28:06 $ +" $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " Quit when menu translations have already been done. if exists("did_menu_trans") diff --git a/src/bin/vim/runtime/lang/menu_czech_czech_republic.ascii.vim b/src/bin/vim/runtime/lang/menu_czech_czech_republic.ascii.vim index b7626ac657..a6e8ea2913 100644 --- a/src/bin/vim/runtime/lang/menu_czech_czech_republic.ascii.vim +++ b/src/bin/vim/runtime/lang/menu_czech_czech_republic.ascii.vim @@ -2,7 +2,7 @@ " Maintainer: Jiri Brezina " vim:set foldmethod=marker: " $Revision: 1.1 $ -" $Date: 2004/07/13 23:28:06 $ +" $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " Quit when menu translations have already been done. if exists("did_menu_trans") diff --git a/src/bin/vim/runtime/lang/menu_ru_ru.koi8-r.vim b/src/bin/vim/runtime/lang/menu_ru_ru.koi8-r.vim index 3b997243de..a17a036e5e 100644 --- a/src/bin/vim/runtime/lang/menu_ru_ru.koi8-r.vim +++ b/src/bin/vim/runtime/lang/menu_ru_ru.koi8-r.vim @@ -3,7 +3,7 @@ " Last Change: 26 Apr 2004 " URL: cvs://cvs.sf.net:/cvsroot/ruvim/extras/menu/menu_ru_ru.vim " -" $Id: menu_ru_ru.koi8-r.vim,v 1.1 2004/07/13 23:28:07 korli Exp $ +" $Id: menu_ru_ru.koi8-r.vim 8393 2004-07-13 23:28:30Z korli $ " " Adopted for RuVim project by Vassily Ragosin. " First translation: Tim Alexeevsky , diff --git a/src/bin/vim/runtime/lang/menu_ru_ru.vim b/src/bin/vim/runtime/lang/menu_ru_ru.vim index 20a6647483..295c441c4c 100644 --- a/src/bin/vim/runtime/lang/menu_ru_ru.vim +++ b/src/bin/vim/runtime/lang/menu_ru_ru.vim @@ -3,7 +3,7 @@ " Last Change: 26 Apr 2004 " URL: cvs://cvs.sf.net:/cvsroot/ruvim/extras/menu/menu_ru_ru.vim " -" $Id: menu_ru_ru.vim,v 1.1 2004/07/13 23:28:06 korli Exp $ +" $Id: menu_ru_ru.vim 8393 2004-07-13 23:28:30Z korli $ " " Adopted for RuVim project by Vassily Ragosin. " First translation: Tim Alexeevsky , diff --git a/src/bin/vim/runtime/lang/no/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/no/LC_MESSAGES/vim.mo index 45c93a838b..fcad7fdb80 100644 Binary files a/src/bin/vim/runtime/lang/no/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/no/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/pl/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/pl/LC_MESSAGES/vim.mo index 9b39adbf5a..3801d0f14c 100644 Binary files a/src/bin/vim/runtime/lang/pl/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/pl/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/ru/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/ru/LC_MESSAGES/vim.mo index 1a73584310..f40b5217e4 100644 Binary files a/src/bin/vim/runtime/lang/ru/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/ru/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/sk/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/sk/LC_MESSAGES/vim.mo index 418f360185..f1041bb4ee 100644 Binary files a/src/bin/vim/runtime/lang/sk/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/sk/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/sv/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/sv/LC_MESSAGES/vim.mo index f35696d777..14b15de615 100644 Binary files a/src/bin/vim/runtime/lang/sv/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/sv/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/uk/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/uk/LC_MESSAGES/vim.mo index adaf4c7b46..c4196ce760 100644 Binary files a/src/bin/vim/runtime/lang/uk/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/uk/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/zh_CN.UTF-8/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/zh_CN.UTF-8/LC_MESSAGES/vim.mo index 8d5cb8a238..ce2da3d13a 100644 Binary files a/src/bin/vim/runtime/lang/zh_CN.UTF-8/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/zh_CN.UTF-8/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/zh_CN/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/zh_CN/LC_MESSAGES/vim.mo index 769c26914d..226691d6dc 100644 Binary files a/src/bin/vim/runtime/lang/zh_CN/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/zh_CN/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/zh_TW.UTF-8/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/zh_TW.UTF-8/LC_MESSAGES/vim.mo index d4246672fb..1628622845 100644 Binary files a/src/bin/vim/runtime/lang/zh_TW.UTF-8/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/zh_TW.UTF-8/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/lang/zh_TW/LC_MESSAGES/vim.mo b/src/bin/vim/runtime/lang/zh_TW/LC_MESSAGES/vim.mo index b0829d041e..c0fb3926d9 100644 Binary files a/src/bin/vim/runtime/lang/zh_TW/LC_MESSAGES/vim.mo and b/src/bin/vim/runtime/lang/zh_TW/LC_MESSAGES/vim.mo differ diff --git a/src/bin/vim/runtime/macros/README.txt.info b/src/bin/vim/runtime/macros/README.txt.info index d173e72e7f..02ba2b7943 100644 Binary files a/src/bin/vim/runtime/macros/README.txt.info and b/src/bin/vim/runtime/macros/README.txt.info differ diff --git a/src/bin/vim/runtime/macros/hanoi/click.me.info b/src/bin/vim/runtime/macros/hanoi/click.me.info index f38cb5a0ac..b342a0a24e 100644 Binary files a/src/bin/vim/runtime/macros/hanoi/click.me.info and b/src/bin/vim/runtime/macros/hanoi/click.me.info differ diff --git a/src/bin/vim/runtime/macros/hanoi/hanoi.vim b/src/bin/vim/runtime/macros/hanoi/hanoi.vim index 63697f9c07..f030eaeeb2 100644 --- a/src/bin/vim/runtime/macros/hanoi/hanoi.vim +++ b/src/bin/vim/runtime/macros/hanoi/hanoi.vim @@ -5,7 +5,12 @@ set wrapscan " two lines to the height you want (select from 1 to 9) map t 7 map! t 7 -map L 1G/t X/^0 $P1GJ$An$BGC0e$X0E0F$X/T @f @h $A1GJ@f0l$Xn$PU +map L 1G/t +X/^0 +$P1GJ$An$BGC0e$X0E0F$X/T +@f +@h +$A1GJ@f0l$Xn$PU map g IL map J /^0[^t]*$ @@ -58,7 +63,10 @@ map R $rn map S $r$ "insert two lines containing a zero -map T ko0 0  +map T ko0 +0 + + "add a backslash at the end map V Go/ diff --git a/src/bin/vim/runtime/macros/hanoi/poster.info b/src/bin/vim/runtime/macros/hanoi/poster.info index 780fa35ede..1c97a60e0a 100644 Binary files a/src/bin/vim/runtime/macros/hanoi/poster.info and b/src/bin/vim/runtime/macros/hanoi/poster.info differ diff --git a/src/bin/vim/runtime/macros/life/click.me.info b/src/bin/vim/runtime/macros/life/click.me.info index f5756501f1..fa38e98f76 100644 Binary files a/src/bin/vim/runtime/macros/life/click.me.info and b/src/bin/vim/runtime/macros/life/click.me.info differ diff --git a/src/bin/vim/runtime/macros/life/life.vim b/src/bin/vim/runtime/macros/life/life.vim index 8fa6883936..e3e92ee563 100644 --- a/src/bin/vim/runtime/macros/life/life.vim +++ b/src/bin/vim/runtime/macros/life/life.vim @@ -142,7 +142,8 @@ map ,Iaa o=AB =BC =CD =DE =EF =FG =GH =HI =IJ =JK =KL =LM =MN =NO =OP =PQ =QR map ,Iab o=RS =ST =TU =UV =VW =WX =XY =YZ =Z  " " Insert the searched patterns above the board -map ,IIN G?^top ,Il8,Id8,Il7,Id7,Il6,Id6,Il5,Id5,Il4,Id4,Il3,Id3,Il2,Id2,Il1,Id1,Il0,Id0,Iaa,Iab +map ,IIN G?^top +,Il8,Id8,Il7,Id7,Il6,Id6,Il5,Id5,Il4,Id4,Il3,Id3,Il2,Id2,Il1,Id1,Il0,Id0,Iaa,Iab " " ----- END of Initialisation ----- " @@ -204,7 +205,8 @@ map ,3 3y G$p " line, and then run the edit command. (used by work out square). " Leaves the cursor on the next character to be processed. " -map ( ,s,i,X0i?^#A  0,df.l,Y21h +map ( ,s,i,X0i?^#A  +0,df.l,Y21h " " Delete 's'paces (deads); " The number of remaining characters is the number of living neighbours. @@ -232,7 +234,8 @@ map ,m p map ,n x " " Replace a character by it's next, A --> B, B --> C, etc. -map ,a `a,jGi?=,ma 0,dll,j`a21l,ml,nh +map ,a `a,jGi?=,ma +0,dll,j`a21l,ml,nh " " ----- END of Work out one germ ----- " @@ -240,8 +243,10 @@ map ,a `a,jGi?=,ma 0,dll,j`a21l,ml,nh " " Get current date (used by time a generation) map << :r!date -map <1 G?^top O<< -map <2 G?^top k<< +map <1 G?^top +O<< +map <2 G?^top +k<< " " " Turn number on current line into edit command (used by time N generations) diff --git a/src/bin/vim/runtime/macros/maze/README.txt.info b/src/bin/vim/runtime/macros/maze/README.txt.info index 263ddcd2c2..0154a799dd 100644 Binary files a/src/bin/vim/runtime/macros/maze/README.txt.info and b/src/bin/vim/runtime/macros/maze/README.txt.info differ diff --git a/src/bin/vim/runtime/macros/maze/maze_5.78.info b/src/bin/vim/runtime/macros/maze/maze_5.78.info index fd65cef727..82cc1fd68f 100644 Binary files a/src/bin/vim/runtime/macros/maze/maze_5.78.info and b/src/bin/vim/runtime/macros/maze/maze_5.78.info differ diff --git a/src/bin/vim/runtime/macros/maze/maze_mac b/src/bin/vim/runtime/macros/maze/maze_mac index 621aeec2b7..5e2aefd032 100644 --- a/src/bin/vim/runtime/macros/maze/maze_mac +++ b/src/bin/vim/runtime/macros/maze/maze_mac @@ -167,7 +167,8 @@ map g IL " GYKeDP - print the state table and next char table at the end of the file " 0S - initialise the state of the machine to E1 " 2Gl - move to the top left cell of the maze -map I G$?. ^GYKeDP0S2Gl +map I G$?. +^GYKeDP0S2Gl " "================================================================ " L - the loop which is executed forever @@ -194,7 +195,9 @@ map I G$?. ^GYKeDP0S2Gl " the current character " @m - execute the action associated with this state " U - and repeat -map L QAmaGNB0M0E@m wX`a@mGT$B$R0M0E@m 2WSbXGVJ0H`a@r@mU +map L QAmaGNB0M0E@m +wX`a@mGT$B$R0M0E@m +2WSbXGVJ0H`a@r@mU " "================================================================ " U - no tail recursion allowed in vi macros so cheat and set U = L @@ -268,4 +271,5 @@ map Y osE1 k N1 sE1_ mm E2 sE2| mm S1 sE2. ll E1 map K osW1 j S1 sW1_ mm W2 sW2| mm N1 sW2. hh W1 map e osN1. hh W1 sN1| mm N2 sN2 k N1 sN2_ mm E1 map D osS1. ll E1 sS1| mm S2 sS2 j S1 sS2_ mm W1 -map P onE1 kF nE2 lF nW1 G$JF nW2 hF nN1 hF nN2 kF nS1 lF nS2 G$JF E1 +map P onE1 kF nE2 lF nW1 G$JF nW2 hF nN1 hF nN2 kF nS1 lF nS2 G$JF +E1 diff --git a/src/bin/vim/runtime/macros/maze/poster.info b/src/bin/vim/runtime/macros/maze/poster.info index 9a478d6a6a..d1932bf593 100644 Binary files a/src/bin/vim/runtime/macros/maze/poster.info and b/src/bin/vim/runtime/macros/maze/poster.info differ diff --git a/src/bin/vim/runtime/macros/shellmenu.vim b/src/bin/vim/runtime/macros/shellmenu.vim index 6175d1d9a6..1ac8b9d312 100644 --- a/src/bin/vim/runtime/macros/shellmenu.vim +++ b/src/bin/vim/runtime/macros/shellmenu.vim @@ -9,15 +9,36 @@ " " Written by: Lennart Schultz -imenu Stmts.for for in do doneki kk0elli -imenu Stmts.case case in ) ;; esacbki k0elli -imenu Stmts.if if then fiki kk0elli -imenu Stmts.if-else if then else fiki kki kk0elli -imenu Stmts.elif elif then ki kk0elli -imenu Stmts.while while do doneki kk0elli +imenu Stmts.for for in +do + +doneki kk0elli +imenu Stmts.case case in +) ;; +esacbki k0elli +imenu Stmts.if if +then + +fiki kk0elli +imenu Stmts.if-else if +then + +else + +fiki kki kk0elli +imenu Stmts.elif elif +then + +ki kk0elli +imenu Stmts.while while +do + +doneki kk0elli imenu Stmts.break break imenu Stmts.continue continue -imenu Stmts.function () { }ki k0i +imenu Stmts.function () { + +}ki k0i imenu Stmts.return return imenu Stmts.return-true return 0 imenu Stmts.return-false return 1 diff --git a/src/bin/vim/runtime/macros/urm/README.txt.info b/src/bin/vim/runtime/macros/urm/README.txt.info index 1337937c97..f12ef25e37 100644 Binary files a/src/bin/vim/runtime/macros/urm/README.txt.info and b/src/bin/vim/runtime/macros/urm/README.txt.info differ diff --git a/src/bin/vim/runtime/macros/urm/urm b/src/bin/vim/runtime/macros/urm/urm index 9cbefb70aa..3a2b5d9ed2 100644 --- a/src/bin/vim/runtime/macros/urm/urm +++ b/src/bin/vim/runtime/macros/urm/urm @@ -10,13 +10,26 @@ O ; =xp ( =x%hp ) @l a @db s @dt . =x0xkdd:ready _end_ o 0 1 2 3 4 5 6 7 8 9 0 _________ INIT main(k), l, b, c, t, u, q, d - "kT "lT "bT "cT "tT "uT "qT "dT -=lF'wa/O fpaw"zdt hp@z0"xD@x@k -=2ldwhp'wiGT'wp0P0"yD@ya =xlwP >0 =x%p I k/>0 ww"ydt 0D@y -'wa/o fwF'wpi`ar`aF'wffp0"vD@v0"vDp03x@v'wa @c 0 0 0I f0w"wdt 0D@w + +"kT +"lT +"bT +"cT +"tT +"uT +"qT +"dT +=lF'wa/O +fpaw"zdt hp@z0"xD@x@k +=2ldwhp'wiGT'wp0P0"yD@ya =xlwP >0 =x%p I k/>0 +ww"ydt 0D@y +'wa/o +fwF'wpi`ar`aF'wffp0"vD@v0"vDp03x@v'wa @c 0 0 0I f0w"wdt 0D@w `ahmaF'wa 'aa1 > @b 0p0f>w"vdt 0D@v -'wa/o wfbF'wpi`ar`aF'wffp0"vD@v0"vDp03x@v'wa @u 9 0 0I f9w"wdt 0D@w +'wa/o +wfbF'wpi`ar`aF'wffp0"vD@v0"vDp03x@v'wa @u 9 0 0I f9w"wdt 0D@w `ahmaF'wa `alr0 > @q 0p0f>w"vdt 0D@v -`ahy2l'wa `ax >1 @t 0p0/>1 ww"idt 0D@i +`ahy2l'wa `ax >1 @t 0p0/>1 +ww"idt 0D@i =xwhpbldwhp'wpaG$ma0"yD@y@ diff --git a/src/bin/vim/runtime/macros/urm/urm.vim b/src/bin/vim/runtime/macros/urm/urm.vim index 3108180783..4f908ac861 100644 --- a/src/bin/vim/runtime/macros/urm/urm.vim +++ b/src/bin/vim/runtime/macros/urm/urm.vim @@ -1,5 +1,9 @@ -map * 1G/INIT j"iT@i1G/INIT dG -map g 1G/^[(as;.] i >,mkkmw@k +map * 1G/INIT +j"iT@i1G/INIT +dG +map g 1G/^[(as;.] +i +>,mkkmw@k map T y$ map F yl map = 'kf, diff --git a/src/bin/vim/runtime/syntax/ant.vim b/src/bin/vim/runtime/syntax/ant.vim index ab5d063815..35ba4e2477 100644 --- a/src/bin/vim/runtime/syntax/ant.vim +++ b/src/bin/vim/runtime/syntax/ant.vim @@ -3,7 +3,7 @@ " Maintainer: Johannes Zellner " Last Change: Tue Apr 27 13:05:59 CEST 2004 " Filenames: build.xml -" $Id: ant.vim,v 1.1 2004/07/13 23:27:58 korli Exp $ +" $Id: ant.vim 8393 2004-07-13 23:28:30Z korli $ " Quit when a syntax file was already loaded if exists("b:current_syntax") diff --git a/src/bin/vim/runtime/syntax/bindzone.vim b/src/bin/vim/runtime/syntax/bindzone.vim index eb706885ec..3baf9f9dc1 100644 --- a/src/bin/vim/runtime/syntax/bindzone.vim +++ b/src/bin/vim/runtime/syntax/bindzone.vim @@ -4,7 +4,7 @@ " Last change: Thu Apr 26 02:16:18 SAMST 2001 " Filenames: /var/named/* " URL: http://rnd.web-drive.ru/vim/syntax/bindzone.vim -" $Id: bindzone.vim,v 1.1 2004/07/13 23:27:57 korli Exp $ +" $Id: bindzone.vim 8393 2004-07-13 23:28:30Z korli $ " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded diff --git a/src/bin/vim/runtime/syntax/catalog.vim b/src/bin/vim/runtime/syntax/catalog.vim index 41089eb737..3f9bd0c453 100644 --- a/src/bin/vim/runtime/syntax/catalog.vim +++ b/src/bin/vim/runtime/syntax/catalog.vim @@ -3,7 +3,7 @@ " Maintainer: Johannes Zellner " Last Change: Tue, 27 Apr 2004 14:54:59 CEST " Filenames: /etc/sgml.catalog -" $Id: catalog.vim,v 1.1 2004/07/13 23:27:57 korli Exp $ +" $Id: catalog.vim 8393 2004-07-13 23:28:30Z korli $ " Quit when a syntax file was already loaded if exists("b:current_syntax") diff --git a/src/bin/vim/runtime/syntax/cs.vim b/src/bin/vim/runtime/syntax/cs.vim index 4a8ec7f5e3..afd2479313 100644 --- a/src/bin/vim/runtime/syntax/cs.vim +++ b/src/bin/vim/runtime/syntax/cs.vim @@ -3,7 +3,7 @@ " Maintainer: Johannes Zellner " Last Change: Tue, 09 Mar 2004 14:32:13 CET " Filenames: *.cs -" $Id: cs.vim,v 1.1 2004/07/13 23:27:57 korli Exp $ +" $Id: cs.vim 8393 2004-07-13 23:28:30Z korli $ " " REFERENCES: " [1] ECMA TC39: C# Language Specification (WD13Oct01.doc) diff --git a/src/bin/vim/runtime/syntax/def.vim b/src/bin/vim/runtime/syntax/def.vim index eee3509f85..996849572d 100644 --- a/src/bin/vim/runtime/syntax/def.vim +++ b/src/bin/vim/runtime/syntax/def.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Microsoft Module-Definition (.def) File " Maintainer: Rob Brady -" Last Change: $Date: 2004/07/13 23:27:57 $ +" Last Change: $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " URL: http://www.datatone.com/~robb/vim/syntax/def.vim " $Revision: 1.1 $ diff --git a/src/bin/vim/runtime/syntax/dsl.vim b/src/bin/vim/runtime/syntax/dsl.vim index 35bbf6204b..eb88fe3d36 100644 --- a/src/bin/vim/runtime/syntax/dsl.vim +++ b/src/bin/vim/runtime/syntax/dsl.vim @@ -3,7 +3,7 @@ " Maintainer: Johannes Zellner " Last Change: Tue, 27 Apr 2004 14:54:59 CEST " Filenames: *.dsl -" $Id: dsl.vim,v 1.1 2004/07/13 23:27:57 korli Exp $ +" $Id: dsl.vim 8393 2004-07-13 23:28:30Z korli $ if exists("b:current_syntax") | finish | endif diff --git a/src/bin/vim/runtime/syntax/elf.vim b/src/bin/vim/runtime/syntax/elf.vim index 9e4ab022b9..4354a74de2 100644 --- a/src/bin/vim/runtime/syntax/elf.vim +++ b/src/bin/vim/runtime/syntax/elf.vim @@ -4,7 +4,7 @@ " Last Change: Son 22 Jun 2003 20:43:14 CEST " Filenames: *.ab,*.am " URL: http://www.cvjb.de/comp/vim/elf.vim -" $Id: elf.vim,v 1.1 2004/07/13 23:27:58 korli Exp $ +" $Id: elf.vim 8393 2004-07-13 23:28:30Z korli $ " " ELF: Extensible Language Facility " This is the Applix Inc., Macro and Builder programming language. diff --git a/src/bin/vim/runtime/syntax/focexec.vim b/src/bin/vim/runtime/syntax/focexec.vim index 17ad26673d..4f3d5af338 100644 --- a/src/bin/vim/runtime/syntax/focexec.vim +++ b/src/bin/vim/runtime/syntax/focexec.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Focus Executable " Maintainer: Rob Brady -" Last Change: $Date: 2004/07/13 23:27:58 $ +" Last Change: $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " URL: http://www.datatone.com/~robb/vim/syntax/focexec.vim " $Revision: 1.1 $ diff --git a/src/bin/vim/runtime/syntax/forth.vim b/src/bin/vim/runtime/syntax/forth.vim index 0027714cfe..3400fdafab 100644 --- a/src/bin/vim/runtime/syntax/forth.vim +++ b/src/bin/vim/runtime/syntax/forth.vim @@ -5,7 +5,7 @@ " Filenames: *.fs,*.ft " URL: http://www.cvjb.de/comp/vim/forth.vim -" $Id: forth.vim,v 1.1 2004/07/13 23:27:57 korli Exp $ +" $Id: forth.vim 8393 2004-07-13 23:28:30Z korli $ " The list of keywords is incomplete, compared with the offical ANS " wordlist. If you use this language, please improve it, and send me diff --git a/src/bin/vim/runtime/syntax/hog.vim b/src/bin/vim/runtime/syntax/hog.vim index da2e8936df..0f29414825 100644 --- a/src/bin/vim/runtime/syntax/hog.vim +++ b/src/bin/vim/runtime/syntax/hog.vim @@ -1,7 +1,7 @@ " Snort syntax file " Language: Snort Configuration File (see: http://www.snort.org) " Maintainer: Phil Wood, cornett@arpa.net -" Last Change: $Date: 2004/07/13 23:27:58 $ +" Last Change: $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " Filenames: *.hog *.rules snort.conf vision.conf " URL: http://home.lanl.gov/cpw/vim/syntax/hog.vim " Snort Version: 1.8 By Martin Roesch (roesch@clark.net, www.snort.org) diff --git a/src/bin/vim/runtime/syntax/kscript.vim b/src/bin/vim/runtime/syntax/kscript.vim index 397497bdd2..7c0b1131ff 100644 --- a/src/bin/vim/runtime/syntax/kscript.vim +++ b/src/bin/vim/runtime/syntax/kscript.vim @@ -2,7 +2,7 @@ " Language: kscript " Maintainer: Thomas Capricelli " URL: http://aquila.rezel.enst.fr/thomas/vim/kscript.vim -" CVS: $Id: kscript.vim,v 1.1 2004/07/13 23:27:57 korli Exp $ +" CVS: $Id: kscript.vim 8393 2004-07-13 23:28:30Z korli $ " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded diff --git a/src/bin/vim/runtime/syntax/lout.vim b/src/bin/vim/runtime/syntax/lout.vim index d35807f01f..871ebc356c 100644 --- a/src/bin/vim/runtime/syntax/lout.vim +++ b/src/bin/vim/runtime/syntax/lout.vim @@ -4,7 +4,7 @@ " Last Change: Son 22 Jun 2003 20:43:26 CEST " Filenames: *.lout,*.lt " URL: http://www.cvjb.de/comp/vim/lout.vim -" $Id: lout.vim,v 1.1 2004/07/13 23:27:57 korli Exp $ +" $Id: lout.vim 8393 2004-07-13 23:28:30Z korli $ " " Lout: Basser Lout document formatting system. diff --git a/src/bin/vim/runtime/syntax/masm.vim b/src/bin/vim/runtime/syntax/masm.vim index 33706929b8..a541112078 100644 --- a/src/bin/vim/runtime/syntax/masm.vim +++ b/src/bin/vim/runtime/syntax/masm.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Microsoft Assembler (80x86) " Maintainer: Rob Brady -" Last Change: $Date: 2004/07/13 23:27:57 $ +" Last Change: $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " URL: http://www.datatone.com/~robb/vim/syntax/masm.vim " $Revision: 1.1 $ diff --git a/src/bin/vim/runtime/syntax/master.vim b/src/bin/vim/runtime/syntax/master.vim index d944b1de55..0fe7d8f4b4 100644 --- a/src/bin/vim/runtime/syntax/master.vim +++ b/src/bin/vim/runtime/syntax/master.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Focus Master File " Maintainer: Rob Brady -" Last Change: $Date: 2004/07/13 23:27:57 $ +" Last Change: $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " URL: http://www.datatone.com/~robb/vim/syntax/master.vim " $Revision: 1.1 $ diff --git a/src/bin/vim/runtime/syntax/mysql.vim b/src/bin/vim/runtime/syntax/mysql.vim index e949a07af6..4ad4ee1ff1 100644 --- a/src/bin/vim/runtime/syntax/mysql.vim +++ b/src/bin/vim/runtime/syntax/mysql.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: mysql " Maintainer: Kenneth J. Pronovici -" Last Change: $Date: 2004/07/13 23:27:59 $ +" Last Change: $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " Filenames: *.mysql " URL: ftp://cedar-solutions.com/software/mysql.vim " Note: The definitions below are taken from the mysql user manual as of April 2002, for version 3.23 diff --git a/src/bin/vim/runtime/syntax/named.vim b/src/bin/vim/runtime/syntax/named.vim index 5feae6479c..dd8a145a91 100644 --- a/src/bin/vim/runtime/syntax/named.vim +++ b/src/bin/vim/runtime/syntax/named.vim @@ -4,7 +4,7 @@ " Last change: Mon May 21 04:51:01 SAMST 2001 " Filenames: named.conf " URL: http://rnd.web-drive.ru/vim/syntax/named.vim -" $Id: named.vim,v 1.1 2004/07/13 23:27:57 korli Exp $ +" $Id: named.vim 8393 2004-07-13 23:28:30Z korli $ " " NOTE " it was not widely tested, i just tried it on my simple diff --git a/src/bin/vim/runtime/syntax/ncf.vim b/src/bin/vim/runtime/syntax/ncf.vim index d29cfbaae2..de3be298e3 100644 --- a/src/bin/vim/runtime/syntax/ncf.vim +++ b/src/bin/vim/runtime/syntax/ncf.vim @@ -2,7 +2,7 @@ " Language: Novell "NCF" Batch File " Maintainer: Jonathan J. Miner " Last Change: Tue, 04 Sep 2001 16:20:33 CDT -" $Id: ncf.vim,v 1.1 2004/07/13 23:27:57 korli Exp $ +" $Id: ncf.vim 8393 2004-07-13 23:28:30Z korli $ " Remove any old syntax stuff hanging around if version < 600 diff --git a/src/bin/vim/runtime/syntax/opl.vim b/src/bin/vim/runtime/syntax/opl.vim index 3e1ee874e1..80e81b29db 100644 --- a/src/bin/vim/runtime/syntax/opl.vim +++ b/src/bin/vim/runtime/syntax/opl.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: OPL " Maintainer: Czo -" $Id: opl.vim,v 1.1 2004/07/13 23:27:57 korli Exp $ +" $Id: opl.vim 8393 2004-07-13 23:28:30Z korli $ " Open Psion Language... (EPOC16/EPOC32) diff --git a/src/bin/vim/runtime/syntax/rcs.vim b/src/bin/vim/runtime/syntax/rcs.vim index f972b09bab..972960dfe4 100644 --- a/src/bin/vim/runtime/syntax/rcs.vim +++ b/src/bin/vim/runtime/syntax/rcs.vim @@ -2,7 +2,7 @@ " Language: RCS file " Maintainer: Dmitry Vasiliev " URL: http://www.hlabs.spb.ru/vim/rcs.vim -" Last Change: $Date: 2004/07/13 23:27:57 $ +" Last Change: $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " Filenames: *,v " $Revision: 1.1 $ " diff --git a/src/bin/vim/runtime/syntax/ruby.vim b/src/bin/vim/runtime/syntax/ruby.vim index ded2c3d615..25b8d8f71d 100644 --- a/src/bin/vim/runtime/syntax/ruby.vim +++ b/src/bin/vim/runtime/syntax/ruby.vim @@ -5,7 +5,7 @@ " Last Change: 2003 May 31 " URL: http://mugca.its.monash.edu.au/~djkea2/vim/syntax/ruby.vim -" $Id: ruby.vim,v 1.1 2004/07/13 23:28:00 korli Exp $ +" $Id: ruby.vim 8393 2004-07-13 23:28:30Z korli $ " Thanks to perl.vim authors, and to Reimer Behrends. :-) (MN) diff --git a/src/bin/vim/runtime/syntax/sgml.vim b/src/bin/vim/runtime/syntax/sgml.vim index b7020b36a5..602a54cbb6 100644 --- a/src/bin/vim/runtime/syntax/sgml.vim +++ b/src/bin/vim/runtime/syntax/sgml.vim @@ -3,7 +3,7 @@ " Maintainer: Johannes Zellner " Last Change: Tue, 27 Apr 2004 15:05:21 CEST " Filenames: *.sgml,*.sgm -" $Id: sgml.vim,v 1.1 2004/07/13 23:28:00 korli Exp $ +" $Id: sgml.vim 8393 2004-07-13 23:28:30Z korli $ " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded diff --git a/src/bin/vim/runtime/syntax/splint.vim b/src/bin/vim/runtime/syntax/splint.vim index be1afc6226..74c5a66250 100644 --- a/src/bin/vim/runtime/syntax/splint.vim +++ b/src/bin/vim/runtime/syntax/splint.vim @@ -2,7 +2,7 @@ " Language: splint (C with lclint/splint Annotations) " Maintainer: Ralf Wildenhues " Splint Home: http://www.splint.org/ -" Last Change: $Date: 2004/07/13 23:27:59 $ +" Last Change: $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " $Revision: 1.1 $ " Note: Splint annotated files are not detected by default. diff --git a/src/bin/vim/runtime/syntax/svn.vim b/src/bin/vim/runtime/syntax/svn.vim index cf14340336..297e901a11 100644 --- a/src/bin/vim/runtime/syntax/svn.vim +++ b/src/bin/vim/runtime/syntax/svn.vim @@ -2,7 +2,7 @@ " Language: Subversion (svn) commit file " Maintainer: Dmitry Vasiliev " URL: http://www.hlabs.spb.ru/vim/svn.vim -" Last Change: $Date: 2004/07/13 23:27:57 $ +" Last Change: $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " $Revision: 1.1 $ " For version 5.x: Clear all syntax items. diff --git a/src/bin/vim/runtime/syntax/tads.vim b/src/bin/vim/runtime/syntax/tads.vim index ec60ef1462..8666ca3797 100644 --- a/src/bin/vim/runtime/syntax/tads.vim +++ b/src/bin/vim/runtime/syntax/tads.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: TADS " Maintainer: Amir Karger -" $Date: 2004/07/13 23:28:00 $ +" $Date: 2004-07-14 01:28:30 +0200 (Mi, 14. Jul 2004) $ " $Revision: 1.1 $ " Stolen from: Bram Moolenaar's C language file " Newest version at: http://www.hec.utah.edu/~karger/vim/syntax/tads.vim diff --git a/src/bin/vim/runtime/syntax/tilde.vim b/src/bin/vim/runtime/syntax/tilde.vim index d262e01c36..56cabce085 100644 --- a/src/bin/vim/runtime/syntax/tilde.vim +++ b/src/bin/vim/runtime/syntax/tilde.vim @@ -3,7 +3,7 @@ " Language: Tilde " Maintainer: Tobias Rundström " URL: http://www.tildesoftware.net -" CVS: $Id: tilde.vim,v 1.1 2004/07/13 23:27:57 korli Exp $ +" CVS: $Id: tilde.vim 8393 2004-07-13 23:28:30Z korli $ if exists("b:current_syntax") finish diff --git a/src/bin/vim/runtime/syntax/vhdl.vim b/src/bin/vim/runtime/syntax/vhdl.vim index 24f7125ab1..a53685cf67 100644 --- a/src/bin/vim/runtime/syntax/vhdl.vim +++ b/src/bin/vim/runtime/syntax/vhdl.vim @@ -2,7 +2,7 @@ " Language: VHDL " Maintainer: Czo " Credits: Stephan Hegel -" $Id: vhdl.vim,v 1.1 2004/07/13 23:27:57 korli Exp $ +" $Id: vhdl.vim 8393 2004-07-13 23:28:30Z korli $ " VHSIC Hardware Description Language " Very High Scale Integrated Circuit diff --git a/src/bin/vim/runtime/syntax/xdefaults.vim b/src/bin/vim/runtime/syntax/xdefaults.vim index 02d2979891..c182c7c7b6 100644 --- a/src/bin/vim/runtime/syntax/xdefaults.vim +++ b/src/bin/vim/runtime/syntax/xdefaults.vim @@ -4,7 +4,7 @@ " Author and previous maintainer: " Gautam H. Mudunuri " Last Change: Tue, 27 Apr 2004 14:54:59 CEST -" $Id: xdefaults.vim,v 1.1 2004/07/13 23:27:59 korli Exp $ +" $Id: xdefaults.vim 8393 2004-07-13 23:28:30Z korli $ " " REFERENCES: " xrdb manual page diff --git a/src/bin/vim/runtime/syntax/xml.vim b/src/bin/vim/runtime/syntax/xml.vim index 3d2bd819b2..f4e37e0742 100644 --- a/src/bin/vim/runtime/syntax/xml.vim +++ b/src/bin/vim/runtime/syntax/xml.vim @@ -5,7 +5,7 @@ " Paul Siegmann " Last Change: Fri, 04 Jun 2004 10:41:54 CEST " Filenames: *.xml -" $Id: xml.vim,v 1.1 2004/07/13 23:27:57 korli Exp $ +" $Id: xml.vim 8393 2004-07-13 23:28:30Z korli $ " CONFIGURATION: " syntax folding can be turned on by diff --git a/src/bin/vim/runtime/syntax/xsd.vim b/src/bin/vim/runtime/syntax/xsd.vim index 0d61b2a82f..70b66d3f87 100644 --- a/src/bin/vim/runtime/syntax/xsd.vim +++ b/src/bin/vim/runtime/syntax/xsd.vim @@ -3,7 +3,7 @@ " Maintainer: Johannes Zellner " Last Change: Tue, 27 Apr 2004 14:54:59 CEST " Filenames: *.xsd -" $Id: xsd.vim,v 1.1 2004/07/13 23:27:57 korli Exp $ +" $Id: xsd.vim 8393 2004-07-13 23:28:30Z korli $ " REFERENCES: " [1] http://www.w3.org/TR/xmlschema-0 diff --git a/src/bin/vim/runtime/syntax/xslt.vim b/src/bin/vim/runtime/syntax/xslt.vim index cf6b1d0698..536a09ba13 100644 --- a/src/bin/vim/runtime/syntax/xslt.vim +++ b/src/bin/vim/runtime/syntax/xslt.vim @@ -3,7 +3,7 @@ " Maintainer: Johannes Zellner " Last Change: Sun, 28 Oct 2001 21:22:24 +0100 " Filenames: *.xsl -" $Id: xslt.vim,v 1.1 2004/07/13 23:27:58 korli Exp $ +" $Id: xslt.vim 8393 2004-07-13 23:28:30Z korli $ " REFERENCES: " [1] http://www.w3.org/TR/xslt diff --git a/src/bin/vim/runtime/tutor/README.txt.info b/src/bin/vim/runtime/tutor/README.txt.info index 238b11fa95..e331fb3175 100644 Binary files a/src/bin/vim/runtime/tutor/README.txt.info and b/src/bin/vim/runtime/tutor/README.txt.info differ diff --git a/src/bin/vim/runtime/tutor/tutor.info b/src/bin/vim/runtime/tutor/tutor.info index dccf4be6f5..0c6129e6f2 100644 Binary files a/src/bin/vim/runtime/tutor/tutor.info and b/src/bin/vim/runtime/tutor/tutor.info differ diff --git a/src/bin/vim/src/mkinstalldirs b/src/bin/vim/src/mkinstalldirs index 8814eaf4ae..1fde2bb575 100644 --- a/src/bin/vim/src/mkinstalldirs +++ b/src/bin/vim/src/mkinstalldirs @@ -4,7 +4,7 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.1 2004/06/15 09:02:25 korli Exp $ +# $Id: mkinstalldirs 7958 2004-06-15 09:02:28Z korli $ errstatus=0 diff --git a/src/bin/vim/src/pty.c b/src/bin/vim/src/pty.c index 36f5b013cb..45bcde9d18 100644 --- a/src/bin/vim/src/pty.c +++ b/src/bin/vim/src/pty.c @@ -37,7 +37,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -/* RCS_ID("$Id$ FAU") */ +/* RCS_ID("$Id: pty.c 28305 2008-10-23 21:46:26Z bonefish $ FAU") */ #include "vim.h" diff --git a/src/bin/zip/crc32.c b/src/bin/zip/crc32.c index 07a7dd5226..083120538a 100644 --- a/src/bin/zip/crc32.c +++ b/src/bin/zip/crc32.c @@ -11,7 +11,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id$ */ +/* $Id: crc32.c 22782 2007-11-01 01:27:31Z korli $ */ #define __CRC32_C /* identifies this source module */ diff --git a/src/bin/zip/crctab.c b/src/bin/zip/crctab.c index 39917d89e2..3b5c2cbfd0 100644 --- a/src/bin/zip/crctab.c +++ b/src/bin/zip/crctab.c @@ -11,7 +11,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id$ */ +/* $Id: crctab.c 22782 2007-11-01 01:27:31Z korli $ */ /* Generate a table for a byte-wise 32-bit CRC calculation on the polynomial: diff --git a/src/kits/media/OldAudioModule.h b/src/kits/media/OldAudioModule.h index 9ea2be7656..42b728f2d2 100644 --- a/src/kits/media/OldAudioModule.h +++ b/src/kits/media/OldAudioModule.h @@ -1,142 +1,142 @@ -/* ================ - - FILE: AudioModule.h - REVS: $Revision: 1.1 $ - NAME: marc - - Copyright (c) 1997 by Be Incorporated. All Rights Reserved. - -================ */ - -#ifndef _AUDIO_MODULE_H -#define _AUDIO_MODULE_H - -#include -#include -#include - -class BADCStream; -class BDACStream; -class BSubscriber; - -class BAudioEvent : public BMediaEvent { -public: - BAudioEvent(int32 frames, bool stereo, float* samples = NULL); - ~BAudioEvent(); - - virtual mk_time Start(); - virtual void SetStart(mk_time); - virtual mk_time Duration(); - virtual int32 Frames(); - virtual float* Samples(); - virtual int32 ChannelCount(); - virtual float Gain(); - virtual void SetGain(float); - virtual int32 Destination(); - virtual void SetDestination(int32); - virtual bool MixIn (float* dst, int32 frames, mk_time time); - virtual BMediaEvent* Clone(); - virtual bigtime_t CaptureTime(); - virtual void SetCaptureTime(bigtime_t); - -private: - mk_time fStart; - int32 fFrames; - float* fSamples; - float fGain; - int32 fDestination; - bigtime_t fCaptureTime; - bool fStereo; - bool fFreeHuey; -}; - - -class BDACRenderer : public BMediaRenderer { -public: - BDACRenderer(const char* name = NULL); - ~BDACRenderer(); - - mk_rate Units(); - mk_time Latency(); - mk_time Start(); - mk_time Duration(); - BTimeBase* TimeBase(); - void Open(); - void Close(); - void Wakeup(); - void TransportChanged(mk_time time, mk_rate rate, - transport_status status); - void StreamChanged(); - - virtual BMediaChannel* Channel(); - -private: - static bool _WriteDAC(void* arg, char* buf, uint32 bytes, void* header); - bool WriteDAC(short* buf, int32 frames, audio_buffer_header* header); - bool MixActiveSegments(mk_time start); - void MixOutput(short* dst); - - BMediaChannel* fChannel; - BDACStream* fDACStream; - BSubscriber* fSubscriber; - float* fBuffer; - int32 fBufferFrames; - BList fActiveSegments; - mk_time fLatency; - mk_time fNextTime; - bool fRunning; - BTimeBase fDACTimeBase; -}; - - -class BAudioFileStream : public BEventStream { -public: - BAudioFileStream(BMediaChannel* channel, BFile* file, - mk_time start = B_UNDEFINED_MK_TIME); - ~BAudioFileStream(); - - BMediaEvent* GetEvent(BMediaChannel* channel); - BMediaEvent* PeekEvent(BMediaChannel* channel, mk_time asap = 0); - status_t SeekToTime(BMediaChannel* channel, mk_time time); - void SetStart(mk_time start); - - virtual bigtime_t CaptureTime(); - virtual BMediaChannel* Channel(); - -private: - BMediaChannel* fChannel; - BFile* fFile; - mk_time fTime; - BAudioEvent* fCurrentEvent; - short* fBuffer; -}; - - -class BADCSource : public BEventStream { -public: - BADCSource(BMediaChannel* channel, mk_time start = 0); - ~BADCSource(); - - BMediaEvent* GetEvent(BMediaChannel* channel); - BMediaEvent* PeekEvent(BMediaChannel* channel, mk_time asap = 0); - status_t SeekToTime(BMediaChannel* channel, mk_time time); - void SetStart(mk_time start); - - virtual BMediaChannel* Channel(); - -private: - static bool _ReadADC(void* arg, char* buf, uint32 bytes, void* header); - void ReadADC(short* buf, int32 frames, audio_buffer_header* header); - - BMediaChannel* fChannel; - BFile* fFile; - mk_time fTime; - BAudioEvent* fCurrentEvent; - BAudioEvent* fNextEvent; - BLocker fEventLock; - BADCStream* fADCStream; - BSubscriber* fSubscriber; -}; - - -#endif +/* ================ + + FILE: AudioModule.h + REVS: $Revision: 1.1 $ + NAME: marc + + Copyright (c) 1997 by Be Incorporated. All Rights Reserved. + +================ */ + +#ifndef _AUDIO_MODULE_H +#define _AUDIO_MODULE_H + +#include +#include +#include + +class BADCStream; +class BDACStream; +class BSubscriber; + +class BAudioEvent : public BMediaEvent { +public: + BAudioEvent(int32 frames, bool stereo, float* samples = NULL); + ~BAudioEvent(); + + virtual mk_time Start(); + virtual void SetStart(mk_time); + virtual mk_time Duration(); + virtual int32 Frames(); + virtual float* Samples(); + virtual int32 ChannelCount(); + virtual float Gain(); + virtual void SetGain(float); + virtual int32 Destination(); + virtual void SetDestination(int32); + virtual bool MixIn (float* dst, int32 frames, mk_time time); + virtual BMediaEvent* Clone(); + virtual bigtime_t CaptureTime(); + virtual void SetCaptureTime(bigtime_t); + +private: + mk_time fStart; + int32 fFrames; + float* fSamples; + float fGain; + int32 fDestination; + bigtime_t fCaptureTime; + bool fStereo; + bool fFreeHuey; +}; + + +class BDACRenderer : public BMediaRenderer { +public: + BDACRenderer(const char* name = NULL); + ~BDACRenderer(); + + mk_rate Units(); + mk_time Latency(); + mk_time Start(); + mk_time Duration(); + BTimeBase* TimeBase(); + void Open(); + void Close(); + void Wakeup(); + void TransportChanged(mk_time time, mk_rate rate, + transport_status status); + void StreamChanged(); + + virtual BMediaChannel* Channel(); + +private: + static bool _WriteDAC(void* arg, char* buf, uint32 bytes, void* header); + bool WriteDAC(short* buf, int32 frames, audio_buffer_header* header); + bool MixActiveSegments(mk_time start); + void MixOutput(short* dst); + + BMediaChannel* fChannel; + BDACStream* fDACStream; + BSubscriber* fSubscriber; + float* fBuffer; + int32 fBufferFrames; + BList fActiveSegments; + mk_time fLatency; + mk_time fNextTime; + bool fRunning; + BTimeBase fDACTimeBase; +}; + + +class BAudioFileStream : public BEventStream { +public: + BAudioFileStream(BMediaChannel* channel, BFile* file, + mk_time start = B_UNDEFINED_MK_TIME); + ~BAudioFileStream(); + + BMediaEvent* GetEvent(BMediaChannel* channel); + BMediaEvent* PeekEvent(BMediaChannel* channel, mk_time asap = 0); + status_t SeekToTime(BMediaChannel* channel, mk_time time); + void SetStart(mk_time start); + + virtual bigtime_t CaptureTime(); + virtual BMediaChannel* Channel(); + +private: + BMediaChannel* fChannel; + BFile* fFile; + mk_time fTime; + BAudioEvent* fCurrentEvent; + short* fBuffer; +}; + + +class BADCSource : public BEventStream { +public: + BADCSource(BMediaChannel* channel, mk_time start = 0); + ~BADCSource(); + + BMediaEvent* GetEvent(BMediaChannel* channel); + BMediaEvent* PeekEvent(BMediaChannel* channel, mk_time asap = 0); + status_t SeekToTime(BMediaChannel* channel, mk_time time); + void SetStart(mk_time start); + + virtual BMediaChannel* Channel(); + +private: + static bool _ReadADC(void* arg, char* buf, uint32 bytes, void* header); + void ReadADC(short* buf, int32 frames, audio_buffer_header* header); + + BMediaChannel* fChannel; + BFile* fFile; + mk_time fTime; + BAudioEvent* fCurrentEvent; + BAudioEvent* fNextEvent; + BLocker fEventLock; + BADCStream* fADCStream; + BSubscriber* fSubscriber; +}; + + +#endif diff --git a/src/kits/media/OldAudioStream.h b/src/kits/media/OldAudioStream.h index dfdda88da0..140e65cd6d 100644 --- a/src/kits/media/OldAudioStream.h +++ b/src/kits/media/OldAudioStream.h @@ -1,94 +1,94 @@ -/****************************************************************************** - - File: AudioStream.h - - Copyright 1995-97, Be Incorporated - -******************************************************************************/ -#ifndef _AUDIO_STREAM_H -#define _AUDIO_STREAM_H - -#include -#include - - -/* ================ - Class definition for BADCStream and BDACStream - ================ */ - -class BADCStream : public BAbstractBufferStream -{ -public: - - BADCStream(); - virtual ~BADCStream(); - - status_t SetADCInput(int32 device); - status_t ADCInput(int32* device) const; - - status_t SetSamplingRate(float sRate); - status_t SamplingRate(float* sRate) const; - - status_t BoostMic(bool boost); - bool IsMicBoosted() const; - - status_t SetStreamBuffers(size_t bufferSize, int32 bufferCount); - -protected: - - virtual BMessenger* Server() const; /* message pipe to server */ - virtual stream_id StreamID() const; /* stream identifier */ - -private: - -virtual void _ReservedADCStream1(); -virtual void _ReservedADCStream2(); -virtual void _ReservedADCStream3(); - - BMessenger* fServer; - stream_id fStreamID; - uint32 _reserved[4]; -}; - - -class BDACStream : public BAbstractBufferStream -{ -public: - - BDACStream(); - virtual ~BDACStream(); - - status_t SetSamplingRate(float sRate); - status_t SamplingRate(float* sRate) const; - - status_t SetVolume(int32 device, - float l_volume, - float r_volume); - - status_t GetVolume(int32 device, - float *l_volume, - float *r_volume, - bool *enabled) const; - - status_t EnableDevice(int32 device, bool enable); - bool IsDeviceEnabled(int32 device) const; - - status_t SetStreamBuffers(size_t bufferSize, int32 bufferCount); - -protected: - - virtual BMessenger* Server() const; /* message pipe to server */ - virtual stream_id StreamID() const; /* stream identifier */ - -private: - -virtual void _ReservedDACStream1(); -virtual void _ReservedDACStream2(); -virtual void _ReservedDACStream3(); - - BMessenger* fServer; - stream_id fStreamID; - uint32 _reserved[4]; -}; - -#endif // #ifdef _AUDIO_STREAM_H +/****************************************************************************** + + File: AudioStream.h + + Copyright 1995-97, Be Incorporated + +******************************************************************************/ +#ifndef _AUDIO_STREAM_H +#define _AUDIO_STREAM_H + +#include +#include + + +/* ================ + Class definition for BADCStream and BDACStream + ================ */ + +class BADCStream : public BAbstractBufferStream +{ +public: + + BADCStream(); + virtual ~BADCStream(); + + status_t SetADCInput(int32 device); + status_t ADCInput(int32* device) const; + + status_t SetSamplingRate(float sRate); + status_t SamplingRate(float* sRate) const; + + status_t BoostMic(bool boost); + bool IsMicBoosted() const; + + status_t SetStreamBuffers(size_t bufferSize, int32 bufferCount); + +protected: + + virtual BMessenger* Server() const; /* message pipe to server */ + virtual stream_id StreamID() const; /* stream identifier */ + +private: + +virtual void _ReservedADCStream1(); +virtual void _ReservedADCStream2(); +virtual void _ReservedADCStream3(); + + BMessenger* fServer; + stream_id fStreamID; + uint32 _reserved[4]; +}; + + +class BDACStream : public BAbstractBufferStream +{ +public: + + BDACStream(); + virtual ~BDACStream(); + + status_t SetSamplingRate(float sRate); + status_t SamplingRate(float* sRate) const; + + status_t SetVolume(int32 device, + float l_volume, + float r_volume); + + status_t GetVolume(int32 device, + float *l_volume, + float *r_volume, + bool *enabled) const; + + status_t EnableDevice(int32 device, bool enable); + bool IsDeviceEnabled(int32 device) const; + + status_t SetStreamBuffers(size_t bufferSize, int32 bufferCount); + +protected: + + virtual BMessenger* Server() const; /* message pipe to server */ + virtual stream_id StreamID() const; /* stream identifier */ + +private: + +virtual void _ReservedDACStream1(); +virtual void _ReservedDACStream2(); +virtual void _ReservedDACStream3(); + + BMessenger* fServer; + stream_id fStreamID; + uint32 _reserved[4]; +}; + +#endif // #ifdef _AUDIO_STREAM_H diff --git a/src/kits/media/OldBufferMsgs.h b/src/kits/media/OldBufferMsgs.h index 12adf96a25..241de9e3a4 100644 --- a/src/kits/media/OldBufferMsgs.h +++ b/src/kits/media/OldBufferMsgs.h @@ -1,130 +1,130 @@ -/* ++++++++++ - - FILE: BufferMsgs.h - - Copyright (c) 1995-1997 by Be Incorporated. All Rights Reserved. - -+++++ */ -#ifndef _BUFFER_MSGS_H -#define _BUFFER_MSGS_H - -#include - -/**************************************************************** -This file defines the messages sent between a Subscriber and a -Server. Changes to the protocol should be noted here and appropriate -modifications made to Subscriber.cpp and any servers (currently -the audio_server is the only one). - -BufferMsgs defines a message-based interface, not a class -interface. A BufferMsgs receives messages from Subscribers via the -BMessenger class. - -Here are the messages that must be supported for the base Subscriber -class and the replies that a server will send. Specific Servers -may support other messages as well. - -==== -Acquire a stream-id for subsequent operations. -'resource' is a server-specific value that specifies the resource -to which the client wants access. - -Upon success, the server replies with 'stream_id' (used for -subsequent operations). - -GET_STREAM_ID int32("resource") -=> GET_STREAM_ID int32("stream_id") -=> ERROR_RETURN int32("error") - -==== -Acquire access to a stream for subsequent operations. -'stream_id' specifies the stream to which the client wants access. -'will_wait' determines if the client will receive an immediate reply -or if it will block until access is granted. 'sem' is a semaphore -used to indicate that the stream has released a buffer. - -Upon success, the server replies with 'subscriber_id' (used for -subsequent operations). - -SUBSCRIBE String("name") - int32("stream_id") - int32("sem") - Bool("will_wait") -=> SUBSCRIBE int32("subscriber_id") -=> ERROR_RETURN int32("error") - -==== -Relinquish access to the stream. - -UNSUBSCRIBE int32("subscriber_id") -=> UNSUBSCRIBE -=> ERROR_RETURN int32("error") - -==== -Join the stream at the specified position and start receiving buffers -of data. -ENTER_STREAM int32("subscriber_id") - int32("neighbor") - Bool("before") -=> ENTER_STREAM -=> ERROR_RETURN int32("error") - -==== -Issue a request to stop receiving buffers. More buffers may continue -to arrive, but you must keep acquiring_ and releasing_ them until you -get one for which is_last_buffer() is true. Then you can stop. - -EXIT_STREAM int32("subscriber_id") -=> EXIT_STREAM -=> ERROR_RETURN int32("error") - -==== -Get information about a particular buffer stream. - -GET_STREAM_PARAMS int32("stream_id") -=> GET_STREAM_PARAMS int32("buffer_size") - int32("buffer_count") - Bool("is_running") - int32("subscriber_count") -=> ERROR_RETURN int32("error") -==== -Set information about a particular buffer stream. - -SET_STREAM_PARAMS int32("stream_id") - int32("buffer_size") <> - int32("buffer_count") <> - Bool("is_running") <> -=> SET_STREAM_PARAMS int32("buffer_size") - int32("buffer_count") - Bool("is_running") - int32("subscriber_count") -=> ERROR_RETURN int32("error") - -==== -Return the subscriber id of the index'th subscriber sharing the -stream with the given subscriber. - -SUBSCRIBER_INFO int32("subscriber_id") -=> SUBSCRIBER_INFO String("subscriber_name") - int32("stream_id") // granted access to - int32("position") // position (if active) or -1 -=> ERROR_RETURN int32("error") - - -****************************************************************/ - -/* message values */ -enum { - DEBUG_SERVER = 99, - SUBSCRIBE, - UNSUBSCRIBE, - ENTER_STREAM, - EXIT_STREAM, - GET_STREAM_PARAMETERS, - SET_STREAM_PARAMETERS, - GET_STREAM_ID, - SUBSCRIBER_INFO, - ERROR_RETURN - }; - -#endif // #ifndef _BUFFER_MSGS_H +/* ++++++++++ + + FILE: BufferMsgs.h + + Copyright (c) 1995-1997 by Be Incorporated. All Rights Reserved. + ++++++ */ +#ifndef _BUFFER_MSGS_H +#define _BUFFER_MSGS_H + +#include + +/**************************************************************** +This file defines the messages sent between a Subscriber and a +Server. Changes to the protocol should be noted here and appropriate +modifications made to Subscriber.cpp and any servers (currently +the audio_server is the only one). + +BufferMsgs defines a message-based interface, not a class +interface. A BufferMsgs receives messages from Subscribers via the +BMessenger class. + +Here are the messages that must be supported for the base Subscriber +class and the replies that a server will send. Specific Servers +may support other messages as well. + +==== +Acquire a stream-id for subsequent operations. +'resource' is a server-specific value that specifies the resource +to which the client wants access. + +Upon success, the server replies with 'stream_id' (used for +subsequent operations). + +GET_STREAM_ID int32("resource") +=> GET_STREAM_ID int32("stream_id") +=> ERROR_RETURN int32("error") + +==== +Acquire access to a stream for subsequent operations. +'stream_id' specifies the stream to which the client wants access. +'will_wait' determines if the client will receive an immediate reply +or if it will block until access is granted. 'sem' is a semaphore +used to indicate that the stream has released a buffer. + +Upon success, the server replies with 'subscriber_id' (used for +subsequent operations). + +SUBSCRIBE String("name") + int32("stream_id") + int32("sem") + Bool("will_wait") +=> SUBSCRIBE int32("subscriber_id") +=> ERROR_RETURN int32("error") + +==== +Relinquish access to the stream. + +UNSUBSCRIBE int32("subscriber_id") +=> UNSUBSCRIBE +=> ERROR_RETURN int32("error") + +==== +Join the stream at the specified position and start receiving buffers +of data. +ENTER_STREAM int32("subscriber_id") + int32("neighbor") + Bool("before") +=> ENTER_STREAM +=> ERROR_RETURN int32("error") + +==== +Issue a request to stop receiving buffers. More buffers may continue +to arrive, but you must keep acquiring_ and releasing_ them until you +get one for which is_last_buffer() is true. Then you can stop. + +EXIT_STREAM int32("subscriber_id") +=> EXIT_STREAM +=> ERROR_RETURN int32("error") + +==== +Get information about a particular buffer stream. + +GET_STREAM_PARAMS int32("stream_id") +=> GET_STREAM_PARAMS int32("buffer_size") + int32("buffer_count") + Bool("is_running") + int32("subscriber_count") +=> ERROR_RETURN int32("error") +==== +Set information about a particular buffer stream. + +SET_STREAM_PARAMS int32("stream_id") + int32("buffer_size") <> + int32("buffer_count") <> + Bool("is_running") <> +=> SET_STREAM_PARAMS int32("buffer_size") + int32("buffer_count") + Bool("is_running") + int32("subscriber_count") +=> ERROR_RETURN int32("error") + +==== +Return the subscriber id of the index'th subscriber sharing the +stream with the given subscriber. + +SUBSCRIBER_INFO int32("subscriber_id") +=> SUBSCRIBER_INFO String("subscriber_name") + int32("stream_id") // granted access to + int32("position") // position (if active) or -1 +=> ERROR_RETURN int32("error") + + +****************************************************************/ + +/* message values */ +enum { + DEBUG_SERVER = 99, + SUBSCRIBE, + UNSUBSCRIBE, + ENTER_STREAM, + EXIT_STREAM, + GET_STREAM_PARAMETERS, + SET_STREAM_PARAMETERS, + GET_STREAM_ID, + SUBSCRIBER_INFO, + ERROR_RETURN + }; + +#endif // #ifndef _BUFFER_MSGS_H diff --git a/src/kits/media/OldBufferStreamManager.h b/src/kits/media/OldBufferStreamManager.h index 2811d06d2e..73b88c4a93 100644 --- a/src/kits/media/OldBufferStreamManager.h +++ b/src/kits/media/OldBufferStreamManager.h @@ -1,189 +1,189 @@ -/****************************************************************************** - - File: BufferStreamManager.h - - Copyright 1995-97, Be Incorporated - -******************************************************************************/ -#ifndef _BUFFER_STREAM_MANAGER_H -#define _BUFFER_STREAM_MANAGER_H - -#include -#include -#include -#include -#include - - -/* ================ - Local Declarations - ================ */ - -#define B_DEFAULT_BSTREAM_COUNT 3 -#define B_DEFAULT_BSTREAM_SIZE B_PAGE_SIZE -#define B_DEFAULT_BSTREAM_DELAY 10000 -#define B_DEFAULT_BSTREAM_TIMEOUT 5000000 - - -enum stream_state { - B_IDLE = 100, /* stream is shut down */ - B_RUNNING, /* stream is running */ - B_STOPPING /* waiting for final buffer to return */ - }; - - -/* ================ - Class definition for BBufferStreamManager - ================ */ - - -class BBufferStreamManager { - -public: - - BBufferStreamManager(char* name); - virtual ~BBufferStreamManager(); - - - char *Name() const; - BBufferStream *Stream() const; - - int32 BufferCount() const; - void SetBufferCount(int32 count); - - int32 BufferSize() const; - void SetBufferSize(int32 bytes); - - /* Get or set the minimum delay between sending out successive buffers. - * Although the StreamManager automatically shuts down when there - * are no more subscribers, setting the minumum delay can prevent - * prevent runaway streams. A zero or negative value means no - * delay. - */ - bigtime_t BufferDelay() const; - void SetBufferDelay(bigtime_t usecs); - - /* If no Buffers return to the StreamManager within a period of time, the - * StreamManager will decide that one of the subscribers is broken and - * will go hunting for it. When it finds the offending subscriber, - * it will be removed from the chain with impunity. - * - * The default is B_DEFAULT_TIMEOUT. Setting the timeout to 0 or a - * negative number will disable this. - */ - bigtime_t Timeout() const; - void SetTimeout(bigtime_t usecs); - - /**************************************************************** - * Control the running of the stream. - * - */ - - /* Set the pending state to B_RUNNING and, if required, start up - * the processing thread. The processing thread will start - * emitting buffers to the stream. - */ - stream_state Start(); - - /* Set the pending state to B_STOPPING. The processing thread will - * stop emitting new buffers to the stream, and when all buffers - * are accounted for, will automatically set the desired state - * to B_IDLE. - */ - stream_state Stop(); - - /* Set the desired state to B_IDLE. The processing thread will - * stop immediately and all buffers will be "reclaimed" back - * to the StreamManager. - */ - stream_state Abort(); - - /* Return the current state of the stream (B_RUNNING, B_STOPPING, or B_IDLE). - */ - stream_state State() const; - - /* When NotificationPort is set, the receiver will get a message - * whenever the state of the StreamManager changes. The msg_id of the - * message will be the new state of the StreamManager. - */ - port_id NotificationPort() const; - void SetNotificationPort(port_id port); - - /* Lock the data structures associated with this StreamManager - */ - bool Lock(); - void Unlock(); - - /**************************************************************** - * Subscribe functions - */ - - status_t Subscribe(BBufferStream *stream); - status_t Unsubscribe(); - subscriber_id ID() const; - - -/* ================ - Protected member functions. - ================ */ - -protected: - - /**************************************************************** - * - * The processing thread. This thread waits to acquire a Buffer - * (or for the timeout to expire) and takes appropriate action. - */ - virtual void StartProcessing(); - virtual void StopProcessing(); - static status_t _ProcessingThread(void *arg); - virtual void ProcessingThread(); - - /* Set the state of the stream. If newState is the same as the - * current state, this is a no-op. Otherwise, this method will - * notify anyone listening on the notification port about the - * changed state and will send a StateChange buffer through the - * stream. - */ - virtual void SetState(stream_state newState); - - /* Snooze until the desired time arrives. Returns the - * current time upon returning. - */ - bigtime_t SnoozeUntil(bigtime_t sys_time); - -/* ================ - Private data. - ================ */ - -private: - -virtual void _ReservedBufferStreamManager1(); -virtual void _ReservedBufferStreamManager2(); -virtual void _ReservedBufferStreamManager3(); - - /**************************************************************** - * - * Private fields. - * - */ - - BBufferStream *fStream; /* a BBufferStream object */ - stream_state fState; /* running, stopping, etc. */ - sem_id fSem; - - int32 fBufferCount; /* desired # of buffers */ - int32 fBufferSize; /* desired size of each buffer */ - bigtime_t fBufferDelay; /* minimum time between sends */ - bigtime_t fTimeout; /* watchdog timer */ - - port_id fNotifyPort; /* when set, send change of state msgs */ - thread_id fProcessingThread; /* thread to dispatch buffers */ - subscriber_id fManagerID; /* StreamManager's subID in fStream */ - - BLocker fLock; - char* fName; - uint32 _reserved[4]; -}; - -#endif // #ifdef _BUFFER_STREAM_MANAGER_H +/****************************************************************************** + + File: BufferStreamManager.h + + Copyright 1995-97, Be Incorporated + +******************************************************************************/ +#ifndef _BUFFER_STREAM_MANAGER_H +#define _BUFFER_STREAM_MANAGER_H + +#include +#include +#include +#include +#include + + +/* ================ + Local Declarations + ================ */ + +#define B_DEFAULT_BSTREAM_COUNT 3 +#define B_DEFAULT_BSTREAM_SIZE B_PAGE_SIZE +#define B_DEFAULT_BSTREAM_DELAY 10000 +#define B_DEFAULT_BSTREAM_TIMEOUT 5000000 + + +enum stream_state { + B_IDLE = 100, /* stream is shut down */ + B_RUNNING, /* stream is running */ + B_STOPPING /* waiting for final buffer to return */ + }; + + +/* ================ + Class definition for BBufferStreamManager + ================ */ + + +class BBufferStreamManager { + +public: + + BBufferStreamManager(char* name); + virtual ~BBufferStreamManager(); + + + char *Name() const; + BBufferStream *Stream() const; + + int32 BufferCount() const; + void SetBufferCount(int32 count); + + int32 BufferSize() const; + void SetBufferSize(int32 bytes); + + /* Get or set the minimum delay between sending out successive buffers. + * Although the StreamManager automatically shuts down when there + * are no more subscribers, setting the minumum delay can prevent + * prevent runaway streams. A zero or negative value means no + * delay. + */ + bigtime_t BufferDelay() const; + void SetBufferDelay(bigtime_t usecs); + + /* If no Buffers return to the StreamManager within a period of time, the + * StreamManager will decide that one of the subscribers is broken and + * will go hunting for it. When it finds the offending subscriber, + * it will be removed from the chain with impunity. + * + * The default is B_DEFAULT_TIMEOUT. Setting the timeout to 0 or a + * negative number will disable this. + */ + bigtime_t Timeout() const; + void SetTimeout(bigtime_t usecs); + + /**************************************************************** + * Control the running of the stream. + * + */ + + /* Set the pending state to B_RUNNING and, if required, start up + * the processing thread. The processing thread will start + * emitting buffers to the stream. + */ + stream_state Start(); + + /* Set the pending state to B_STOPPING. The processing thread will + * stop emitting new buffers to the stream, and when all buffers + * are accounted for, will automatically set the desired state + * to B_IDLE. + */ + stream_state Stop(); + + /* Set the desired state to B_IDLE. The processing thread will + * stop immediately and all buffers will be "reclaimed" back + * to the StreamManager. + */ + stream_state Abort(); + + /* Return the current state of the stream (B_RUNNING, B_STOPPING, or B_IDLE). + */ + stream_state State() const; + + /* When NotificationPort is set, the receiver will get a message + * whenever the state of the StreamManager changes. The msg_id of the + * message will be the new state of the StreamManager. + */ + port_id NotificationPort() const; + void SetNotificationPort(port_id port); + + /* Lock the data structures associated with this StreamManager + */ + bool Lock(); + void Unlock(); + + /**************************************************************** + * Subscribe functions + */ + + status_t Subscribe(BBufferStream *stream); + status_t Unsubscribe(); + subscriber_id ID() const; + + +/* ================ + Protected member functions. + ================ */ + +protected: + + /**************************************************************** + * + * The processing thread. This thread waits to acquire a Buffer + * (or for the timeout to expire) and takes appropriate action. + */ + virtual void StartProcessing(); + virtual void StopProcessing(); + static status_t _ProcessingThread(void *arg); + virtual void ProcessingThread(); + + /* Set the state of the stream. If newState is the same as the + * current state, this is a no-op. Otherwise, this method will + * notify anyone listening on the notification port about the + * changed state and will send a StateChange buffer through the + * stream. + */ + virtual void SetState(stream_state newState); + + /* Snooze until the desired time arrives. Returns the + * current time upon returning. + */ + bigtime_t SnoozeUntil(bigtime_t sys_time); + +/* ================ + Private data. + ================ */ + +private: + +virtual void _ReservedBufferStreamManager1(); +virtual void _ReservedBufferStreamManager2(); +virtual void _ReservedBufferStreamManager3(); + + /**************************************************************** + * + * Private fields. + * + */ + + BBufferStream *fStream; /* a BBufferStream object */ + stream_state fState; /* running, stopping, etc. */ + sem_id fSem; + + int32 fBufferCount; /* desired # of buffers */ + int32 fBufferSize; /* desired size of each buffer */ + bigtime_t fBufferDelay; /* minimum time between sends */ + bigtime_t fTimeout; /* watchdog timer */ + + port_id fNotifyPort; /* when set, send change of state msgs */ + thread_id fProcessingThread; /* thread to dispatch buffers */ + subscriber_id fManagerID; /* StreamManager's subID in fStream */ + + BLocker fLock; + char* fName; + uint32 _reserved[4]; +}; + +#endif // #ifdef _BUFFER_STREAM_MANAGER_H diff --git a/src/kits/media/OldMediaDefs.h b/src/kits/media/OldMediaDefs.h index 8551ee4f7f..069e1e587e 100644 --- a/src/kits/media/OldMediaDefs.h +++ b/src/kits/media/OldMediaDefs.h @@ -1,83 +1,83 @@ -/****************************************************************************** - - File: MediaDefs.h - - Copyright 1995-97, Be Incorporated - -******************************************************************************/ -#ifndef _MEDIA_DEFS_H -#define _MEDIA_DEFS_H - -#include -#include - -/* Buffer header for audio server */ - -typedef struct audio_buffer_header { - int32 buffer_number; - int32 subscriber_count; - bigtime_t time; - int32 reserved_1; - int32 reserved_2; - int32 reserved_3; - int32 reserved_4; -} audio_buffer_header; - - -#define B_MEDIA_LEVEL B_REAL_TIME_PRIORITY - -#define B_NO_CHANGE (-1) - -/* ================ - Subscriber IDs and special values - ================ */ - -#define B_NO_SUBSCRIBER_ID ((subscriber_id)-1) -#define B_NO_SUBSCRIBER_NAME "not subscribed" - -#define B_SHARED_SUBSCRIBER_ID ((subscriber_id)-2) -#define B_SHARED_SUBSCRIBER_NAME "shared subscriber" - -/* ================ - Values for sound files and audio streams - ================ */ - -/* values for byte_ordering */ -enum { B_BIG_ENDIAN, B_LITTLE_ENDIAN }; - -/* values for sample_format */ -enum { - B_UNDEFINED_SAMPLES, - B_LINEAR_SAMPLES, - B_FLOAT_SAMPLES, - B_MULAW_SAMPLES - }; - -/* Audio device codes for BAudioSubscriber's - * Get/SetVolume() and EnableDevice() calls - */ -enum { - B_CD_THROUGH=0, - B_LINE_IN_THROUGH, - B_ADC_IN, - B_LOOPBACK, - B_DAC_OUT, - B_MASTER_OUT, - B_SPEAKER_OUT, - B_SOUND_DEVICE_END - }; - -/* ADC input codes */ -enum { - B_CD_IN, - B_LINE_IN, - B_MIC_IN - }; - - -enum { - B_DAC_STREAM = 2354, - B_ADC_STREAM - }; - -#endif // #ifndef _MEDIA_DEFS_H +/****************************************************************************** + + File: MediaDefs.h + + Copyright 1995-97, Be Incorporated + +******************************************************************************/ +#ifndef _MEDIA_DEFS_H +#define _MEDIA_DEFS_H + +#include +#include + +/* Buffer header for audio server */ + +typedef struct audio_buffer_header { + int32 buffer_number; + int32 subscriber_count; + bigtime_t time; + int32 reserved_1; + int32 reserved_2; + int32 reserved_3; + int32 reserved_4; +} audio_buffer_header; + + +#define B_MEDIA_LEVEL B_REAL_TIME_PRIORITY + +#define B_NO_CHANGE (-1) + +/* ================ + Subscriber IDs and special values + ================ */ + +#define B_NO_SUBSCRIBER_ID ((subscriber_id)-1) +#define B_NO_SUBSCRIBER_NAME "not subscribed" + +#define B_SHARED_SUBSCRIBER_ID ((subscriber_id)-2) +#define B_SHARED_SUBSCRIBER_NAME "shared subscriber" + +/* ================ + Values for sound files and audio streams + ================ */ + +/* values for byte_ordering */ +enum { B_BIG_ENDIAN, B_LITTLE_ENDIAN }; + +/* values for sample_format */ +enum { + B_UNDEFINED_SAMPLES, + B_LINEAR_SAMPLES, + B_FLOAT_SAMPLES, + B_MULAW_SAMPLES + }; + +/* Audio device codes for BAudioSubscriber's + * Get/SetVolume() and EnableDevice() calls + */ +enum { + B_CD_THROUGH=0, + B_LINE_IN_THROUGH, + B_ADC_IN, + B_LOOPBACK, + B_DAC_OUT, + B_MASTER_OUT, + B_SPEAKER_OUT, + B_SOUND_DEVICE_END + }; + +/* ADC input codes */ +enum { + B_CD_IN, + B_LINE_IN, + B_MIC_IN + }; + + +enum { + B_DAC_STREAM = 2354, + B_ADC_STREAM + }; + +#endif // #ifndef _MEDIA_DEFS_H diff --git a/src/kits/media/OldMediaModule.h b/src/kits/media/OldMediaModule.h index df300b2e6e..e0a6fd92f1 100644 --- a/src/kits/media/OldMediaModule.h +++ b/src/kits/media/OldMediaModule.h @@ -1,218 +1,218 @@ -/* ================ - - FILE: MediaModule.h - REVS: $Revision: 1.1 $ - NAME: marc - - Copyright (c) 1997 by Be Incorporated. All Rights Reserved. - -================ */ - -#ifndef _MEDIA_MODULE_H -#define _MEDIA_MODULE_H - -#include -#include - -typedef double mk_time; -typedef double mk_rate; -typedef void (*mk_deferred_call)(void*); - -#define B_UNDEFINED_MK_TIME ((mk_time) -1) - -enum transport_status { - B_TRANSPORT_RUNNING, - B_TRANSPORT_STOPPED, - B_TRANSPORT_PAUSED -}; - -enum channel_selector { - B_VIDEO_MAIN_CHANNEL, - B_VIDEO_MONITOR_CHANNEL, - B_AUDIO_FRONT_CHANNEL, - B_AUDIO_CENTER_CHANNEL, - B_AUDIO_REAR_CHANNEL, - B_AUDIO_SUB_CHANNEL, - B_AUDIO_MONITOR_CHANNEL, - B_MIDI_CHANNEL, - B_MISC_CHANNEL -}; - - -class BMediaRenderer; -class BTransport; -class BTimeBase; -class BMessage; -class BMediaChannel; - - -class BMediaEvent { -public: - virtual ~BMediaEvent() {}; - virtual mk_time Start() = 0; - virtual mk_time Duration(); - virtual bigtime_t CaptureTime(); -}; - - -class BEventStream { -public: - BEventStream(); - virtual ~BEventStream(); - - virtual mk_time Start(); - virtual void SetStart(mk_time); - virtual mk_time Duration(); - virtual void SetDuration(mk_time); - virtual BMediaEvent* GetEvent(BMediaChannel* channel) = 0; - virtual BMediaEvent* PeekEvent(BMediaChannel* channel, - mk_time asap = 0) = 0; - virtual status_t SeekToTime(BMediaChannel* channel, - mk_time time); - -private: - mk_time fStart; - mk_time fDuration; -}; - - -class BMediaRenderer { -public: - BMediaRenderer(const char* name = NULL, int32 priority = B_NORMAL_PRIORITY); - virtual ~BMediaRenderer(); - - virtual char* Name(); - virtual mk_time Latency(); - virtual BTransport* Transport(); - virtual void SetTransport(BTransport*); - virtual mk_time Start(); - virtual mk_time Duration(); - virtual BTimeBase* TimeBase(); - - virtual void Open(); - virtual void Close(); - virtual void WakeUp(); - virtual void TransportChanged(mk_time time, mk_rate rate, - transport_status status); - virtual void StreamChanged(); - - virtual void OpenReceived(); - virtual void CloseReceived(); - virtual void WakeUpReceived(); - virtual void TransportChangedReceived(mk_time time, mk_rate rate, - transport_status status); - virtual void StreamChangedReceived(); - -private: - static int32 _LoopThread(void* arg); - void LoopThread(); - - thread_id fLoopThread; - sem_id fLoopSem; - int32 fFlags; - mk_time fTCTime; - mk_rate fTCRate; - transport_status fTCStatus; - BLocker fLoopLock; - - char* fName; - BTransport* fTransport; -}; - - -class BTransport { -public: - BTransport(); - virtual ~BTransport(); - - virtual BTimeBase* TimeBase(); - virtual void SetTimeBase(BTimeBase*); - virtual BList* Renderers(); - virtual void AddRenderer(BMediaRenderer*); - virtual bool RemoveRenderer(BMediaRenderer*); - virtual transport_status Status(); - virtual void SetStatus(transport_status); - virtual mk_time PerformanceTime(); - virtual mk_rate PerformanceRate(); - virtual mk_time TimeOffset(); - virtual void SetTimeOffset(mk_time); - virtual mk_time MaximumLatency(); - virtual mk_time PerformanceStart(); - virtual mk_time PerformanceEnd(); - virtual void Open(); - virtual void Close(); - virtual void TransportChanged(); - virtual void TimeSkipped(); - virtual void RequestWakeUp(mk_time, BMediaRenderer*); - virtual void SeekToTime(mk_time); - virtual BMediaChannel* GetChannel(int32 selector); - -private: - BTimeBase* fTimeBase; - BList fRenderers; - BList fChannels; - BLocker fChannelListLock; - transport_status fStatus; - mk_time fTimeOffset; -}; - - -class BTimeBase { -public: - BTimeBase(mk_rate rate = 1.0); - virtual ~BTimeBase(); - - virtual BList* Transports(); - virtual void AddTransport(BTransport*); - virtual bool RemoveTransport(BTransport*); - virtual void TimeSkipped(); - virtual status_t CallAt(mk_time time, mk_deferred_call function, void* arg); - virtual mk_time Time(); - virtual mk_rate Rate(); - virtual mk_time TimeAt(bigtime_t system_time); - virtual bigtime_t SystemTimeAt(mk_time time); - virtual void Sync(mk_time time, bigtime_t system_time); - virtual bool IsAbsolute(); - -private: - static int32 _SnoozeThread(void* arg); - void SnoozeThread(); - - BList fTransports; - BList fDeferredCalls; - BLocker fLock; - mk_rate fRate; - mk_time fSyncT; - bigtime_t fSyncS; - mk_time fSnoozeUntil; - thread_id fSnoozeThread; -}; - - -class BMediaChannel { -public: - BMediaChannel(mk_rate rate, - BMediaRenderer* renderer = NULL, - BEventStream* source = NULL); - virtual ~BMediaChannel(); - - virtual BMediaRenderer* Renderer(); - virtual void SetRenderer(BMediaRenderer*); - virtual BEventStream* Source(); - virtual void SetSource(BEventStream*); - virtual mk_rate Rate(); - virtual void SetRate(mk_rate); - bool LockChannel(); - status_t LockWithTimeout(bigtime_t); - void UnlockChannel(); - virtual void StreamChanged(); - -private: - mk_rate fRate; - BMediaRenderer* fRenderer; - BEventStream* fSource; - BLocker fChannelLock; -}; - - -#endif +/* ================ + + FILE: MediaModule.h + REVS: $Revision: 1.1 $ + NAME: marc + + Copyright (c) 1997 by Be Incorporated. All Rights Reserved. + +================ */ + +#ifndef _MEDIA_MODULE_H +#define _MEDIA_MODULE_H + +#include +#include + +typedef double mk_time; +typedef double mk_rate; +typedef void (*mk_deferred_call)(void*); + +#define B_UNDEFINED_MK_TIME ((mk_time) -1) + +enum transport_status { + B_TRANSPORT_RUNNING, + B_TRANSPORT_STOPPED, + B_TRANSPORT_PAUSED +}; + +enum channel_selector { + B_VIDEO_MAIN_CHANNEL, + B_VIDEO_MONITOR_CHANNEL, + B_AUDIO_FRONT_CHANNEL, + B_AUDIO_CENTER_CHANNEL, + B_AUDIO_REAR_CHANNEL, + B_AUDIO_SUB_CHANNEL, + B_AUDIO_MONITOR_CHANNEL, + B_MIDI_CHANNEL, + B_MISC_CHANNEL +}; + + +class BMediaRenderer; +class BTransport; +class BTimeBase; +class BMessage; +class BMediaChannel; + + +class BMediaEvent { +public: + virtual ~BMediaEvent() {}; + virtual mk_time Start() = 0; + virtual mk_time Duration(); + virtual bigtime_t CaptureTime(); +}; + + +class BEventStream { +public: + BEventStream(); + virtual ~BEventStream(); + + virtual mk_time Start(); + virtual void SetStart(mk_time); + virtual mk_time Duration(); + virtual void SetDuration(mk_time); + virtual BMediaEvent* GetEvent(BMediaChannel* channel) = 0; + virtual BMediaEvent* PeekEvent(BMediaChannel* channel, + mk_time asap = 0) = 0; + virtual status_t SeekToTime(BMediaChannel* channel, + mk_time time); + +private: + mk_time fStart; + mk_time fDuration; +}; + + +class BMediaRenderer { +public: + BMediaRenderer(const char* name = NULL, int32 priority = B_NORMAL_PRIORITY); + virtual ~BMediaRenderer(); + + virtual char* Name(); + virtual mk_time Latency(); + virtual BTransport* Transport(); + virtual void SetTransport(BTransport*); + virtual mk_time Start(); + virtual mk_time Duration(); + virtual BTimeBase* TimeBase(); + + virtual void Open(); + virtual void Close(); + virtual void WakeUp(); + virtual void TransportChanged(mk_time time, mk_rate rate, + transport_status status); + virtual void StreamChanged(); + + virtual void OpenReceived(); + virtual void CloseReceived(); + virtual void WakeUpReceived(); + virtual void TransportChangedReceived(mk_time time, mk_rate rate, + transport_status status); + virtual void StreamChangedReceived(); + +private: + static int32 _LoopThread(void* arg); + void LoopThread(); + + thread_id fLoopThread; + sem_id fLoopSem; + int32 fFlags; + mk_time fTCTime; + mk_rate fTCRate; + transport_status fTCStatus; + BLocker fLoopLock; + + char* fName; + BTransport* fTransport; +}; + + +class BTransport { +public: + BTransport(); + virtual ~BTransport(); + + virtual BTimeBase* TimeBase(); + virtual void SetTimeBase(BTimeBase*); + virtual BList* Renderers(); + virtual void AddRenderer(BMediaRenderer*); + virtual bool RemoveRenderer(BMediaRenderer*); + virtual transport_status Status(); + virtual void SetStatus(transport_status); + virtual mk_time PerformanceTime(); + virtual mk_rate PerformanceRate(); + virtual mk_time TimeOffset(); + virtual void SetTimeOffset(mk_time); + virtual mk_time MaximumLatency(); + virtual mk_time PerformanceStart(); + virtual mk_time PerformanceEnd(); + virtual void Open(); + virtual void Close(); + virtual void TransportChanged(); + virtual void TimeSkipped(); + virtual void RequestWakeUp(mk_time, BMediaRenderer*); + virtual void SeekToTime(mk_time); + virtual BMediaChannel* GetChannel(int32 selector); + +private: + BTimeBase* fTimeBase; + BList fRenderers; + BList fChannels; + BLocker fChannelListLock; + transport_status fStatus; + mk_time fTimeOffset; +}; + + +class BTimeBase { +public: + BTimeBase(mk_rate rate = 1.0); + virtual ~BTimeBase(); + + virtual BList* Transports(); + virtual void AddTransport(BTransport*); + virtual bool RemoveTransport(BTransport*); + virtual void TimeSkipped(); + virtual status_t CallAt(mk_time time, mk_deferred_call function, void* arg); + virtual mk_time Time(); + virtual mk_rate Rate(); + virtual mk_time TimeAt(bigtime_t system_time); + virtual bigtime_t SystemTimeAt(mk_time time); + virtual void Sync(mk_time time, bigtime_t system_time); + virtual bool IsAbsolute(); + +private: + static int32 _SnoozeThread(void* arg); + void SnoozeThread(); + + BList fTransports; + BList fDeferredCalls; + BLocker fLock; + mk_rate fRate; + mk_time fSyncT; + bigtime_t fSyncS; + mk_time fSnoozeUntil; + thread_id fSnoozeThread; +}; + + +class BMediaChannel { +public: + BMediaChannel(mk_rate rate, + BMediaRenderer* renderer = NULL, + BEventStream* source = NULL); + virtual ~BMediaChannel(); + + virtual BMediaRenderer* Renderer(); + virtual void SetRenderer(BMediaRenderer*); + virtual BEventStream* Source(); + virtual void SetSource(BEventStream*); + virtual mk_rate Rate(); + virtual void SetRate(mk_rate); + bool LockChannel(); + status_t LockWithTimeout(bigtime_t); + void UnlockChannel(); + virtual void StreamChanged(); + +private: + mk_rate fRate; + BMediaRenderer* fRenderer; + BEventStream* fSource; + BLocker fChannelLock; +}; + + +#endif diff --git a/src/kits/media/OldSoundFile.h b/src/kits/media/OldSoundFile.h index 4ac0d510f7..cb413a62aa 100644 --- a/src/kits/media/OldSoundFile.h +++ b/src/kits/media/OldSoundFile.h @@ -1,98 +1,98 @@ -/****************************************************************************** - - File: SoundFile.h - - Description: Interface for a format-insensitive sound file object. - - Copyright 1995-97, Be Incorporated - -******************************************************************************/ - - -#ifndef _SOUND_FILE_H -#define _SOUND_FILE_H - -#include -#include -#include - -enum // sound_format -{ B_UNKNOWN_FILE, - B_AIFF_FILE, - B_WAVE_FILE, - B_UNIX_FILE }; - -class BSoundFile { - -public: - BSoundFile(); - BSoundFile(const entry_ref *ref, - uint32 open_mode); - virtual ~BSoundFile(); - - status_t InitCheck() const; - - status_t SetTo(const entry_ref *ref, uint32 open_mode); - - int32 FileFormat() const; - int32 SamplingRate() const; - int32 CountChannels() const; - int32 SampleSize() const; - int32 ByteOrder() const; - int32 SampleFormat() const; - int32 FrameSize() const; - off_t CountFrames() const; - - bool IsCompressed() const; - int32 CompressionType() const; - char *CompressionName() const; - - virtual int32 SetFileFormat(int32 format); - virtual int32 SetSamplingRate(int32 fps); - virtual int32 SetChannelCount(int32 spf); - virtual int32 SetSampleSize(int32 bps); - virtual int32 SetByteOrder(int32 bord); - virtual int32 SetSampleFormat(int32 fmt); - virtual int32 SetCompressionType(int32 type); - virtual char *SetCompressionName(char *name); - virtual bool SetIsCompressed(bool tf); - virtual off_t SetDataLocation(off_t offset); - virtual off_t SetFrameCount(off_t count); - - size_t ReadFrames(char *buf, size_t count); - size_t WriteFrames(char *buf, size_t count); - virtual off_t SeekToFrame(off_t n); - off_t FrameIndex() const; - off_t FramesRemaining() const; - - BFile *fSoundFile; - -private: - -virtual void _ReservedSoundFile1(); -virtual void _ReservedSoundFile2(); -virtual void _ReservedSoundFile3(); - - int32 fFileFormat; - int32 fSamplingRate; - int32 fChannelCount; - int32 fSampleSize; - int32 fByteOrder; - int32 fSampleFormat; - - off_t fByteOffset; /* offset to first sample */ - - off_t fFrameCount; - off_t fFrameIndex; - - bool fIsCompressed; - int32 fCompressionType; - char *fCompressionName; - status_t fCStatus; - void _init_raw_stats(); - status_t _ref_to_file(const entry_ref *ref); - uint32 _reserved[4]; -}; - - -#endif // #ifndef _SOUND_FILE_H +/****************************************************************************** + + File: SoundFile.h + + Description: Interface for a format-insensitive sound file object. + + Copyright 1995-97, Be Incorporated + +******************************************************************************/ + + +#ifndef _SOUND_FILE_H +#define _SOUND_FILE_H + +#include +#include +#include + +enum // sound_format +{ B_UNKNOWN_FILE, + B_AIFF_FILE, + B_WAVE_FILE, + B_UNIX_FILE }; + +class BSoundFile { + +public: + BSoundFile(); + BSoundFile(const entry_ref *ref, + uint32 open_mode); + virtual ~BSoundFile(); + + status_t InitCheck() const; + + status_t SetTo(const entry_ref *ref, uint32 open_mode); + + int32 FileFormat() const; + int32 SamplingRate() const; + int32 CountChannels() const; + int32 SampleSize() const; + int32 ByteOrder() const; + int32 SampleFormat() const; + int32 FrameSize() const; + off_t CountFrames() const; + + bool IsCompressed() const; + int32 CompressionType() const; + char *CompressionName() const; + + virtual int32 SetFileFormat(int32 format); + virtual int32 SetSamplingRate(int32 fps); + virtual int32 SetChannelCount(int32 spf); + virtual int32 SetSampleSize(int32 bps); + virtual int32 SetByteOrder(int32 bord); + virtual int32 SetSampleFormat(int32 fmt); + virtual int32 SetCompressionType(int32 type); + virtual char *SetCompressionName(char *name); + virtual bool SetIsCompressed(bool tf); + virtual off_t SetDataLocation(off_t offset); + virtual off_t SetFrameCount(off_t count); + + size_t ReadFrames(char *buf, size_t count); + size_t WriteFrames(char *buf, size_t count); + virtual off_t SeekToFrame(off_t n); + off_t FrameIndex() const; + off_t FramesRemaining() const; + + BFile *fSoundFile; + +private: + +virtual void _ReservedSoundFile1(); +virtual void _ReservedSoundFile2(); +virtual void _ReservedSoundFile3(); + + int32 fFileFormat; + int32 fSamplingRate; + int32 fChannelCount; + int32 fSampleSize; + int32 fByteOrder; + int32 fSampleFormat; + + off_t fByteOffset; /* offset to first sample */ + + off_t fFrameCount; + off_t fFrameIndex; + + bool fIsCompressed; + int32 fCompressionType; + char *fCompressionName; + status_t fCStatus; + void _init_raw_stats(); + status_t _ref_to_file(const entry_ref *ref); + uint32 _reserved[4]; +}; + + +#endif // #ifndef _SOUND_FILE_H diff --git a/src/kits/media/OldSubscriber.h b/src/kits/media/OldSubscriber.h index 4c8722e526..873dc0f76a 100644 --- a/src/kits/media/OldSubscriber.h +++ b/src/kits/media/OldSubscriber.h @@ -1,100 +1,100 @@ -/****************************************************************************** - - File: Subscriber.h - - Description: Support for communication with a buffer stream server - - Copyright 1995-97, Be Incorporated - -******************************************************************************/ - -#ifndef _SUBSCRIBER_H -#define _SUBSCRIBER_H - -#include -#include -#include - -/* ================ - declarations - ================ */ - -typedef bool (*enter_stream_hook)(void *userData, char *buffer, size_t count, - void *header); -typedef status_t (*exit_stream_hook)(void *userData, status_t error); - -/* ================ - Class definition for BSubscriber - ================ */ - -class BSubscriber -{ -public: - BSubscriber(const char *name = NULL); - virtual ~BSubscriber(); - -/* ================ - Gaining access to the Buffer Stream - ================ */ - - virtual status_t Subscribe(BAbstractBufferStream* stream); - virtual status_t Unsubscribe(); - - subscriber_id ID() const; - const char *Name() const; - - void SetTimeout(bigtime_t microseconds); - bigtime_t Timeout() const; - -/* ================ - Streaming functions. - ================ */ - - virtual status_t EnterStream(subscriber_id neighbor, - bool before, - void *userData, - enter_stream_hook entryFunction, - exit_stream_hook exitFunction, - bool background); - - virtual status_t ExitStream(bool synch=FALSE); - - bool IsInStream() const; - -/* ================ - Protected members (may be used by inherited classes) - ================ */ - -protected: - - static status_t _ProcessLoop(void *arg); - virtual status_t ProcessLoop(); - BAbstractBufferStream *Stream() const; - -/* ================ - Private members - ================ */ - -private: - -virtual void _ReservedSubscriber1(); -virtual void _ReservedSubscriber2(); -virtual void _ReservedSubscriber3(); - - char *fName; /* name given to constructor */ - subscriber_id fSubID; /* our subscriber_id */ - sem_id fSem; /* stream semaphore */ - BAbstractBufferStream *fStream; /* buffer stream */ - void *fUserData; /* arg to fStreamFn and fCompletionFn */ - enter_stream_hook fStreamFn; /* per-buffer user function */ - exit_stream_hook fCompletionFn; /* called after streaming stops */ - bool fCallStreamFn; /* true while we should call fStreamFn */ - bigtime_t fTimeout; /* time out while awaiting buffers */ - thread_id fBackThread; - sem_id fSynchLock; - - int32 fFileID; /* reserved for future use */ - uint32 _reserved[4]; -}; - -#endif // #ifdef _SUBSCRIBER_H +/****************************************************************************** + + File: Subscriber.h + + Description: Support for communication with a buffer stream server + + Copyright 1995-97, Be Incorporated + +******************************************************************************/ + +#ifndef _SUBSCRIBER_H +#define _SUBSCRIBER_H + +#include +#include +#include + +/* ================ + declarations + ================ */ + +typedef bool (*enter_stream_hook)(void *userData, char *buffer, size_t count, + void *header); +typedef status_t (*exit_stream_hook)(void *userData, status_t error); + +/* ================ + Class definition for BSubscriber + ================ */ + +class BSubscriber +{ +public: + BSubscriber(const char *name = NULL); + virtual ~BSubscriber(); + +/* ================ + Gaining access to the Buffer Stream + ================ */ + + virtual status_t Subscribe(BAbstractBufferStream* stream); + virtual status_t Unsubscribe(); + + subscriber_id ID() const; + const char *Name() const; + + void SetTimeout(bigtime_t microseconds); + bigtime_t Timeout() const; + +/* ================ + Streaming functions. + ================ */ + + virtual status_t EnterStream(subscriber_id neighbor, + bool before, + void *userData, + enter_stream_hook entryFunction, + exit_stream_hook exitFunction, + bool background); + + virtual status_t ExitStream(bool synch=FALSE); + + bool IsInStream() const; + +/* ================ + Protected members (may be used by inherited classes) + ================ */ + +protected: + + static status_t _ProcessLoop(void *arg); + virtual status_t ProcessLoop(); + BAbstractBufferStream *Stream() const; + +/* ================ + Private members + ================ */ + +private: + +virtual void _ReservedSubscriber1(); +virtual void _ReservedSubscriber2(); +virtual void _ReservedSubscriber3(); + + char *fName; /* name given to constructor */ + subscriber_id fSubID; /* our subscriber_id */ + sem_id fSem; /* stream semaphore */ + BAbstractBufferStream *fStream; /* buffer stream */ + void *fUserData; /* arg to fStreamFn and fCompletionFn */ + enter_stream_hook fStreamFn; /* per-buffer user function */ + exit_stream_hook fCompletionFn; /* called after streaming stops */ + bool fCallStreamFn; /* true while we should call fStreamFn */ + bigtime_t fTimeout; /* time out while awaiting buffers */ + thread_id fBackThread; + sem_id fSynchLock; + + int32 fFileID; /* reserved for future use */ + uint32 _reserved[4]; +}; + +#endif // #ifdef _SUBSCRIBER_H diff --git a/src/kits/network/dns/headers/hesiod.h b/src/kits/network/dns/headers/hesiod.h index 94918d360f..a47ef241d4 100644 --- a/src/kits/network/dns/headers/hesiod.h +++ b/src/kits/network/dns/headers/hesiod.h @@ -20,7 +20,7 @@ */ /* - * $Id$ + * $Id: hesiod.h 17965 2006-06-29 17:45:22Z axeld $ */ #ifndef _HESIOD_H_INCLUDED diff --git a/src/kits/network/dns/headers/irp.h b/src/kits/network/dns/headers/irp.h index ffed347f72..b6a5098c1e 100644 --- a/src/kits/network/dns/headers/irp.h +++ b/src/kits/network/dns/headers/irp.h @@ -16,7 +16,7 @@ */ /* - * $Id$ + * $Id: irp.h 15585 2005-12-19 13:26:54Z wkornew $ */ #ifndef _IRP_H_INCLUDED diff --git a/src/kits/network/dns/headers/isc/assertions.h b/src/kits/network/dns/headers/isc/assertions.h index 3066558d0e..6274a6780f 100644 --- a/src/kits/network/dns/headers/isc/assertions.h +++ b/src/kits/network/dns/headers/isc/assertions.h @@ -16,7 +16,7 @@ */ /* - * $Id$ + * $Id: assertions.h 15585 2005-12-19 13:26:54Z wkornew $ */ #ifndef ASSERTIONS_H diff --git a/src/kits/network/dns/headers/isc/ctl.h b/src/kits/network/dns/headers/isc/ctl.h index 4ee6b9a213..4fc98e0f6f 100644 --- a/src/kits/network/dns/headers/isc/ctl.h +++ b/src/kits/network/dns/headers/isc/ctl.h @@ -19,7 +19,7 @@ */ /* - * $Id$ + * $Id: ctl.h 15585 2005-12-19 13:26:54Z wkornew $ */ #include diff --git a/src/kits/network/dns/headers/isc/eventlib.h b/src/kits/network/dns/headers/isc/eventlib.h index ea1844ab2c..d08ecdc5fa 100644 --- a/src/kits/network/dns/headers/isc/eventlib.h +++ b/src/kits/network/dns/headers/isc/eventlib.h @@ -18,7 +18,7 @@ /* eventlib.h - exported interfaces for eventlib * vix 09sep95 [initial] * - * $Id$ + * $Id: eventlib.h 15585 2005-12-19 13:26:54Z wkornew $ */ #ifndef _EVENTLIB_H diff --git a/src/kits/network/dns/headers/isc/irpmarshall.h b/src/kits/network/dns/headers/isc/irpmarshall.h index 74f0a0a8a8..9174f178bb 100644 --- a/src/kits/network/dns/headers/isc/irpmarshall.h +++ b/src/kits/network/dns/headers/isc/irpmarshall.h @@ -16,7 +16,7 @@ */ /* - * $Id$ + * $Id: irpmarshall.h 15585 2005-12-19 13:26:54Z wkornew $ */ #ifndef _IRPMARSHALL_H_INCLUDED diff --git a/src/kits/network/dns/headers/isc/misc.h b/src/kits/network/dns/headers/isc/misc.h index f3b181890c..95f47fb494 100644 --- a/src/kits/network/dns/headers/isc/misc.h +++ b/src/kits/network/dns/headers/isc/misc.h @@ -16,7 +16,7 @@ */ /* - * $Id$ + * $Id: misc.h 15585 2005-12-19 13:26:54Z wkornew $ */ #ifndef _ISC_MISC_H diff --git a/src/kits/network/dns/headers/isc/tree.h b/src/kits/network/dns/headers/isc/tree.h index 9bdc7e037e..bffb8180f5 100644 --- a/src/kits/network/dns/headers/isc/tree.h +++ b/src/kits/network/dns/headers/isc/tree.h @@ -3,7 +3,7 @@ * vix 22jan93 [revisited; uses RCS, ANSI, POSIX; has bug fixes] * vix 27jun86 [broken out of tree.c] * - * $Id$ + * $Id: tree.h 14574 2005-10-29 16:27:43Z bonefish $ */ diff --git a/src/kits/network/dns/headers/res_update.h b/src/kits/network/dns/headers/res_update.h index beb6c63fb9..9b39beddb1 100644 --- a/src/kits/network/dns/headers/res_update.h +++ b/src/kits/network/dns/headers/res_update.h @@ -16,7 +16,7 @@ */ /* - * $Id$ + * $Id: res_update.h 15585 2005-12-19 13:26:54Z wkornew $ */ #ifndef __RES_UPDATE_H diff --git a/src/kits/network/dns/inet/inet_addr.c b/src/kits/network/dns/inet/inet_addr.c index 54fb8c4772..8aded26c75 100644 --- a/src/kits/network/dns/inet/inet_addr.c +++ b/src/kits/network/dns/inet/inet_addr.c @@ -70,7 +70,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93"; -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: inet_addr.c 24646 2008-03-29 12:41:04Z bonefish $"; #endif /* LIBC_SCCS and not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/inet/inet_cidr_ntop.c b/src/kits/network/dns/inet/inet_cidr_ntop.c index 63ae64df7c..636c4defc9 100644 --- a/src/kits/network/dns/inet/inet_cidr_ntop.c +++ b/src/kits/network/dns/inet/inet_cidr_ntop.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: inet_cidr_ntop.c 24646 2008-03-29 12:41:04Z bonefish $"; #endif #include "port_before.h" diff --git a/src/kits/network/dns/inet/inet_cidr_pton.c b/src/kits/network/dns/inet/inet_cidr_pton.c index 4fcd7219e3..2b7689287e 100644 --- a/src/kits/network/dns/inet/inet_cidr_pton.c +++ b/src/kits/network/dns/inet/inet_cidr_pton.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: inet_cidr_pton.c 24646 2008-03-29 12:41:04Z bonefish $"; #endif #include "port_before.h" diff --git a/src/kits/network/dns/inet/inet_data.c b/src/kits/network/dns/inet/inet_data.c index 5f3e3b588a..80819490bb 100644 --- a/src/kits/network/dns/inet/inet_data.c +++ b/src/kits/network/dns/inet/inet_data.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$Id$"; +static char rcsid[] = "$Id: inet_data.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/inet/inet_net_ntop.c b/src/kits/network/dns/inet/inet_net_ntop.c index 89d293c912..439b591d12 100644 --- a/src/kits/network/dns/inet/inet_net_ntop.c +++ b/src/kits/network/dns/inet/inet_net_ntop.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: inet_net_ntop.c 24646 2008-03-29 12:41:04Z bonefish $"; #endif #include "port_before.h" diff --git a/src/kits/network/dns/inet/inet_net_pton.c b/src/kits/network/dns/inet/inet_net_pton.c index 59fb1bdd3e..37afbcf096 100644 --- a/src/kits/network/dns/inet/inet_net_pton.c +++ b/src/kits/network/dns/inet/inet_net_pton.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: inet_net_pton.c 24646 2008-03-29 12:41:04Z bonefish $"; #endif #include "port_before.h" diff --git a/src/kits/network/dns/inet/inet_neta.c b/src/kits/network/dns/inet/inet_neta.c index 0feda2b884..458c88867b 100644 --- a/src/kits/network/dns/inet/inet_neta.c +++ b/src/kits/network/dns/inet/inet_neta.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: inet_neta.c 24646 2008-03-29 12:41:04Z bonefish $"; #endif #include "port_before.h" diff --git a/src/kits/network/dns/inet/inet_ntoa.c b/src/kits/network/dns/inet/inet_ntoa.c index a44b5a5d90..aa05b1404d 100644 --- a/src/kits/network/dns/inet/inet_ntoa.c +++ b/src/kits/network/dns/inet/inet_ntoa.c @@ -33,7 +33,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)inet_ntoa.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: inet_ntoa.c 18891 2006-09-19 16:17:02Z korli $"; #endif /* LIBC_SCCS and not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/inet/inet_ntop.c b/src/kits/network/dns/inet/inet_ntop.c index 48250dd1d5..00c3c8c7e4 100644 --- a/src/kits/network/dns/inet/inet_ntop.c +++ b/src/kits/network/dns/inet/inet_ntop.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: inet_ntop.c 24646 2008-03-29 12:41:04Z bonefish $"; #endif /* LIBC_SCCS and not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/inet/inet_pton.c b/src/kits/network/dns/inet/inet_pton.c index 938080ea53..8acd3480af 100644 --- a/src/kits/network/dns/inet/inet_pton.c +++ b/src/kits/network/dns/inet/inet_pton.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: inet_pton.c 24646 2008-03-29 12:41:04Z bonefish $"; #endif /* LIBC_SCCS and not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/inet/nsap_addr.c b/src/kits/network/dns/inet/nsap_addr.c index dc3df1ef47..c46771041d 100644 --- a/src/kits/network/dns/inet/nsap_addr.c +++ b/src/kits/network/dns/inet/nsap_addr.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: nsap_addr.c 24646 2008-03-29 12:41:04Z bonefish $"; #endif /* LIBC_SCCS and not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/irs/dns.c b/src/kits/network/dns/irs/dns.c index 0f94bd3965..9f1f1eb7d5 100644 --- a/src/kits/network/dns/irs/dns.c +++ b/src/kits/network/dns/irs/dns.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: dns.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* diff --git a/src/kits/network/dns/irs/dns_ho.c b/src/kits/network/dns/irs/dns_ho.c index de8ae80304..2d7fe0a5a3 100644 --- a/src/kits/network/dns/irs/dns_ho.c +++ b/src/kits/network/dns/irs/dns_ho.c @@ -52,7 +52,7 @@ /* BIND Id: gethnamaddr.c,v 8.15 1996/05/22 04:56:30 vixie Exp $ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: dns_ho.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ /* Imports. */ diff --git a/src/kits/network/dns/irs/dns_nw.c b/src/kits/network/dns/irs/dns_nw.c index e295948ea6..3d29063465 100644 --- a/src/kits/network/dns/irs/dns_nw.c +++ b/src/kits/network/dns/irs/dns_nw.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: dns_nw.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ /* Imports. */ diff --git a/src/kits/network/dns/irs/dns_p.h b/src/kits/network/dns/irs/dns_p.h index 46bde6a03c..bbcf25fed0 100644 --- a/src/kits/network/dns/irs/dns_p.h +++ b/src/kits/network/dns/irs/dns_p.h @@ -16,7 +16,7 @@ */ /* - * $Id$ + * $Id: dns_p.h 15570 2005-12-16 22:38:13Z wkornew $ */ #ifndef _DNS_P_H_INCLUDED diff --git a/src/kits/network/dns/irs/dns_pr.c b/src/kits/network/dns/irs/dns_pr.c index 95252b9a9c..bb6f7a822b 100644 --- a/src/kits/network/dns/irs/dns_pr.c +++ b/src/kits/network/dns/irs/dns_pr.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: dns_pr.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Imports */ diff --git a/src/kits/network/dns/irs/dns_sv.c b/src/kits/network/dns/irs/dns_sv.c index f7b1adfdba..2eac1f0e26 100644 --- a/src/kits/network/dns/irs/dns_sv.c +++ b/src/kits/network/dns/irs/dns_sv.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: dns_sv.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Imports */ diff --git a/src/kits/network/dns/irs/gen.c b/src/kits/network/dns/irs/gen.c index 7a60713199..ee3e741d6d 100644 --- a/src/kits/network/dns/irs/gen.c +++ b/src/kits/network/dns/irs/gen.c @@ -16,7 +16,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: gen.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* diff --git a/src/kits/network/dns/irs/gen_ho.c b/src/kits/network/dns/irs/gen_ho.c index e6d9013416..7627e0966e 100644 --- a/src/kits/network/dns/irs/gen_ho.c +++ b/src/kits/network/dns/irs/gen_ho.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: gen_ho.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ /* Imports */ diff --git a/src/kits/network/dns/irs/gen_ng.c b/src/kits/network/dns/irs/gen_ng.c index 1693f784aa..f4f9b763a4 100644 --- a/src/kits/network/dns/irs/gen_ng.c +++ b/src/kits/network/dns/irs/gen_ng.c @@ -16,7 +16,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: gen_ng.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Imports */ diff --git a/src/kits/network/dns/irs/gen_nw.c b/src/kits/network/dns/irs/gen_nw.c index b092fe043e..50caacea2c 100644 --- a/src/kits/network/dns/irs/gen_nw.c +++ b/src/kits/network/dns/irs/gen_nw.c @@ -16,7 +16,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: gen_nw.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Imports */ diff --git a/src/kits/network/dns/irs/gen_p.h b/src/kits/network/dns/irs/gen_p.h index 363c112e17..532fa28828 100644 --- a/src/kits/network/dns/irs/gen_p.h +++ b/src/kits/network/dns/irs/gen_p.h @@ -16,7 +16,7 @@ */ /* - * $Id$ + * $Id: gen_p.h 15570 2005-12-16 22:38:13Z wkornew $ */ /* Notes: diff --git a/src/kits/network/dns/irs/gen_pr.c b/src/kits/network/dns/irs/gen_pr.c index d3d4e5503c..715ed053ea 100644 --- a/src/kits/network/dns/irs/gen_pr.c +++ b/src/kits/network/dns/irs/gen_pr.c @@ -16,7 +16,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: gen_pr.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Imports */ diff --git a/src/kits/network/dns/irs/gen_sv.c b/src/kits/network/dns/irs/gen_sv.c index 3dc6ed8c10..e3d793b28b 100644 --- a/src/kits/network/dns/irs/gen_sv.c +++ b/src/kits/network/dns/irs/gen_sv.c @@ -16,7 +16,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: gen_sv.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Imports */ diff --git a/src/kits/network/dns/irs/gethostent.c b/src/kits/network/dns/irs/gethostent.c index 09c858cc93..41c43cdff2 100644 --- a/src/kits/network/dns/irs/gethostent.c +++ b/src/kits/network/dns/irs/gethostent.c @@ -16,7 +16,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: gethostent.c 18075 2006-07-08 14:40:33Z axeld $"; #endif /* Imports */ diff --git a/src/kits/network/dns/irs/gethostent_r.c b/src/kits/network/dns/irs/gethostent_r.c index 629bfd8f65..b865f2c51a 100644 --- a/src/kits/network/dns/irs/gethostent_r.c +++ b/src/kits/network/dns/irs/gethostent_r.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: gethostent_r.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/src/kits/network/dns/irs/getnetent.c b/src/kits/network/dns/irs/getnetent.c index 5778c37a66..90c2fa9339 100644 --- a/src/kits/network/dns/irs/getnetent.c +++ b/src/kits/network/dns/irs/getnetent.c @@ -16,7 +16,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: getnetent.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Imports */ diff --git a/src/kits/network/dns/irs/getnetent_r.c b/src/kits/network/dns/irs/getnetent_r.c index ecec422e67..f0e9256774 100644 --- a/src/kits/network/dns/irs/getnetent_r.c +++ b/src/kits/network/dns/irs/getnetent_r.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: getnetent_r.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/src/kits/network/dns/irs/getnetgrent.c b/src/kits/network/dns/irs/getnetgrent.c index c75fb4c61f..4eed5154c0 100644 --- a/src/kits/network/dns/irs/getnetgrent.c +++ b/src/kits/network/dns/irs/getnetgrent.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: getnetgrent.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ /* Imports */ diff --git a/src/kits/network/dns/irs/getnetgrent_r.c b/src/kits/network/dns/irs/getnetgrent_r.c index 668dabea65..c21803bdf4 100644 --- a/src/kits/network/dns/irs/getnetgrent_r.c +++ b/src/kits/network/dns/irs/getnetgrent_r.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: getnetgrent_r.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/src/kits/network/dns/irs/getprotoent.c b/src/kits/network/dns/irs/getprotoent.c index f28cb6e5b3..6929284585 100644 --- a/src/kits/network/dns/irs/getprotoent.c +++ b/src/kits/network/dns/irs/getprotoent.c @@ -16,7 +16,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: getprotoent.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Imports */ diff --git a/src/kits/network/dns/irs/getprotoent_r.c b/src/kits/network/dns/irs/getprotoent_r.c index 7042128fd9..2e4472d1d2 100644 --- a/src/kits/network/dns/irs/getprotoent_r.c +++ b/src/kits/network/dns/irs/getprotoent_r.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: getprotoent_r.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/src/kits/network/dns/irs/getservent.c b/src/kits/network/dns/irs/getservent.c index c3db84a1f3..30cd2c50c0 100644 --- a/src/kits/network/dns/irs/getservent.c +++ b/src/kits/network/dns/irs/getservent.c @@ -16,7 +16,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: getservent.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Imports */ diff --git a/src/kits/network/dns/irs/getservent_r.c b/src/kits/network/dns/irs/getservent_r.c index f1349b116a..536091b191 100644 --- a/src/kits/network/dns/irs/getservent_r.c +++ b/src/kits/network/dns/irs/getservent_r.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: getservent_r.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ #include diff --git a/src/kits/network/dns/irs/hesiod.c b/src/kits/network/dns/irs/hesiod.c index 5f1128c7ed..52cddfc838 100644 --- a/src/kits/network/dns/irs/hesiod.c +++ b/src/kits/network/dns/irs/hesiod.c @@ -1,5 +1,5 @@ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: hesiod.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* diff --git a/src/kits/network/dns/irs/hesiod_p.h b/src/kits/network/dns/irs/hesiod_p.h index 1e29f26192..44d71ffe15 100644 --- a/src/kits/network/dns/irs/hesiod_p.h +++ b/src/kits/network/dns/irs/hesiod_p.h @@ -20,7 +20,7 @@ */ /* - * $Id$ + * $Id: hesiod_p.h 15570 2005-12-16 22:38:13Z wkornew $ */ /* diff --git a/src/kits/network/dns/irs/irp.c b/src/kits/network/dns/irs/irp.c index ac76b60044..878de76a69 100644 --- a/src/kits/network/dns/irs/irp.c +++ b/src/kits/network/dns/irs/irp.c @@ -16,7 +16,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: irp.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Imports */ diff --git a/src/kits/network/dns/irs/irp_ho.c b/src/kits/network/dns/irs/irp_ho.c index 721cbcc87f..a69727f8b4 100644 --- a/src/kits/network/dns/irs/irp_ho.c +++ b/src/kits/network/dns/irs/irp_ho.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: irp_ho.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ /* Imports. */ diff --git a/src/kits/network/dns/irs/irp_ng.c b/src/kits/network/dns/irs/irp_ng.c index b0b9b83198..c80591c06c 100644 --- a/src/kits/network/dns/irs/irp_ng.c +++ b/src/kits/network/dns/irs/irp_ng.c @@ -16,7 +16,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: irp_ng.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Imports */ diff --git a/src/kits/network/dns/irs/irp_nw.c b/src/kits/network/dns/irs/irp_nw.c index d2f470441a..7de210bd71 100644 --- a/src/kits/network/dns/irs/irp_nw.c +++ b/src/kits/network/dns/irs/irp_nw.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: irp_nw.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ #if 0 diff --git a/src/kits/network/dns/irs/irp_p.h b/src/kits/network/dns/irs/irp_p.h index 9690959b27..9cddc7960f 100644 --- a/src/kits/network/dns/irs/irp_p.h +++ b/src/kits/network/dns/irs/irp_p.h @@ -16,7 +16,7 @@ */ /* - * $Id$ + * $Id: irp_p.h 15570 2005-12-16 22:38:13Z wkornew $ */ #ifndef _IRP_P_H_INCLUDED diff --git a/src/kits/network/dns/irs/irp_pr.c b/src/kits/network/dns/irs/irp_pr.c index 56c807cbda..a807caaac7 100644 --- a/src/kits/network/dns/irs/irp_pr.c +++ b/src/kits/network/dns/irs/irp_pr.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: irp_pr.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ /* extern */ diff --git a/src/kits/network/dns/irs/irp_sv.c b/src/kits/network/dns/irs/irp_sv.c index 7a07b61a25..b088e6102a 100644 --- a/src/kits/network/dns/irs/irp_sv.c +++ b/src/kits/network/dns/irs/irp_sv.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: irp_sv.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ /* extern */ diff --git a/src/kits/network/dns/irs/irpmarshall.c b/src/kits/network/dns/irs/irpmarshall.c index 5e38c10cee..440503cd76 100644 --- a/src/kits/network/dns/irs/irpmarshall.c +++ b/src/kits/network/dns/irs/irpmarshall.c @@ -49,7 +49,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: irpmarshall.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ #if 0 diff --git a/src/kits/network/dns/irs/irs_data.c b/src/kits/network/dns/irs/irs_data.c index e2d7a5b611..f72d955a3e 100644 --- a/src/kits/network/dns/irs/irs_data.c +++ b/src/kits/network/dns/irs/irs_data.c @@ -16,7 +16,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: irs_data.c 18118 2006-07-12 14:58:43Z axeld $"; #endif #include "port_before.h" diff --git a/src/kits/network/dns/irs/irs_data.h b/src/kits/network/dns/irs/irs_data.h index 976fe4e8d7..b29bfc3107 100644 --- a/src/kits/network/dns/irs/irs_data.h +++ b/src/kits/network/dns/irs/irs_data.h @@ -16,7 +16,7 @@ */ /* - * $Id$ + * $Id: irs_data.h 15570 2005-12-16 22:38:13Z wkornew $ */ #ifndef __BIND_NOSTATIC diff --git a/src/kits/network/dns/irs/lcl.c b/src/kits/network/dns/irs/lcl.c index efacacee6e..881ed3bae6 100644 --- a/src/kits/network/dns/irs/lcl.c +++ b/src/kits/network/dns/irs/lcl.c @@ -16,7 +16,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: lcl.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Imports */ diff --git a/src/kits/network/dns/irs/lcl_ho.c b/src/kits/network/dns/irs/lcl_ho.c index ec0c1c5b85..e713a02ca7 100644 --- a/src/kits/network/dns/irs/lcl_ho.c +++ b/src/kits/network/dns/irs/lcl_ho.c @@ -57,7 +57,7 @@ /* BIND Id: gethnamaddr.c,v 8.15 1996/05/22 04:56:30 vixie Exp $ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: lcl_ho.c 30964 2009-06-05 07:37:24Z axeld $"; #endif /* LIBC_SCCS and not lint */ /* Imports. */ diff --git a/src/kits/network/dns/irs/lcl_ng.c b/src/kits/network/dns/irs/lcl_ng.c index be9a13be7b..3882bc2404 100644 --- a/src/kits/network/dns/irs/lcl_ng.c +++ b/src/kits/network/dns/irs/lcl_ng.c @@ -16,7 +16,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: lcl_ng.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Imports */ diff --git a/src/kits/network/dns/irs/lcl_nw.c b/src/kits/network/dns/irs/lcl_nw.c index 0ab5c859f6..15b22e73c4 100644 --- a/src/kits/network/dns/irs/lcl_nw.c +++ b/src/kits/network/dns/irs/lcl_nw.c @@ -49,7 +49,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: lcl_nw.c 15570 2005-12-16 22:38:13Z wkornew $"; /* from getgrent.c 8.2 (Berkeley) 3/21/94"; */ /* from BSDI Id: getgrent.c,v 2.8 1996/05/28 18:15:14 bostic Exp $ */ #endif /* LIBC_SCCS and not lint */ diff --git a/src/kits/network/dns/irs/nis.c b/src/kits/network/dns/irs/nis.c index dddc6e6f66..795328b753 100644 --- a/src/kits/network/dns/irs/nis.c +++ b/src/kits/network/dns/irs/nis.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: nis.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Imports */ diff --git a/src/kits/network/dns/irs/nis_p.h b/src/kits/network/dns/irs/nis_p.h index 1e8e27ea0b..c3ce9e2678 100644 --- a/src/kits/network/dns/irs/nis_p.h +++ b/src/kits/network/dns/irs/nis_p.h @@ -16,7 +16,7 @@ */ /* - * $Id$ + * $Id: nis_p.h 15570 2005-12-16 22:38:13Z wkornew $ */ /* diff --git a/src/kits/network/dns/irs/nul_ng.c b/src/kits/network/dns/irs/nul_ng.c index 9dc9330bcf..a1f9e10463 100644 --- a/src/kits/network/dns/irs/nul_ng.c +++ b/src/kits/network/dns/irs/nul_ng.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: nul_ng.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* diff --git a/src/kits/network/dns/irs/pathnames.h b/src/kits/network/dns/irs/pathnames.h index e62dbca9b6..dfbf180b3a 100644 --- a/src/kits/network/dns/irs/pathnames.h +++ b/src/kits/network/dns/irs/pathnames.h @@ -16,7 +16,7 @@ */ /* - * $Id$ + * $Id: pathnames.h 15570 2005-12-16 22:38:13Z wkornew $ */ #ifndef _PATH_IRS_CONF diff --git a/src/kits/network/dns/irs/util.c b/src/kits/network/dns/irs/util.c index d3fcf66004..268bf49cc1 100644 --- a/src/kits/network/dns/irs/util.c +++ b/src/kits/network/dns/irs/util.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: util.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif #include "port_before.h" diff --git a/src/kits/network/dns/isc/assertions.c b/src/kits/network/dns/isc/assertions.c index cbe778f00b..17ddb167f7 100644 --- a/src/kits/network/dns/isc/assertions.c +++ b/src/kits/network/dns/isc/assertions.c @@ -16,7 +16,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: assertions.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif #include "port_before.h" diff --git a/src/kits/network/dns/isc/base64.c b/src/kits/network/dns/isc/base64.c index 1c5f6383ec..9ae01ef1c2 100644 --- a/src/kits/network/dns/isc/base64.c +++ b/src/kits/network/dns/isc/base64.c @@ -41,7 +41,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: base64.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/isc/bitncmp.c b/src/kits/network/dns/isc/bitncmp.c index a41a266001..2a543a516f 100644 --- a/src/kits/network/dns/isc/bitncmp.c +++ b/src/kits/network/dns/isc/bitncmp.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: bitncmp.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif #include "port_before.h" diff --git a/src/kits/network/dns/isc/ev_connects.c b/src/kits/network/dns/isc/ev_connects.c index 69e25e4b25..ffff4ad1b3 100644 --- a/src/kits/network/dns/isc/ev_connects.c +++ b/src/kits/network/dns/isc/ev_connects.c @@ -20,7 +20,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: ev_connects.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Import. */ diff --git a/src/kits/network/dns/isc/ev_files.c b/src/kits/network/dns/isc/ev_files.c index f2fc70334f..b1b3b5b651 100644 --- a/src/kits/network/dns/isc/ev_files.c +++ b/src/kits/network/dns/isc/ev_files.c @@ -20,7 +20,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: ev_files.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif #include "port_before.h" diff --git a/src/kits/network/dns/isc/ev_streams.c b/src/kits/network/dns/isc/ev_streams.c index 7aa60ba847..a4c6c4b847 100644 --- a/src/kits/network/dns/isc/ev_streams.c +++ b/src/kits/network/dns/isc/ev_streams.c @@ -20,7 +20,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: ev_streams.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif #include "port_before.h" diff --git a/src/kits/network/dns/isc/ev_timers.c b/src/kits/network/dns/isc/ev_timers.c index 4d3534e9bd..1887a3b474 100644 --- a/src/kits/network/dns/isc/ev_timers.c +++ b/src/kits/network/dns/isc/ev_timers.c @@ -20,7 +20,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: ev_timers.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Import. */ diff --git a/src/kits/network/dns/isc/ev_waits.c b/src/kits/network/dns/isc/ev_waits.c index aecf27ad0a..d3026f5ddb 100644 --- a/src/kits/network/dns/isc/ev_waits.c +++ b/src/kits/network/dns/isc/ev_waits.c @@ -20,7 +20,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: ev_waits.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif #include "port_before.h" diff --git a/src/kits/network/dns/isc/eventlib.c b/src/kits/network/dns/isc/eventlib.c index e3472ef627..f09e8d0405 100644 --- a/src/kits/network/dns/isc/eventlib.c +++ b/src/kits/network/dns/isc/eventlib.c @@ -20,7 +20,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: eventlib.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif #include "port_before.h" diff --git a/src/kits/network/dns/isc/eventlib_p.h b/src/kits/network/dns/isc/eventlib_p.h index d1b23c1534..8d5f31c060 100644 --- a/src/kits/network/dns/isc/eventlib_p.h +++ b/src/kits/network/dns/isc/eventlib_p.h @@ -18,7 +18,7 @@ /* eventlib_p.h - private interfaces for eventlib * vix 09sep95 [initial] * - * $Id$ + * $Id: eventlib_p.h 15570 2005-12-16 22:38:13Z wkornew $ */ #ifndef _EVENTLIB_P_H diff --git a/src/kits/network/dns/isc/heap.c b/src/kits/network/dns/isc/heap.c index 8286831867..baa20a252e 100644 --- a/src/kits/network/dns/isc/heap.c +++ b/src/kits/network/dns/isc/heap.c @@ -26,7 +26,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: heap.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/isc/logging.c b/src/kits/network/dns/isc/logging.c index 667033e34b..bd785ee5db 100644 --- a/src/kits/network/dns/isc/logging.c +++ b/src/kits/network/dns/isc/logging.c @@ -16,7 +16,7 @@ */ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: logging.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/isc/memcluster.c b/src/kits/network/dns/isc/memcluster.c index a2a91db1df..2558970488 100644 --- a/src/kits/network/dns/isc/memcluster.c +++ b/src/kits/network/dns/isc/memcluster.c @@ -24,7 +24,7 @@ #if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: memcluster.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/isc/tree.c b/src/kits/network/dns/isc/tree.c index 76c7517915..1aba0a50fa 100644 --- a/src/kits/network/dns/isc/tree.c +++ b/src/kits/network/dns/isc/tree.c @@ -1,5 +1,5 @@ #ifndef LINT -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: tree.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* diff --git a/src/kits/network/dns/nameser/ns_date.c b/src/kits/network/dns/nameser/ns_date.c index 41f355eea9..fa5ed54705 100644 --- a/src/kits/network/dns/nameser/ns_date.c +++ b/src/kits/network/dns/nameser/ns_date.c @@ -16,7 +16,7 @@ */ #ifndef lint -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: ns_date.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Import. */ diff --git a/src/kits/network/dns/nameser/ns_name.c b/src/kits/network/dns/nameser/ns_name.c index 013da8bff2..a911610c82 100644 --- a/src/kits/network/dns/nameser/ns_name.c +++ b/src/kits/network/dns/nameser/ns_name.c @@ -16,7 +16,7 @@ */ #ifndef lint -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: ns_name.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif #include "port_before.h" diff --git a/src/kits/network/dns/nameser/ns_netint.c b/src/kits/network/dns/nameser/ns_netint.c index 1874eb3bea..93f3e45d2e 100644 --- a/src/kits/network/dns/nameser/ns_netint.c +++ b/src/kits/network/dns/nameser/ns_netint.c @@ -16,7 +16,7 @@ */ #ifndef lint -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: ns_netint.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Import. */ diff --git a/src/kits/network/dns/nameser/ns_parse.c b/src/kits/network/dns/nameser/ns_parse.c index 7b2fb4442c..ef672ad48a 100644 --- a/src/kits/network/dns/nameser/ns_parse.c +++ b/src/kits/network/dns/nameser/ns_parse.c @@ -16,7 +16,7 @@ */ #ifndef lint -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: ns_parse.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Import. */ diff --git a/src/kits/network/dns/nameser/ns_print.c b/src/kits/network/dns/nameser/ns_print.c index 7dcbb703f5..31418e6db5 100644 --- a/src/kits/network/dns/nameser/ns_print.c +++ b/src/kits/network/dns/nameser/ns_print.c @@ -16,7 +16,7 @@ */ #ifndef lint -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: ns_print.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Import. */ diff --git a/src/kits/network/dns/nameser/ns_samedomain.c b/src/kits/network/dns/nameser/ns_samedomain.c index b579f35824..b6adf03eb4 100644 --- a/src/kits/network/dns/nameser/ns_samedomain.c +++ b/src/kits/network/dns/nameser/ns_samedomain.c @@ -16,7 +16,7 @@ */ #ifndef lint -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: ns_samedomain.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif #include "port_before.h" diff --git a/src/kits/network/dns/nameser/ns_sign.c b/src/kits/network/dns/nameser/ns_sign.c index a8e165340e..d9f5a523f7 100644 --- a/src/kits/network/dns/nameser/ns_sign.c +++ b/src/kits/network/dns/nameser/ns_sign.c @@ -16,7 +16,7 @@ */ #ifndef lint -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: ns_sign.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Import. */ diff --git a/src/kits/network/dns/nameser/ns_ttl.c b/src/kits/network/dns/nameser/ns_ttl.c index b653bcfdaf..a5c1de31bf 100644 --- a/src/kits/network/dns/nameser/ns_ttl.c +++ b/src/kits/network/dns/nameser/ns_ttl.c @@ -16,7 +16,7 @@ */ #ifndef lint -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: ns_ttl.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Import. */ diff --git a/src/kits/network/dns/nameser/ns_verify.c b/src/kits/network/dns/nameser/ns_verify.c index aab198d10c..f8742b1cb8 100644 --- a/src/kits/network/dns/nameser/ns_verify.c +++ b/src/kits/network/dns/nameser/ns_verify.c @@ -16,7 +16,7 @@ */ #ifndef lint -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: ns_verify.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* Import. */ diff --git a/src/kits/network/dns/resolv/herror.c b/src/kits/network/dns/resolv/herror.c index d678f7991d..b89f9b107c 100644 --- a/src/kits/network/dns/resolv/herror.c +++ b/src/kits/network/dns/resolv/herror.c @@ -50,7 +50,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)herror.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: herror.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/resolv/res_comp.c b/src/kits/network/dns/resolv/res_comp.c index 74ff84906c..3674e246bf 100644 --- a/src/kits/network/dns/resolv/res_comp.c +++ b/src/kits/network/dns/resolv/res_comp.c @@ -70,7 +70,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: res_comp.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/resolv/res_data.c b/src/kits/network/dns/resolv/res_data.c index a9bc98f93b..9bb825eaac 100644 --- a/src/kits/network/dns/resolv/res_data.c +++ b/src/kits/network/dns/resolv/res_data.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: res_data.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/resolv/res_debug.c b/src/kits/network/dns/resolv/res_debug.c index 571df76a2f..1987ebe20e 100644 --- a/src/kits/network/dns/resolv/res_debug.c +++ b/src/kits/network/dns/resolv/res_debug.c @@ -95,7 +95,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: res_debug.c 22643 2007-10-21 20:10:43Z axeld $"; #endif /* LIBC_SCCS and not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/resolv/res_findzonecut.c b/src/kits/network/dns/resolv/res_findzonecut.c index b8bd231d7d..78983d4be1 100644 --- a/src/kits/network/dns/resolv/res_findzonecut.c +++ b/src/kits/network/dns/resolv/res_findzonecut.c @@ -1,5 +1,5 @@ #if !defined(lint) && !defined(SABER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: res_findzonecut.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* not lint */ /* diff --git a/src/kits/network/dns/resolv/res_init.c b/src/kits/network/dns/resolv/res_init.c index 2d82c5424c..b616d033cb 100644 --- a/src/kits/network/dns/resolv/res_init.c +++ b/src/kits/network/dns/resolv/res_init.c @@ -70,7 +70,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: res_init.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/resolv/res_mkquery.c b/src/kits/network/dns/resolv/res_mkquery.c index 44d1593caf..1f2da65075 100644 --- a/src/kits/network/dns/resolv/res_mkquery.c +++ b/src/kits/network/dns/resolv/res_mkquery.c @@ -70,7 +70,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_mkquery.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: res_mkquery.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/resolv/res_mkupdate.c b/src/kits/network/dns/resolv/res_mkupdate.c index 6515d19ffc..fc1cf370b2 100644 --- a/src/kits/network/dns/resolv/res_mkupdate.c +++ b/src/kits/network/dns/resolv/res_mkupdate.c @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(SABER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: res_mkupdate.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/resolv/res_query.c b/src/kits/network/dns/resolv/res_query.c index 7572b78b10..e2bf8205d6 100644 --- a/src/kits/network/dns/resolv/res_query.c +++ b/src/kits/network/dns/resolv/res_query.c @@ -70,7 +70,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_query.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: res_query.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ #include "port_before.h" diff --git a/src/kits/network/dns/resolv/res_send.c b/src/kits/network/dns/resolv/res_send.c index 4bc54198f7..8daee06554 100644 --- a/src/kits/network/dns/resolv/res_send.c +++ b/src/kits/network/dns/resolv/res_send.c @@ -70,7 +70,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: res_send.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ /* diff --git a/src/kits/network/dns/resolv/res_update.c b/src/kits/network/dns/resolv/res_update.c index 697ff1ecd1..63a577c443 100644 --- a/src/kits/network/dns/resolv/res_update.c +++ b/src/kits/network/dns/resolv/res_update.c @@ -1,5 +1,5 @@ #if !defined(lint) && !defined(SABER) -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: res_update.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* not lint */ /* diff --git a/src/kits/network/dns/src/strsep.c b/src/kits/network/dns/src/strsep.c index 9b390af5d5..c8bfbe6f61 100644 --- a/src/kits/network/dns/src/strsep.c +++ b/src/kits/network/dns/src/strsep.c @@ -1,6 +1,6 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "strsep.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id$"; +static const char rcsid[] = "$Id: strsep.c 15570 2005-12-16 22:38:13Z wkornew $"; #endif /* LIBC_SCCS and not lint */ /* diff --git a/src/kits/textencoding/character-sets b/src/kits/textencoding/character-sets index 416dedb793..e9e9a6f40d 100644 --- a/src/kits/textencoding/character-sets +++ b/src/kits/textencoding/character-sets @@ -1,1864 +1,1864 @@ - -=================================================================== -CHARACTER SETS - -(last updated 2004-02-06) - -These are the official names for character sets that may be used in -the Internet and may be referred to in Internet documentation. These -names are expressed in ANSI_X3.4-1968 which is commonly called -US-ASCII or simply ASCII. The character set most commonly use in the -Internet and used especially in protocol standards is US-ASCII, this -is strongly encouraged. The use of the name US-ASCII is also -encouraged. - -The character set names may be up to 40 characters taken from the -printable characters of US-ASCII. However, no distinction is made -between use of upper and lower case letters. - -The MIBenum value is a unique value for use in MIBs to identify coded -character sets. - -The value space for MIBenum values has been divided into three -regions. The first region (3-999) consists of coded character sets -that have been standardized by some standard setting organization. -This region is intended for standards that do not have subset -implementations. The second region (1000-1999) is for the Unicode and -ISO/IEC 10646 coded character sets together with a specification of a -(set of) sub-repertoires that may occur. The third region (>1999) is -intended for vendor specific coded character sets. - - Assigned MIB enum Numbers - ------------------------- - 0-2 Reserved - 3-999 Set By Standards Organizations - 1000-1999 Unicode / 10646 - 2000-2999 Vendor - -The aliases that start with "cs" have been added for use with the -Printer MIB (see RFC 1759) and contain the standard numbers along with -suggestive names in order to facilitate applications that want to -display the names in user interfaces. The "cs" stands for character -set and is provided for applications that need a lower case first -letter but want to use mixed case thereafter that cannot contain any -special characters, such as underbar ("_") and dash ("-"). If the -character set is from an ISO standard, its cs alias is the ISO -standard number or name. If the character set is not from an ISO -standard, but is registered with ISO (IPSJ/ITSCJ is the current ISO -Registration Authority), the ISO Registry number is specified as -ISOnnn followed by letters suggestive of the name or standards number -of the code set. When a national or international standard is -revised, the year of revision is added to the cs alias of the new -character set entry in the IANA Registry in order to distinguish the -revised character set from the original character set. - - -Character Set Reference -------------- --------- - -Name: ANSI_X3.4-1968 [RFC1345,KXS2] -MIBenum: 3 -Source: ECMA registry -Alias: iso-ir-6 -Alias: ANSI_X3.4-1986 -Alias: ISO_646.irv:1991 -Alias: ASCII -Alias: ISO646-US -Alias: US-ASCII (preferred MIME name) -Alias: us -Alias: IBM367 -Alias: cp367 -Alias: csASCII - -Name: ISO-10646-UTF-1 -MIBenum: 27 -Source: Universal Transfer Format (1), this is the multibyte - encoding, that subsets ASCII-7. It does not have byte - ordering issues. -Alias: csISO10646UTF1 - -Name: ISO_646.basic:1983 [RFC1345,KXS2] -MIBenum: 28 -Source: ECMA registry -Alias: ref -Alias: csISO646basic1983 - -Name: INVARIANT [RFC1345,KXS2] -MIBenum: 29 -Alias: csINVARIANT - -Name: ISO_646.irv:1983 [RFC1345,KXS2] -MIBenum: 30 -Source: ECMA registry -Alias: iso-ir-2 -Alias: irv -Alias: csISO2IntlRefVersion - -Name: BS_4730 [RFC1345,KXS2] -MIBenum: 20 -Source: ECMA registry -Alias: iso-ir-4 -Alias: ISO646-GB -Alias: gb -Alias: uk -Alias: csISO4UnitedKingdom - -Name: NATS-SEFI [RFC1345,KXS2] -MIBenum: 31 -Source: ECMA registry -Alias: iso-ir-8-1 -Alias: csNATSSEFI - -Name: NATS-SEFI-ADD [RFC1345,KXS2] -MIBenum: 32 -Source: ECMA registry -Alias: iso-ir-8-2 -Alias: csNATSSEFIADD - -Name: NATS-DANO [RFC1345,KXS2] -MIBenum: 33 -Source: ECMA registry -Alias: iso-ir-9-1 -Alias: csNATSDANO - -Name: NATS-DANO-ADD [RFC1345,KXS2] -MIBenum: 34 -Source: ECMA registry -Alias: iso-ir-9-2 -Alias: csNATSDANOADD - -Name: SEN_850200_B [RFC1345,KXS2] -MIBenum: 35 -Source: ECMA registry -Alias: iso-ir-10 -Alias: FI -Alias: ISO646-FI -Alias: ISO646-SE -Alias: se -Alias: csISO10Swedish - -Name: SEN_850200_C [RFC1345,KXS2] -MIBenum: 21 -Source: ECMA registry -Alias: iso-ir-11 -Alias: ISO646-SE2 -Alias: se2 -Alias: csISO11SwedishForNames - -Name: KS_C_5601-1987 [RFC1345,KXS2] -MIBenum: 36 -Source: ECMA registry -Alias: iso-ir-149 -Alias: KS_C_5601-1989 -Alias: KSC_5601 -Alias: korean -Alias: csKSC56011987 - -Name: ISO-2022-KR (preferred MIME name) [RFC1557,Choi] -MIBenum: 37 -Source: RFC-1557 (see also KS_C_5601-1987) -Alias: csISO2022KR - -Name: EUC-KR (preferred MIME name) [RFC1557,Choi] -MIBenum: 38 -Source: RFC-1557 (see also KS_C_5861-1992) -Alias: csEUCKR - -Name: ISO-2022-JP (preferred MIME name) [RFC1468,Murai] -MIBenum: 39 -Source: RFC-1468 (see also RFC-2237) -Alias: csISO2022JP - -Name: ISO-2022-JP-2 (preferred MIME name) [RFC1554,Ohta] -MIBenum: 40 -Source: RFC-1554 -Alias: csISO2022JP2 - -Name: ISO-2022-CN [RFC1922] -MIBenum: 104 -Source: RFC-1922 - -Name: ISO-2022-CN-EXT [RFC1922] -MIBenum: 105 -Source: RFC-1922 - -Name: JIS_C6220-1969-jp [RFC1345,KXS2] -MIBenum: 41 -Source: ECMA registry -Alias: JIS_C6220-1969 -Alias: iso-ir-13 -Alias: katakana -Alias: x0201-7 -Alias: csISO13JISC6220jp - -Name: JIS_C6220-1969-ro [RFC1345,KXS2] -MIBenum: 42 -Source: ECMA registry -Alias: iso-ir-14 -Alias: jp -Alias: ISO646-JP -Alias: csISO14JISC6220ro - -Name: IT [RFC1345,KXS2] -MIBenum: 22 -Source: ECMA registry -Alias: iso-ir-15 -Alias: ISO646-IT -Alias: csISO15Italian - -Name: PT [RFC1345,KXS2] -MIBenum: 43 -Source: ECMA registry -Alias: iso-ir-16 -Alias: ISO646-PT -Alias: csISO16Portuguese - -Name: ES [RFC1345,KXS2] -MIBenum: 23 -Source: ECMA registry -Alias: iso-ir-17 -Alias: ISO646-ES -Alias: csISO17Spanish - -Name: greek7-old [RFC1345,KXS2] -MIBenum: 44 -Source: ECMA registry -Alias: iso-ir-18 -Alias: csISO18Greek7Old - -Name: latin-greek [RFC1345,KXS2] -MIBenum: 45 -Source: ECMA registry -Alias: iso-ir-19 -Alias: csISO19LatinGreek - -Name: DIN_66003 [RFC1345,KXS2] -MIBenum: 24 -Source: ECMA registry -Alias: iso-ir-21 -Alias: de -Alias: ISO646-DE -Alias: csISO21German - -Name: NF_Z_62-010_(1973) [RFC1345,KXS2] -MIBenum: 46 -Source: ECMA registry -Alias: iso-ir-25 -Alias: ISO646-FR1 -Alias: csISO25French - -Name: Latin-greek-1 [RFC1345,KXS2] -MIBenum: 47 -Source: ECMA registry -Alias: iso-ir-27 -Alias: csISO27LatinGreek1 - -Name: ISO_5427 [RFC1345,KXS2] -MIBenum: 48 -Source: ECMA registry -Alias: iso-ir-37 -Alias: csISO5427Cyrillic - -Name: JIS_C6226-1978 [RFC1345,KXS2] -MIBenum: 49 -Source: ECMA registry -Alias: iso-ir-42 -Alias: csISO42JISC62261978 - -Name: BS_viewdata [RFC1345,KXS2] -MIBenum: 50 -Source: ECMA registry -Alias: iso-ir-47 -Alias: csISO47BSViewdata - -Name: INIS [RFC1345,KXS2] -MIBenum: 51 -Source: ECMA registry -Alias: iso-ir-49 -Alias: csISO49INIS - -Name: INIS-8 [RFC1345,KXS2] -MIBenum: 52 -Source: ECMA registry -Alias: iso-ir-50 -Alias: csISO50INIS8 - -Name: INIS-cyrillic [RFC1345,KXS2] -MIBenum: 53 -Source: ECMA registry -Alias: iso-ir-51 -Alias: csISO51INISCyrillic - -Name: ISO_5427:1981 [RFC1345,KXS2] -MIBenum: 54 -Source: ECMA registry -Alias: iso-ir-54 -Alias: ISO5427Cyrillic1981 - -Name: ISO_5428:1980 [RFC1345,KXS2] -MIBenum: 55 -Source: ECMA registry -Alias: iso-ir-55 -Alias: csISO5428Greek - -Name: GB_1988-80 [RFC1345,KXS2] -MIBenum: 56 -Source: ECMA registry -Alias: iso-ir-57 -Alias: cn -Alias: ISO646-CN -Alias: csISO57GB1988 - -Name: GB_2312-80 [RFC1345,KXS2] -MIBenum: 57 -Source: ECMA registry -Alias: iso-ir-58 -Alias: chinese -Alias: csISO58GB231280 - -Name: NS_4551-1 [RFC1345,KXS2] -MIBenum: 25 -Source: ECMA registry -Alias: iso-ir-60 -Alias: ISO646-NO -Alias: no -Alias: csISO60DanishNorwegian -Alias: csISO60Norwegian1 - -Name: NS_4551-2 [RFC1345,KXS2] -MIBenum: 58 -Source: ECMA registry -Alias: ISO646-NO2 -Alias: iso-ir-61 -Alias: no2 -Alias: csISO61Norwegian2 - -Name: NF_Z_62-010 [RFC1345,KXS2] -MIBenum: 26 -Source: ECMA registry -Alias: iso-ir-69 -Alias: ISO646-FR -Alias: fr -Alias: csISO69French - -Name: videotex-suppl [RFC1345,KXS2] -MIBenum: 59 -Source: ECMA registry -Alias: iso-ir-70 -Alias: csISO70VideotexSupp1 - -Name: PT2 [RFC1345,KXS2] -MIBenum: 60 -Source: ECMA registry -Alias: iso-ir-84 -Alias: ISO646-PT2 -Alias: csISO84Portuguese2 - -Name: ES2 [RFC1345,KXS2] -MIBenum: 61 -Source: ECMA registry -Alias: iso-ir-85 -Alias: ISO646-ES2 -Alias: csISO85Spanish2 - -Name: MSZ_7795.3 [RFC1345,KXS2] -MIBenum: 62 -Source: ECMA registry -Alias: iso-ir-86 -Alias: ISO646-HU -Alias: hu -Alias: csISO86Hungarian - -Name: JIS_C6226-1983 [RFC1345,KXS2] -MIBenum: 63 -Source: ECMA registry -Alias: iso-ir-87 -Alias: x0208 -Alias: JIS_X0208-1983 -Alias: csISO87JISX0208 - -Name: greek7 [RFC1345,KXS2] -MIBenum: 64 -Source: ECMA registry -Alias: iso-ir-88 -Alias: csISO88Greek7 - -Name: ASMO_449 [RFC1345,KXS2] -MIBenum: 65 -Source: ECMA registry -Alias: ISO_9036 -Alias: arabic7 -Alias: iso-ir-89 -Alias: csISO89ASMO449 - -Name: iso-ir-90 [RFC1345,KXS2] -MIBenum: 66 -Source: ECMA registry -Alias: csISO90 - -Name: JIS_C6229-1984-a [RFC1345,KXS2] -MIBenum: 67 -Source: ECMA registry -Alias: iso-ir-91 -Alias: jp-ocr-a -Alias: csISO91JISC62291984a - -Name: JIS_C6229-1984-b [RFC1345,KXS2] -MIBenum: 68 -Source: ECMA registry -Alias: iso-ir-92 -Alias: ISO646-JP-OCR-B -Alias: jp-ocr-b -Alias: csISO92JISC62991984b - -Name: JIS_C6229-1984-b-add [RFC1345,KXS2] -MIBenum: 69 -Source: ECMA registry -Alias: iso-ir-93 -Alias: jp-ocr-b-add -Alias: csISO93JIS62291984badd - -Name: JIS_C6229-1984-hand [RFC1345,KXS2] -MIBenum: 70 -Source: ECMA registry -Alias: iso-ir-94 -Alias: jp-ocr-hand -Alias: csISO94JIS62291984hand - -Name: JIS_C6229-1984-hand-add [RFC1345,KXS2] -MIBenum: 71 -Source: ECMA registry -Alias: iso-ir-95 -Alias: jp-ocr-hand-add -Alias: csISO95JIS62291984handadd - -Name: JIS_C6229-1984-kana [RFC1345,KXS2] -MIBenum: 72 -Source: ECMA registry -Alias: iso-ir-96 -Alias: csISO96JISC62291984kana - -Name: ISO_2033-1983 [RFC1345,KXS2] -MIBenum: 73 -Source: ECMA registry -Alias: iso-ir-98 -Alias: e13b -Alias: csISO2033 - -Name: ANSI_X3.110-1983 [RFC1345,KXS2] -MIBenum: 74 -Source: ECMA registry -Alias: iso-ir-99 -Alias: CSA_T500-1983 -Alias: NAPLPS -Alias: csISO99NAPLPS - -Name: ISO_8859-1:1987 [RFC1345,KXS2] -MIBenum: 4 -Source: ECMA registry -Alias: iso-ir-100 -Alias: ISO_8859-1 -Alias: ISO-8859-1 (preferred MIME name) -Alias: latin1 -Alias: l1 -Alias: IBM819 -Alias: CP819 -Alias: csISOLatin1 - -Name: ISO_8859-2:1987 [RFC1345,KXS2] -MIBenum: 5 -Source: ECMA registry -Alias: iso-ir-101 -Alias: ISO_8859-2 -Alias: ISO-8859-2 (preferred MIME name) -Alias: latin2 -Alias: l2 -Alias: csISOLatin2 - -Name: T.61-7bit [RFC1345,KXS2] -MIBenum: 75 -Source: ECMA registry -Alias: iso-ir-102 -Alias: csISO102T617bit - -Name: T.61-8bit [RFC1345,KXS2] -MIBenum: 76 -Alias: T.61 -Source: ECMA registry -Alias: iso-ir-103 -Alias: csISO103T618bit - -Name: ISO_8859-3:1988 [RFC1345,KXS2] -MIBenum: 6 -Source: ECMA registry -Alias: iso-ir-109 -Alias: ISO_8859-3 -Alias: ISO-8859-3 (preferred MIME name) -Alias: latin3 -Alias: l3 -Alias: csISOLatin3 - -Name: ISO_8859-4:1988 [RFC1345,KXS2] -MIBenum: 7 -Source: ECMA registry -Alias: iso-ir-110 -Alias: ISO_8859-4 -Alias: ISO-8859-4 (preferred MIME name) -Alias: latin4 -Alias: l4 -Alias: csISOLatin4 - -Name: ECMA-cyrillic -MIBenum: 77 -Source: ISO registry (formerly ECMA registry) - http://www.itscj.ipsj.jp/ISO-IR/111.pdf -Alias: iso-ir-111 -Alias: KOI8-E -Alias: csISO111ECMACyrillic - -Name: CSA_Z243.4-1985-1 [RFC1345,KXS2] -MIBenum: 78 -Source: ECMA registry -Alias: iso-ir-121 -Alias: ISO646-CA -Alias: csa7-1 -Alias: ca -Alias: csISO121Canadian1 - -Name: CSA_Z243.4-1985-2 [RFC1345,KXS2] -MIBenum: 79 -Source: ECMA registry -Alias: iso-ir-122 -Alias: ISO646-CA2 -Alias: csa7-2 -Alias: csISO122Canadian2 - -Name: CSA_Z243.4-1985-gr [RFC1345,KXS2] -MIBenum: 80 -Source: ECMA registry -Alias: iso-ir-123 -Alias: csISO123CSAZ24341985gr - -Name: ISO_8859-6:1987 [RFC1345,KXS2] -MIBenum: 9 -Source: ECMA registry -Alias: iso-ir-127 -Alias: ISO_8859-6 -Alias: ISO-8859-6 (preferred MIME name) -Alias: ECMA-114 -Alias: ASMO-708 -Alias: arabic -Alias: csISOLatinArabic - -Name: ISO_8859-6-E [RFC1556,IANA] -MIBenum: 81 -Source: RFC1556 -Alias: csISO88596E -Alias: ISO-8859-6-E (preferred MIME name) - -Name: ISO_8859-6-I [RFC1556,IANA] -MIBenum: 82 -Source: RFC1556 -Alias: csISO88596I -Alias: ISO-8859-6-I (preferred MIME name) - -Name: ISO_8859-7:1987 [RFC1947,RFC1345,KXS2] -MIBenum: 10 -Source: ECMA registry -Alias: iso-ir-126 -Alias: ISO_8859-7 -Alias: ISO-8859-7 (preferred MIME name) -Alias: ELOT_928 -Alias: ECMA-118 -Alias: greek -Alias: greek8 -Alias: csISOLatinGreek - -Name: T.101-G2 [RFC1345,KXS2] -MIBenum: 83 -Source: ECMA registry -Alias: iso-ir-128 -Alias: csISO128T101G2 - -Name: ISO_8859-8:1988 [RFC1345,KXS2] -MIBenum: 11 -Source: ECMA registry -Alias: iso-ir-138 -Alias: ISO_8859-8 -Alias: ISO-8859-8 (preferred MIME name) -Alias: hebrew -Alias: csISOLatinHebrew - -Name: ISO_8859-8-E [RFC1556,Nussbacher] -MIBenum: 84 -Source: RFC1556 -Alias: csISO88598E -Alias: ISO-8859-8-E (preferred MIME name) - -Name: ISO_8859-8-I [RFC1556,Nussbacher] -MIBenum: 85 -Source: RFC1556 -Alias: csISO88598I -Alias: ISO-8859-8-I (preferred MIME name) - -Name: CSN_369103 [RFC1345,KXS2] -MIBenum: 86 -Source: ECMA registry -Alias: iso-ir-139 -Alias: csISO139CSN369103 - -Name: JUS_I.B1.002 [RFC1345,KXS2] -MIBenum: 87 -Source: ECMA registry -Alias: iso-ir-141 -Alias: ISO646-YU -Alias: js -Alias: yu -Alias: csISO141JUSIB1002 - -Name: ISO_6937-2-add [RFC1345,KXS2] -MIBenum: 14 -Source: ECMA registry and ISO 6937-2:1983 -Alias: iso-ir-142 -Alias: csISOTextComm - -Name: IEC_P27-1 [RFC1345,KXS2] -MIBenum: 88 -Source: ECMA registry -Alias: iso-ir-143 -Alias: csISO143IECP271 - -Name: ISO_8859-5:1988 [RFC1345,KXS2] -MIBenum: 8 -Source: ECMA registry -Alias: iso-ir-144 -Alias: ISO_8859-5 -Alias: ISO-8859-5 (preferred MIME name) -Alias: cyrillic -Alias: csISOLatinCyrillic - -Name: JUS_I.B1.003-serb [RFC1345,KXS2] -MIBenum: 89 -Source: ECMA registry -Alias: iso-ir-146 -Alias: serbian -Alias: csISO146Serbian - -Name: JUS_I.B1.003-mac [RFC1345,KXS2] -MIBenum: 90 -Source: ECMA registry -Alias: macedonian -Alias: iso-ir-147 -Alias: csISO147Macedonian - -Name: ISO_8859-9:1989 [RFC1345,KXS2] -MIBenum: 12 -Source: ECMA registry -Alias: iso-ir-148 -Alias: ISO_8859-9 -Alias: ISO-8859-9 (preferred MIME name) -Alias: latin5 -Alias: l5 -Alias: csISOLatin5 - -Name: greek-ccitt [RFC1345,KXS2] -MIBenum: 91 -Source: ECMA registry -Alias: iso-ir-150 -Alias: csISO150 -Alias: csISO150GreekCCITT - -Name: NC_NC00-10:81 [RFC1345,KXS2] -MIBenum: 92 -Source: ECMA registry -Alias: cuba -Alias: iso-ir-151 -Alias: ISO646-CU -Alias: csISO151Cuba - -Name: ISO_6937-2-25 [RFC1345,KXS2] -MIBenum: 93 -Source: ECMA registry -Alias: iso-ir-152 -Alias: csISO6937Add - -Name: GOST_19768-74 [RFC1345,KXS2] -MIBenum: 94 -Source: ECMA registry -Alias: ST_SEV_358-88 -Alias: iso-ir-153 -Alias: csISO153GOST1976874 - -Name: ISO_8859-supp [RFC1345,KXS2] -MIBenum: 95 -Source: ECMA registry -Alias: iso-ir-154 -Alias: latin1-2-5 -Alias: csISO8859Supp - -Name: ISO_10367-box [RFC1345,KXS2] -MIBenum: 96 -Source: ECMA registry -Alias: iso-ir-155 -Alias: csISO10367Box - -Name: ISO-8859-10 (preferred MIME name) [RFC1345,KXS2] -MIBenum: 13 -Source: ECMA registry -Alias: iso-ir-157 -Alias: l6 -Alias: ISO_8859-10:1992 -Alias: csISOLatin6 -Alias: latin6 - -Name: latin-lap [RFC1345,KXS2] -MIBenum: 97 -Source: ECMA registry -Alias: lap -Alias: iso-ir-158 -Alias: csISO158Lap - -Name: JIS_X0212-1990 [RFC1345,KXS2] -MIBenum: 98 -Source: ECMA registry -Alias: x0212 -Alias: iso-ir-159 -Alias: csISO159JISX02121990 - -Name: DS_2089 [RFC1345,KXS2] -MIBenum: 99 -Source: Danish Standard, DS 2089, February 1974 -Alias: DS2089 -Alias: ISO646-DK -Alias: dk -Alias: csISO646Danish - -Name: us-dk [RFC1345,KXS2] -MIBenum: 100 -Alias: csUSDK - -Name: dk-us [RFC1345,KXS2] -MIBenum: 101 -Alias: csDKUS - -Name: JIS_X0201 [RFC1345,KXS2] -MIBenum: 15 -Source: JIS X 0201-1976. One byte only, this is equivalent to - JIS/Roman (similar to ASCII) plus eight-bit half-width - Katakana -Alias: X0201 -Alias: csHalfWidthKatakana - -Name: KSC5636 [RFC1345,KXS2] -MIBenum: 102 -Alias: ISO646-KR -Alias: csKSC5636 - -Name: ISO-10646-UCS-2 -MIBenum: 1000 -Source: the 2-octet Basic Multilingual Plane, aka Unicode - this needs to specify network byte order: the standard - does not specify (it is a 16-bit integer space) -Alias: csUnicode - -Name: ISO-10646-UCS-4 -MIBenum: 1001 -Source: the full code space. (same comment about byte order, - these are 31-bit numbers. -Alias: csUCS4 - -Name: DEC-MCS [RFC1345,KXS2] -MIBenum: 2008 -Source: VAX/VMS User's Manual, - Order Number: AI-Y517A-TE, April 1986. -Alias: dec -Alias: csDECMCS - -Name: hp-roman8 [HP-PCL5,RFC1345,KXS2] -MIBenum: 2004 -Source: LaserJet IIP Printer User's Manual, - HP part no 33471-90901, Hewlet-Packard, June 1989. -Alias: roman8 -Alias: r8 -Alias: csHPRoman8 - -Name: macintosh [RFC1345,KXS2] -MIBenum: 2027 -Source: The Unicode Standard ver1.0, ISBN 0-201-56788-1, Oct 1991 -Alias: mac -Alias: csMacintosh - -Name: IBM037 [RFC1345,KXS2] -MIBenum: 2028 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp037 -Alias: ebcdic-cp-us -Alias: ebcdic-cp-ca -Alias: ebcdic-cp-wt -Alias: ebcdic-cp-nl -Alias: csIBM037 - -Name: IBM038 [RFC1345,KXS2] -MIBenum: 2029 -Source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990 -Alias: EBCDIC-INT -Alias: cp038 -Alias: csIBM038 - -Name: IBM273 [RFC1345,KXS2] -MIBenum: 2030 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: CP273 -Alias: csIBM273 - -Name: IBM274 [RFC1345,KXS2] -MIBenum: 2031 -Source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990 -Alias: EBCDIC-BE -Alias: CP274 -Alias: csIBM274 - -Name: IBM275 [RFC1345,KXS2] -MIBenum: 2032 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: EBCDIC-BR -Alias: cp275 -Alias: csIBM275 - -Name: IBM277 [RFC1345,KXS2] -MIBenum: 2033 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: EBCDIC-CP-DK -Alias: EBCDIC-CP-NO -Alias: csIBM277 - -Name: IBM278 [RFC1345,KXS2] -MIBenum: 2034 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: CP278 -Alias: ebcdic-cp-fi -Alias: ebcdic-cp-se -Alias: csIBM278 - -Name: IBM280 [RFC1345,KXS2] -MIBenum: 2035 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: CP280 -Alias: ebcdic-cp-it -Alias: csIBM280 - -Name: IBM281 [RFC1345,KXS2] -MIBenum: 2036 -Source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990 -Alias: EBCDIC-JP-E -Alias: cp281 -Alias: csIBM281 - -Name: IBM284 [RFC1345,KXS2] -MIBenum: 2037 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: CP284 -Alias: ebcdic-cp-es -Alias: csIBM284 - -Name: IBM285 [RFC1345,KXS2] -MIBenum: 2038 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: CP285 -Alias: ebcdic-cp-gb -Alias: csIBM285 - -Name: IBM290 [RFC1345,KXS2] -MIBenum: 2039 -Source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990 -Alias: cp290 -Alias: EBCDIC-JP-kana -Alias: csIBM290 - -Name: IBM297 [RFC1345,KXS2] -MIBenum: 2040 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp297 -Alias: ebcdic-cp-fr -Alias: csIBM297 - -Name: IBM420 [RFC1345,KXS2] -MIBenum: 2041 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990, - IBM NLS RM p 11-11 -Alias: cp420 -Alias: ebcdic-cp-ar1 -Alias: csIBM420 - -Name: IBM423 [RFC1345,KXS2] -MIBenum: 2042 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp423 -Alias: ebcdic-cp-gr -Alias: csIBM423 - -Name: IBM424 [RFC1345,KXS2] -MIBenum: 2043 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp424 -Alias: ebcdic-cp-he -Alias: csIBM424 - -Name: IBM437 [RFC1345,KXS2] -MIBenum: 2011 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp437 -Alias: 437 -Alias: csPC8CodePage437 - -Name: IBM500 [RFC1345,KXS2] -MIBenum: 2044 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: CP500 -Alias: ebcdic-cp-be -Alias: ebcdic-cp-ch -Alias: csIBM500 - -Name: IBM775 [HP-PCL5] -MIBenum: 2087 -Source: HP PCL 5 Comparison Guide (P/N 5021-0329) pp B-13, 1996 -Alias: cp775 -Alias: csPC775Baltic - -Name: IBM850 [RFC1345,KXS2] -MIBenum: 2009 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp850 -Alias: 850 -Alias: csPC850Multilingual - -Name: IBM851 [RFC1345,KXS2] -MIBenum: 2045 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp851 -Alias: 851 -Alias: csIBM851 - -Name: IBM852 [RFC1345,KXS2] -MIBenum: 2010 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp852 -Alias: 852 -Alias: csPCp852 - -Name: IBM855 [RFC1345,KXS2] -MIBenum: 2046 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp855 -Alias: 855 -Alias: csIBM855 - -Name: IBM857 [RFC1345,KXS2] -MIBenum: 2047 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp857 -Alias: 857 -Alias: csIBM857 - -Name: IBM860 [RFC1345,KXS2] -MIBenum: 2048 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp860 -Alias: 860 -Alias: csIBM860 - -Name: IBM861 [RFC1345,KXS2] -MIBenum: 2049 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp861 -Alias: 861 -Alias: cp-is -Alias: csIBM861 - -Name: IBM862 [RFC1345,KXS2] -MIBenum: 2013 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp862 -Alias: 862 -Alias: csPC862LatinHebrew - -Name: IBM863 [RFC1345,KXS2] -MIBenum: 2050 -Source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991 -Alias: cp863 -Alias: 863 -Alias: csIBM863 - -Name: IBM864 [RFC1345,KXS2] -MIBenum: 2051 -Source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991 -Alias: cp864 -Alias: csIBM864 - -Name: IBM865 [RFC1345,KXS2] -MIBenum: 2052 -Source: IBM DOS 3.3 Ref (Abridged), 94X9575 (Feb 1987) -Alias: cp865 -Alias: 865 -Alias: csIBM865 - -Name: IBM866 [Pond] -MIBenum: 2086 -Source: IBM NLDG Volume 2 (SE09-8002-03) August 1994 -Alias: cp866 -Alias: 866 -Alias: csIBM866 - -Name: IBM868 [RFC1345,KXS2] -MIBenum: 2053 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: CP868 -Alias: cp-ar -Alias: csIBM868 - -Name: IBM869 [RFC1345,KXS2] -MIBenum: 2054 -Source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991 -Alias: cp869 -Alias: 869 -Alias: cp-gr -Alias: csIBM869 - -Name: IBM870 [RFC1345,KXS2] -MIBenum: 2055 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: CP870 -Alias: ebcdic-cp-roece -Alias: ebcdic-cp-yu -Alias: csIBM870 - -Name: IBM871 [RFC1345,KXS2] -MIBenum: 2056 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: CP871 -Alias: ebcdic-cp-is -Alias: csIBM871 - -Name: IBM880 [RFC1345,KXS2] -MIBenum: 2057 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp880 -Alias: EBCDIC-Cyrillic -Alias: csIBM880 - -Name: IBM891 [RFC1345,KXS2] -MIBenum: 2058 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp891 -Alias: csIBM891 - -Name: IBM903 [RFC1345,KXS2] -MIBenum: 2059 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp903 -Alias: csIBM903 - -Name: IBM904 [RFC1345,KXS2] -MIBenum: 2060 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: cp904 -Alias: 904 -Alias: csIBBM904 - -Name: IBM905 [RFC1345,KXS2] -MIBenum: 2061 -Source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990 -Alias: CP905 -Alias: ebcdic-cp-tr -Alias: csIBM905 - -Name: IBM918 [RFC1345,KXS2] -MIBenum: 2062 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: CP918 -Alias: ebcdic-cp-ar2 -Alias: csIBM918 - -Name: IBM1026 [RFC1345,KXS2] -MIBenum: 2063 -Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 -Alias: CP1026 -Alias: csIBM1026 - -Name: EBCDIC-AT-DE [RFC1345,KXS2] -MIBenum: 2064 -Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 -Alias: csIBMEBCDICATDE - -Name: EBCDIC-AT-DE-A [RFC1345,KXS2] -MIBenum: 2065 -Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 -Alias: csEBCDICATDEA - -Name: EBCDIC-CA-FR [RFC1345,KXS2] -MIBenum: 2066 -Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 -Alias: csEBCDICCAFR - -Name: EBCDIC-DK-NO [RFC1345,KXS2] -MIBenum: 2067 -Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 -Alias: csEBCDICDKNO - -Name: EBCDIC-DK-NO-A [RFC1345,KXS2] -MIBenum: 2068 -Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 -Alias: csEBCDICDKNOA - -Name: EBCDIC-FI-SE [RFC1345,KXS2] -MIBenum: 2069 -Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 -Alias: csEBCDICFISE - -Name: EBCDIC-FI-SE-A [RFC1345,KXS2] -MIBenum: 2070 -Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 -Alias: csEBCDICFISEA - -Name: EBCDIC-FR [RFC1345,KXS2] -MIBenum: 2071 -Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 -Alias: csEBCDICFR - -Name: EBCDIC-IT [RFC1345,KXS2] -MIBenum: 2072 -Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 -Alias: csEBCDICIT - -Name: EBCDIC-PT [RFC1345,KXS2] -MIBenum: 2073 -Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 -Alias: csEBCDICPT - -Name: EBCDIC-ES [RFC1345,KXS2] -MIBenum: 2074 -Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 -Alias: csEBCDICES - -Name: EBCDIC-ES-A [RFC1345,KXS2] -MIBenum: 2075 -Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 -Alias: csEBCDICESA - -Name: EBCDIC-ES-S [RFC1345,KXS2] -MIBenum: 2076 -Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 -Alias: csEBCDICESS - -Name: EBCDIC-UK [RFC1345,KXS2] -MIBenum: 2077 -Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 -Alias: csEBCDICUK - -Name: EBCDIC-US [RFC1345,KXS2] -MIBenum: 2078 -Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 -Alias: csEBCDICUS - -Name: UNKNOWN-8BIT [RFC1428] -MIBenum: 2079 -Alias: csUnknown8BiT - -Name: MNEMONIC [RFC1345,KXS2] -MIBenum: 2080 -Source: RFC 1345, also known as "mnemonic+ascii+38" -Alias: csMnemonic - -Name: MNEM [RFC1345,KXS2] -MIBenum: 2081 -Source: RFC 1345, also known as "mnemonic+ascii+8200" -Alias: csMnem - -Name: VISCII [RFC1456] -MIBenum: 2082 -Source: RFC 1456 -Alias: csVISCII - -Name: VIQR [RFC1456] -MIBenum: 2083 -Source: RFC 1456 -Alias: csVIQR - -Name: KOI8-R (preferred MIME name) [RFC1489] -MIBenum: 2084 -Source: RFC 1489, based on GOST-19768-74, ISO-6937/8, - INIS-Cyrillic, ISO-5427. -Alias: csKOI8R - -Name: KOI8-U [RFC2319] -MIBenum: 2088 -Source: RFC 2319 - -Name: IBM00858 -MIBenum: 2089 -Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM00858) [Mahdi] -Alias: CCSID00858 -Alias: CP00858 -Alias: PC-Multilingual-850+euro - -Name: IBM00924 -MIBenum: 2090 -Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM00924) [Mahdi] -Alias: CCSID00924 -Alias: CP00924 -Alias: ebcdic-Latin9--euro - -Name: IBM01140 -MIBenum: 2091 -Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01140) [Mahdi] -Alias: CCSID01140 -Alias: CP01140 -Alias: ebcdic-us-37+euro - -Name: IBM01141 -MIBenum: 2092 -Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01141) [Mahdi] -Alias: CCSID01141 -Alias: CP01141 -Alias: ebcdic-de-273+euro - -Name: IBM01142 -MIBenum: 2093 -Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01142) [Mahdi] -Alias: CCSID01142 -Alias: CP01142 -Alias: ebcdic-dk-277+euro -Alias: ebcdic-no-277+euro - -Name: IBM01143 -MIBenum: 2094 -Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01143) [Mahdi] -Alias: CCSID01143 -Alias: CP01143 -Alias: ebcdic-fi-278+euro -Alias: ebcdic-se-278+euro - -Name: IBM01144 -MIBenum: 2095 -Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01144) [Mahdi] -Alias: CCSID01144 -Alias: CP01144 -Alias: ebcdic-it-280+euro - -Name: IBM01145 -MIBenum: 2096 -Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01145) [Mahdi] -Alias: CCSID01145 -Alias: CP01145 -Alias: ebcdic-es-284+euro - -Name: IBM01146 -MIBenum: 2097 -Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01146) [Mahdi] -Alias: CCSID01146 -Alias: CP01146 -Alias: ebcdic-gb-285+euro - -Name: IBM01147 -MIBenum: 2098 -Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01147) [Mahdi] -Alias: CCSID01147 -Alias: CP01147 -Alias: ebcdic-fr-297+euro - -Name: IBM01148 -MIBenum: 2099 -Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01148) [Mahdi] -Alias: CCSID01148 -Alias: CP01148 -Alias: ebcdic-international-500+euro - -Name: IBM01149 -MIBenum: 2100 -Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01149) [Mahdi] -Alias: CCSID01149 -Alias: CP01149 -Alias: ebcdic-is-871+euro - -Name: Big5-HKSCS [Yick] -MIBenum: 2101 -Source: See (http://www.iana.org/assignments/charset-reg/Big5-HKSCS) -Alias: None - -Name: IBM1047 [Robrigado] -MIBenum: 2102 -Source: IBM1047 (EBCDIC Latin 1/Open Systems) -http://www-1.ibm.com/servers/eserver/iseries/software/globalization/pdf/cp01047z.pdf -Alias: IBM-1047 - -Name: PTCP154 [Uskov] -MIBenum: 2103 -Source: See (http://www.iana.org/assignments/charset-reg/PTCP154) -Alias: csPTCP154 -Alias: PT154 -Alias: CP154 -Alias: Cyrillic-Asian - -Name: Amiga-1251 -MIBenum: 2104 -Source: See (http://www.amiga.ultranet.ru/Amiga-1251.html) -Alias: Ami1251 -Alias: Amiga1251 -Alias: Ami-1251 -(Aliases are provided for historical reasons and should not be used) - [Malyshev] - -Name: KOI7-switched -MIBenum: 2105 -Source: See -Aliases: None - -Name: UNICODE-1-1 [RFC1641] -MIBenum: 1010 -Source: RFC 1641 -Alias: csUnicode11 - -Name: SCSU -MIBenum: 1011 -Source: SCSU See (http://www.iana.org/assignments/charset-reg/SCSU) [Scherer] -Alias: None - -Name: UTF-7 [RFC2152] -MIBenum: 1012 -Source: RFC 2152 -Alias: None - -Name: UTF-16BE [RFC2781] -MIBenum: 1013 -Source: RFC 2781 -Alias: None - -Name: UTF-16LE [RFC2781] -MIBenum: 1014 -Source: RFC 2781 -Alias: None - -Name: UTF-16 [RFC2781] -MIBenum: 1015 -Source: RFC 2781 -Alias: None - -Name: CESU-8 [Phipps] -MIBenum: 1016 -Source: -Alias: csCESU-8 - -Name: UTF-32 [Davis] -MIBenum: 1017 -Source: -Alias: None - -Name: UTF-32BE [Davis] -MIBenum: 1018 -Source: -Alias: None - -Name: UTF-32LE [Davis] -MIBenum: 1019 -Source: -Alias: None - -Name: BOCU-1 [Scherer] -MIBenum: 1020 -Source: http://www.unicode.org/notes/tn6/ -Alias: csBOCU-1 - -Name: UNICODE-1-1-UTF-7 [RFC1642] -MIBenum: 103 -Source: RFC 1642 -Alias: csUnicode11UTF7 - -Name: UTF-8 [RFC3629] -MIBenum: 106 -Source: RFC 3629 -Alias: None - -Name: ISO-8859-13 -MIBenum: 109 -Source: ISO See (http://www.iana.org/assignments/charset-reg/iso-8859-13)[Tumasonis] -Alias: None - -Name: ISO-8859-14 -MIBenum: 110 -Source: ISO See (http://www.iana.org/assignments/charset-reg/iso-8859-14) [Simonsen] -Alias: iso-ir-199 -Alias: ISO_8859-14:1998 -Alias: ISO_8859-14 -Alias: latin8 -Alias: iso-celtic -Alias: l8 - -Name: ISO-8859-15 -MIBenum: 111 -Source: ISO - Please see: -Alias: ISO_8859-15 -Alias: Latin-9 - -Name: ISO-8859-16 -MIBenum: 112 -Source: ISO -Alias: iso-ir-226 -Alias: ISO_8859-16:2001 -Alias: ISO_8859-16 -Alias: latin10 -Alias: l10 - -Name: GBK -MIBenum: 113 -Source: Chinese IT Standardization Technical Committee - Please see: -Alias: CP936 -Alias: MS936 -Alias: windows-936 - -Name: GB18030 -MIBenum: 114 -Source: Chinese IT Standardization Technical Committee - Please see: -Alias: None - -Name: OSD_EBCDIC_DF04_15 -MIBenum: 115 -Source: Fujitsu-Siemens standard mainframe EBCDIC encoding - Please see: -Alias: None - -Name: OSD_EBCDIC_DF03_IRV -MIBenum: 116 -Source: Fujitsu-Siemens standard mainframe EBCDIC encoding - Please see: -Alias: None - -Name: OSD_EBCDIC_DF04_1 -MIBenum: 117 -Source: Fujitsu-Siemens standard mainframe EBCDIC encoding - Please see: -Alias: None - -Name: JIS_Encoding -MIBenum: 16 -Source: JIS X 0202-1991. Uses ISO 2022 escape sequences to - shift code sets as documented in JIS X 0202-1991. -Alias: csJISEncoding - -Name: Shift_JIS (preferred MIME name) -MIBenum: 17 -Source: This charset is an extension of csHalfWidthKatakana by - adding graphic characters in JIS X 0208. The CCS's are - JIS X0201:1997 and JIS X0208:1997. The - complete definition is shown in Appendix 1 of JIS - X0208:1997. - This charset can be used for the top-level media type "text". -Alias: MS_Kanji -Alias: csShiftJIS - -Name: Extended_UNIX_Code_Packed_Format_for_Japanese -MIBenum: 18 -Source: Standardized by OSF, UNIX International, and UNIX Systems - Laboratories Pacific. Uses ISO 2022 rules to select - code set 0: US-ASCII (a single 7-bit byte set) - code set 1: JIS X0208-1990 (a double 8-bit byte set) - restricted to A0-FF in both bytes - code set 2: Half Width Katakana (a single 7-bit byte set) - requiring SS2 as the character prefix - code set 3: JIS X0212-1990 (a double 7-bit byte set) - restricted to A0-FF in both bytes - requiring SS3 as the character prefix -Alias: csEUCPkdFmtJapanese -Alias: EUC-JP (preferred MIME name) - -Name: Extended_UNIX_Code_Fixed_Width_for_Japanese -MIBenum: 19 -Source: Used in Japan. Each character is 2 octets. - code set 0: US-ASCII (a single 7-bit byte set) - 1st byte = 00 - 2nd byte = 20-7E - code set 1: JIS X0208-1990 (a double 7-bit byte set) - restricted to A0-FF in both bytes - code set 2: Half Width Katakana (a single 7-bit byte set) - 1st byte = 00 - 2nd byte = A0-FF - code set 3: JIS X0212-1990 (a double 7-bit byte set) - restricted to A0-FF in - the first byte - and 21-7E in the second byte -Alias: csEUCFixWidJapanese - -Name: ISO-10646-UCS-Basic -MIBenum: 1002 -Source: ASCII subset of Unicode. Basic Latin = collection 1 - See ISO 10646, Appendix A -Alias: csUnicodeASCII - -Name: ISO-10646-Unicode-Latin1 -MIBenum: 1003 -Source: ISO Latin-1 subset of Unicode. Basic Latin and Latin-1 - Supplement = collections 1 and 2. See ISO 10646, - Appendix A. See RFC 1815. -Alias: csUnicodeLatin1 -Alias: ISO-10646 - -Name: ISO-10646-J-1 -Source: ISO 10646 Japanese, see RFC 1815. - -Name: ISO-Unicode-IBM-1261 -MIBenum: 1005 -Source: IBM Latin-2, -3, -5, Extended Presentation Set, GCSGID: 1261 -Alias: csUnicodeIBM1261 - -Name: ISO-Unicode-IBM-1268 -MIBenum: 1006 -Source: IBM Latin-4 Extended Presentation Set, GCSGID: 1268 -Alias: csUnicodeIBM1268 - -Name: ISO-Unicode-IBM-1276 -MIBenum: 1007 -Source: IBM Cyrillic Greek Extended Presentation Set, GCSGID: 1276 -Alias: csUnicodeIBM1276 - -Name: ISO-Unicode-IBM-1264 -MIBenum: 1008 -Source: IBM Arabic Presentation Set, GCSGID: 1264 -Alias: csUnicodeIBM1264 - -Name: ISO-Unicode-IBM-1265 -MIBenum: 1009 -Source: IBM Hebrew Presentation Set, GCSGID: 1265 -Alias: csUnicodeIBM1265 - -Name: ISO-8859-1-Windows-3.0-Latin-1 [HP-PCL5] -MIBenum: 2000 -Source: Extended ISO 8859-1 Latin-1 for Windows 3.0. - PCL Symbol Set id: 9U -Alias: csWindows30Latin1 - -Name: ISO-8859-1-Windows-3.1-Latin-1 [HP-PCL5] -MIBenum: 2001 -Source: Extended ISO 8859-1 Latin-1 for Windows 3.1. - PCL Symbol Set id: 19U -Alias: csWindows31Latin1 - -Name: ISO-8859-2-Windows-Latin-2 [HP-PCL5] -MIBenum: 2002 -Source: Extended ISO 8859-2. Latin-2 for Windows 3.1. - PCL Symbol Set id: 9E -Alias: csWindows31Latin2 - -Name: ISO-8859-9-Windows-Latin-5 [HP-PCL5] -MIBenum: 2003 -Source: Extended ISO 8859-9. Latin-5 for Windows 3.1 - PCL Symbol Set id: 5T -Alias: csWindows31Latin5 - -Name: Adobe-Standard-Encoding [Adobe] -MIBenum: 2005 -Source: PostScript Language Reference Manual - PCL Symbol Set id: 10J -Alias: csAdobeStandardEncoding - -Name: Ventura-US [HP-PCL5] -MIBenum: 2006 -Source: Ventura US. ASCII plus characters typically used in - publishing, like pilcrow, copyright, registered, trade mark, - section, dagger, and double dagger in the range A0 (hex) - to FF (hex). - PCL Symbol Set id: 14J -Alias: csVenturaUS - -Name: Ventura-International [HP-PCL5] -MIBenum: 2007 -Source: Ventura International. ASCII plus coded characters similar - to Roman8. - PCL Symbol Set id: 13J -Alias: csVenturaInternational - -Name: PC8-Danish-Norwegian [HP-PCL5] -MIBenum: 2012 -Source: PC Danish Norwegian - 8-bit PC set for Danish Norwegian - PCL Symbol Set id: 11U -Alias: csPC8DanishNorwegian - -Name: PC8-Turkish [HP-PCL5] -MIBenum: 2014 -Source: PC Latin Turkish. PCL Symbol Set id: 9T -Alias: csPC8Turkish - -Name: IBM-Symbols [IBM-CIDT] -MIBenum: 2015 -Source: Presentation Set, CPGID: 259 -Alias: csIBMSymbols - -Name: IBM-Thai [IBM-CIDT] -MIBenum: 2016 -Source: Presentation Set, CPGID: 838 -Alias: csIBMThai - -Name: HP-Legal [HP-PCL5] -MIBenum: 2017 -Source: PCL 5 Comparison Guide, Hewlett-Packard, - HP part number 5961-0510, October 1992 - PCL Symbol Set id: 1U -Alias: csHPLegal - -Name: HP-Pi-font [HP-PCL5] -MIBenum: 2018 -Source: PCL 5 Comparison Guide, Hewlett-Packard, - HP part number 5961-0510, October 1992 - PCL Symbol Set id: 15U -Alias: csHPPiFont - -Name: HP-Math8 [HP-PCL5] -MIBenum: 2019 -Source: PCL 5 Comparison Guide, Hewlett-Packard, - HP part number 5961-0510, October 1992 - PCL Symbol Set id: 8M -Alias: csHPMath8 - -Name: Adobe-Symbol-Encoding [Adobe] -MIBenum: 2020 -Source: PostScript Language Reference Manual - PCL Symbol Set id: 5M -Alias: csHPPSMath - -Name: HP-DeskTop [HP-PCL5] -MIBenum: 2021 -Source: PCL 5 Comparison Guide, Hewlett-Packard, - HP part number 5961-0510, October 1992 - PCL Symbol Set id: 7J -Alias: csHPDesktop - -Name: Ventura-Math [HP-PCL5] -MIBenum: 2022 -Source: PCL 5 Comparison Guide, Hewlett-Packard, - HP part number 5961-0510, October 1992 - PCL Symbol Set id: 6M -Alias: csVenturaMath - -Name: Microsoft-Publishing [HP-PCL5] -MIBenum: 2023 -Source: PCL 5 Comparison Guide, Hewlett-Packard, - HP part number 5961-0510, October 1992 - PCL Symbol Set id: 6J -Alias: csMicrosoftPublishing - -Name: Windows-31J -MIBenum: 2024 -Source: Windows Japanese. A further extension of Shift_JIS - to include NEC special characters (Row 13), NEC - selection of IBM extensions (Rows 89 to 92), and IBM - extensions (Rows 115 to 119). The CCS's are - JIS X0201:1997, JIS X0208:1997, and these extensions. - This charset can be used for the top-level media type "text", - but it is of limited or specialized use (see RFC2278). - PCL Symbol Set id: 19K -Alias: csWindows31J - -Name: GB2312 (preferred MIME name) -MIBenum: 2025 -Source: Chinese for People's Republic of China (PRC) mixed one byte, - two byte set: - 20-7E = one byte ASCII - A1-FE = two byte PRC Kanji - See GB 2312-80 - PCL Symbol Set Id: 18C -Alias: csGB2312 - -Name: Big5 (preferred MIME name) -MIBenum: 2026 -Source: Chinese for Taiwan Multi-byte set. - PCL Symbol Set Id: 18T -Alias: csBig5 - -Name: windows-1250 -MIBenum: 2250 -Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1250) [Lazhintseva] -Alias: None - -Name: windows-1251 -MIBenum: 2251 -Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1251) [Lazhintseva] -Alias: None - -Name: windows-1252 -MIBenum: 2252 -Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1252) [Wendt] -Alias: None - -Name: windows-1253 -MIBenum: 2253 -Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1253) [Lazhintseva] -Alias: None - -Name: windows-1254 -MIBenum: 2254 -Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1254) [Lazhintseva] -Alias: None - -Name: windows-1255 -MIBenum: 2255 -Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1255) [Lazhintseva] -Alias: None - -Name: windows-1256 -MIBenum: 2256 -Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1256) [Lazhintseva] -Alias: None - -Name: windows-1257 -MIBenum: 2257 -Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1257) [Lazhintseva] -Alias: None - -Name: windows-1258 -MIBenum: 2258 -Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1258) [Lazhintseva] -Alias: None - -Name: TIS-620 -MIBenum: 2259 -Source: Thai Industrial Standards Institute (TISI) [Tantsetthi] - -Name: HZ-GB-2312 -MIBenum: 2085 -Source: RFC 1842, RFC 1843 [RFC1842, RFC1843] - - -REFERENCES ----------- - -[RFC1345] Simonsen, K., "Character Mnemonics & Character Sets", - RFC 1345, Rationel Almen Planlaegning, Rationel Almen - Planlaegning, June 1992. - -[RFC1428] Vaudreuil, G., "Transition of Internet Mail from - Just-Send-8 to 8bit-SMTP/MIME", RFC1428, CNRI, February - 1993. - -[RFC1456] Vietnamese Standardization Working Group, "Conventions for - Encoding the Vietnamese Language VISCII: VIetnamese - Standard Code for Information Interchange VIQR: VIetnamese - Quoted-Readable Specification Revision 1.1", RFC 1456, May - 1993. - -[RFC1468] Murai, J., Crispin, M., and E. van der Poel, "Japanese - Character Encoding for Internet Messages", RFC 1468, - Keio University, Panda Programming, June 1993. - -[RFC1489] Chernov, A., "Registration of a Cyrillic Character Set", - RFC1489, RELCOM Development Team, July 1993. - -[RFC1554] Ohta, M., and K. Handa, "ISO-2022-JP-2: Multilingual - Extension of ISO-2022-JP", RFC1554, Tokyo Institute of - Technology, ETL, December 1993. - -[RFC1556] Nussbacher, H., "Handling of Bi-directional Texts in MIME", - RFC1556, Israeli Inter-University, December 1993. - -[RFC1557] Choi, U., Chon, K., and H. Park, "Korean Character Encoding - for Internet Messages", KAIST, Solvit Chosun Media, - December 1993. - -[RFC1641] Goldsmith, D., and M. Davis, "Using Unicode with MIME", - RFC1641, Taligent, Inc., July 1994. - -[RFC1642] Goldsmith, D., and M. Davis, "UTF-7", RFC1642, Taligent, - Inc., July 1994. - -[RFC1815] Ohta, M., "Character Sets ISO-10646 and ISO-10646-J-1", - RFC 1815, Tokyo Institute of Technology, July 1995. - - -[Adobe] Adobe Systems Incorporated, PostScript Language Reference - Manual, second edition, Addison-Wesley Publishing Company, - Inc., 1990. - -[ECMA Registry] ISO-IR: International Register of Escape Sequences - http://www.itscj.ipsj.or.jp/ISO-IE/ Note: The current - registration authority is IPSJ/ITSCJ, Japan. - -[HP-PCL5] Hewlett-Packard Company, "HP PCL 5 Comparison Guide", - (P/N 5021-0329) pp B-13, 1996. - -[IBM-CIDT] IBM Corporation, "ABOUT TYPE: IBM's Technical Reference - for Core Interchange Digitized Type", Publication number - S544-3708-01 - -[RFC1842] Wei, Y., J. Li, and Y. Jiang, "ASCII Printable - Characters-Based Chinese Character Encoding for Internet - Messages", RFC 1842, Harvard University, Rice University, - University of Maryland, August 1995. - -[RFC1843] Lee, F., "HZ - A Data Format for Exchanging Files of - Arbitrarily Mixed Chinese and ASCII Characters", RFC 1843, - Stanford University, August 1995. - -[RFC2152] Goldsmith, D., M. Davis, "UTF-7: A Mail-Safe Transformation - Format of Unicode", RFC 2152, Apple Computer, Inc., - Taligent Inc., May 1997. - -[RFC2279] Yergeau, F., "UTF-8, A Transformation Format of ISO 10646", - RFC 2279, Alis Technologies, January, 1998. - -[RFC2781] Hoffman, P., Yergeau, F., "UTF-16, an encoding of ISO 10646", - RFC 2781, February 2000. - -[RFC3629] Yergeau, F., "UTF-8, a transformation format of ISO 10646", - RFC3629, November 2003. - -PEOPLE ------- - -[KXS2] Keld Simonsen - -[Choi] Woohyong Choi - -[Davis] Mark Davis, , April 2002. - -[Lazhintseva] Katya Lazhintseva, , May 1996. - -[Mahdi] Tamer Mahdi, , August 2000. - -[Malyshev] Michael Malyshev, , January 2004 - -[Murai] Jun Murai - -[Nussbacher] Hank Nussbacher, - -[Ohta] Masataka Ohta, , July 1995. - -[Phipps] Toby Phipps, , March 2002. - -[Pond] Rick Pond, , March 1997. - -[Robrigado] Reuel Robrigado, , September 2002. - -[Scherer] Markus Scherer, , August 2000, - September 2002. - -[Simonsen] Keld Simonsen, , August 2000. - -[Tantsetthi] Trin Tantsetthi, , September 1998. - -[Tumasonis] Vladas Tumasonis, , August 2000. - -[Uskov] Alexander Uskov, , September 2002. - -[Wendt] Chris Wendt, , December 1999. - -[Yick] Nicky Yick, , October 2000. - -[] - - - - - - - + +=================================================================== +CHARACTER SETS + +(last updated 2004-02-06) + +These are the official names for character sets that may be used in +the Internet and may be referred to in Internet documentation. These +names are expressed in ANSI_X3.4-1968 which is commonly called +US-ASCII or simply ASCII. The character set most commonly use in the +Internet and used especially in protocol standards is US-ASCII, this +is strongly encouraged. The use of the name US-ASCII is also +encouraged. + +The character set names may be up to 40 characters taken from the +printable characters of US-ASCII. However, no distinction is made +between use of upper and lower case letters. + +The MIBenum value is a unique value for use in MIBs to identify coded +character sets. + +The value space for MIBenum values has been divided into three +regions. The first region (3-999) consists of coded character sets +that have been standardized by some standard setting organization. +This region is intended for standards that do not have subset +implementations. The second region (1000-1999) is for the Unicode and +ISO/IEC 10646 coded character sets together with a specification of a +(set of) sub-repertoires that may occur. The third region (>1999) is +intended for vendor specific coded character sets. + + Assigned MIB enum Numbers + ------------------------- + 0-2 Reserved + 3-999 Set By Standards Organizations + 1000-1999 Unicode / 10646 + 2000-2999 Vendor + +The aliases that start with "cs" have been added for use with the +Printer MIB (see RFC 1759) and contain the standard numbers along with +suggestive names in order to facilitate applications that want to +display the names in user interfaces. The "cs" stands for character +set and is provided for applications that need a lower case first +letter but want to use mixed case thereafter that cannot contain any +special characters, such as underbar ("_") and dash ("-"). If the +character set is from an ISO standard, its cs alias is the ISO +standard number or name. If the character set is not from an ISO +standard, but is registered with ISO (IPSJ/ITSCJ is the current ISO +Registration Authority), the ISO Registry number is specified as +ISOnnn followed by letters suggestive of the name or standards number +of the code set. When a national or international standard is +revised, the year of revision is added to the cs alias of the new +character set entry in the IANA Registry in order to distinguish the +revised character set from the original character set. + + +Character Set Reference +------------- --------- + +Name: ANSI_X3.4-1968 [RFC1345,KXS2] +MIBenum: 3 +Source: ECMA registry +Alias: iso-ir-6 +Alias: ANSI_X3.4-1986 +Alias: ISO_646.irv:1991 +Alias: ASCII +Alias: ISO646-US +Alias: US-ASCII (preferred MIME name) +Alias: us +Alias: IBM367 +Alias: cp367 +Alias: csASCII + +Name: ISO-10646-UTF-1 +MIBenum: 27 +Source: Universal Transfer Format (1), this is the multibyte + encoding, that subsets ASCII-7. It does not have byte + ordering issues. +Alias: csISO10646UTF1 + +Name: ISO_646.basic:1983 [RFC1345,KXS2] +MIBenum: 28 +Source: ECMA registry +Alias: ref +Alias: csISO646basic1983 + +Name: INVARIANT [RFC1345,KXS2] +MIBenum: 29 +Alias: csINVARIANT + +Name: ISO_646.irv:1983 [RFC1345,KXS2] +MIBenum: 30 +Source: ECMA registry +Alias: iso-ir-2 +Alias: irv +Alias: csISO2IntlRefVersion + +Name: BS_4730 [RFC1345,KXS2] +MIBenum: 20 +Source: ECMA registry +Alias: iso-ir-4 +Alias: ISO646-GB +Alias: gb +Alias: uk +Alias: csISO4UnitedKingdom + +Name: NATS-SEFI [RFC1345,KXS2] +MIBenum: 31 +Source: ECMA registry +Alias: iso-ir-8-1 +Alias: csNATSSEFI + +Name: NATS-SEFI-ADD [RFC1345,KXS2] +MIBenum: 32 +Source: ECMA registry +Alias: iso-ir-8-2 +Alias: csNATSSEFIADD + +Name: NATS-DANO [RFC1345,KXS2] +MIBenum: 33 +Source: ECMA registry +Alias: iso-ir-9-1 +Alias: csNATSDANO + +Name: NATS-DANO-ADD [RFC1345,KXS2] +MIBenum: 34 +Source: ECMA registry +Alias: iso-ir-9-2 +Alias: csNATSDANOADD + +Name: SEN_850200_B [RFC1345,KXS2] +MIBenum: 35 +Source: ECMA registry +Alias: iso-ir-10 +Alias: FI +Alias: ISO646-FI +Alias: ISO646-SE +Alias: se +Alias: csISO10Swedish + +Name: SEN_850200_C [RFC1345,KXS2] +MIBenum: 21 +Source: ECMA registry +Alias: iso-ir-11 +Alias: ISO646-SE2 +Alias: se2 +Alias: csISO11SwedishForNames + +Name: KS_C_5601-1987 [RFC1345,KXS2] +MIBenum: 36 +Source: ECMA registry +Alias: iso-ir-149 +Alias: KS_C_5601-1989 +Alias: KSC_5601 +Alias: korean +Alias: csKSC56011987 + +Name: ISO-2022-KR (preferred MIME name) [RFC1557,Choi] +MIBenum: 37 +Source: RFC-1557 (see also KS_C_5601-1987) +Alias: csISO2022KR + +Name: EUC-KR (preferred MIME name) [RFC1557,Choi] +MIBenum: 38 +Source: RFC-1557 (see also KS_C_5861-1992) +Alias: csEUCKR + +Name: ISO-2022-JP (preferred MIME name) [RFC1468,Murai] +MIBenum: 39 +Source: RFC-1468 (see also RFC-2237) +Alias: csISO2022JP + +Name: ISO-2022-JP-2 (preferred MIME name) [RFC1554,Ohta] +MIBenum: 40 +Source: RFC-1554 +Alias: csISO2022JP2 + +Name: ISO-2022-CN [RFC1922] +MIBenum: 104 +Source: RFC-1922 + +Name: ISO-2022-CN-EXT [RFC1922] +MIBenum: 105 +Source: RFC-1922 + +Name: JIS_C6220-1969-jp [RFC1345,KXS2] +MIBenum: 41 +Source: ECMA registry +Alias: JIS_C6220-1969 +Alias: iso-ir-13 +Alias: katakana +Alias: x0201-7 +Alias: csISO13JISC6220jp + +Name: JIS_C6220-1969-ro [RFC1345,KXS2] +MIBenum: 42 +Source: ECMA registry +Alias: iso-ir-14 +Alias: jp +Alias: ISO646-JP +Alias: csISO14JISC6220ro + +Name: IT [RFC1345,KXS2] +MIBenum: 22 +Source: ECMA registry +Alias: iso-ir-15 +Alias: ISO646-IT +Alias: csISO15Italian + +Name: PT [RFC1345,KXS2] +MIBenum: 43 +Source: ECMA registry +Alias: iso-ir-16 +Alias: ISO646-PT +Alias: csISO16Portuguese + +Name: ES [RFC1345,KXS2] +MIBenum: 23 +Source: ECMA registry +Alias: iso-ir-17 +Alias: ISO646-ES +Alias: csISO17Spanish + +Name: greek7-old [RFC1345,KXS2] +MIBenum: 44 +Source: ECMA registry +Alias: iso-ir-18 +Alias: csISO18Greek7Old + +Name: latin-greek [RFC1345,KXS2] +MIBenum: 45 +Source: ECMA registry +Alias: iso-ir-19 +Alias: csISO19LatinGreek + +Name: DIN_66003 [RFC1345,KXS2] +MIBenum: 24 +Source: ECMA registry +Alias: iso-ir-21 +Alias: de +Alias: ISO646-DE +Alias: csISO21German + +Name: NF_Z_62-010_(1973) [RFC1345,KXS2] +MIBenum: 46 +Source: ECMA registry +Alias: iso-ir-25 +Alias: ISO646-FR1 +Alias: csISO25French + +Name: Latin-greek-1 [RFC1345,KXS2] +MIBenum: 47 +Source: ECMA registry +Alias: iso-ir-27 +Alias: csISO27LatinGreek1 + +Name: ISO_5427 [RFC1345,KXS2] +MIBenum: 48 +Source: ECMA registry +Alias: iso-ir-37 +Alias: csISO5427Cyrillic + +Name: JIS_C6226-1978 [RFC1345,KXS2] +MIBenum: 49 +Source: ECMA registry +Alias: iso-ir-42 +Alias: csISO42JISC62261978 + +Name: BS_viewdata [RFC1345,KXS2] +MIBenum: 50 +Source: ECMA registry +Alias: iso-ir-47 +Alias: csISO47BSViewdata + +Name: INIS [RFC1345,KXS2] +MIBenum: 51 +Source: ECMA registry +Alias: iso-ir-49 +Alias: csISO49INIS + +Name: INIS-8 [RFC1345,KXS2] +MIBenum: 52 +Source: ECMA registry +Alias: iso-ir-50 +Alias: csISO50INIS8 + +Name: INIS-cyrillic [RFC1345,KXS2] +MIBenum: 53 +Source: ECMA registry +Alias: iso-ir-51 +Alias: csISO51INISCyrillic + +Name: ISO_5427:1981 [RFC1345,KXS2] +MIBenum: 54 +Source: ECMA registry +Alias: iso-ir-54 +Alias: ISO5427Cyrillic1981 + +Name: ISO_5428:1980 [RFC1345,KXS2] +MIBenum: 55 +Source: ECMA registry +Alias: iso-ir-55 +Alias: csISO5428Greek + +Name: GB_1988-80 [RFC1345,KXS2] +MIBenum: 56 +Source: ECMA registry +Alias: iso-ir-57 +Alias: cn +Alias: ISO646-CN +Alias: csISO57GB1988 + +Name: GB_2312-80 [RFC1345,KXS2] +MIBenum: 57 +Source: ECMA registry +Alias: iso-ir-58 +Alias: chinese +Alias: csISO58GB231280 + +Name: NS_4551-1 [RFC1345,KXS2] +MIBenum: 25 +Source: ECMA registry +Alias: iso-ir-60 +Alias: ISO646-NO +Alias: no +Alias: csISO60DanishNorwegian +Alias: csISO60Norwegian1 + +Name: NS_4551-2 [RFC1345,KXS2] +MIBenum: 58 +Source: ECMA registry +Alias: ISO646-NO2 +Alias: iso-ir-61 +Alias: no2 +Alias: csISO61Norwegian2 + +Name: NF_Z_62-010 [RFC1345,KXS2] +MIBenum: 26 +Source: ECMA registry +Alias: iso-ir-69 +Alias: ISO646-FR +Alias: fr +Alias: csISO69French + +Name: videotex-suppl [RFC1345,KXS2] +MIBenum: 59 +Source: ECMA registry +Alias: iso-ir-70 +Alias: csISO70VideotexSupp1 + +Name: PT2 [RFC1345,KXS2] +MIBenum: 60 +Source: ECMA registry +Alias: iso-ir-84 +Alias: ISO646-PT2 +Alias: csISO84Portuguese2 + +Name: ES2 [RFC1345,KXS2] +MIBenum: 61 +Source: ECMA registry +Alias: iso-ir-85 +Alias: ISO646-ES2 +Alias: csISO85Spanish2 + +Name: MSZ_7795.3 [RFC1345,KXS2] +MIBenum: 62 +Source: ECMA registry +Alias: iso-ir-86 +Alias: ISO646-HU +Alias: hu +Alias: csISO86Hungarian + +Name: JIS_C6226-1983 [RFC1345,KXS2] +MIBenum: 63 +Source: ECMA registry +Alias: iso-ir-87 +Alias: x0208 +Alias: JIS_X0208-1983 +Alias: csISO87JISX0208 + +Name: greek7 [RFC1345,KXS2] +MIBenum: 64 +Source: ECMA registry +Alias: iso-ir-88 +Alias: csISO88Greek7 + +Name: ASMO_449 [RFC1345,KXS2] +MIBenum: 65 +Source: ECMA registry +Alias: ISO_9036 +Alias: arabic7 +Alias: iso-ir-89 +Alias: csISO89ASMO449 + +Name: iso-ir-90 [RFC1345,KXS2] +MIBenum: 66 +Source: ECMA registry +Alias: csISO90 + +Name: JIS_C6229-1984-a [RFC1345,KXS2] +MIBenum: 67 +Source: ECMA registry +Alias: iso-ir-91 +Alias: jp-ocr-a +Alias: csISO91JISC62291984a + +Name: JIS_C6229-1984-b [RFC1345,KXS2] +MIBenum: 68 +Source: ECMA registry +Alias: iso-ir-92 +Alias: ISO646-JP-OCR-B +Alias: jp-ocr-b +Alias: csISO92JISC62991984b + +Name: JIS_C6229-1984-b-add [RFC1345,KXS2] +MIBenum: 69 +Source: ECMA registry +Alias: iso-ir-93 +Alias: jp-ocr-b-add +Alias: csISO93JIS62291984badd + +Name: JIS_C6229-1984-hand [RFC1345,KXS2] +MIBenum: 70 +Source: ECMA registry +Alias: iso-ir-94 +Alias: jp-ocr-hand +Alias: csISO94JIS62291984hand + +Name: JIS_C6229-1984-hand-add [RFC1345,KXS2] +MIBenum: 71 +Source: ECMA registry +Alias: iso-ir-95 +Alias: jp-ocr-hand-add +Alias: csISO95JIS62291984handadd + +Name: JIS_C6229-1984-kana [RFC1345,KXS2] +MIBenum: 72 +Source: ECMA registry +Alias: iso-ir-96 +Alias: csISO96JISC62291984kana + +Name: ISO_2033-1983 [RFC1345,KXS2] +MIBenum: 73 +Source: ECMA registry +Alias: iso-ir-98 +Alias: e13b +Alias: csISO2033 + +Name: ANSI_X3.110-1983 [RFC1345,KXS2] +MIBenum: 74 +Source: ECMA registry +Alias: iso-ir-99 +Alias: CSA_T500-1983 +Alias: NAPLPS +Alias: csISO99NAPLPS + +Name: ISO_8859-1:1987 [RFC1345,KXS2] +MIBenum: 4 +Source: ECMA registry +Alias: iso-ir-100 +Alias: ISO_8859-1 +Alias: ISO-8859-1 (preferred MIME name) +Alias: latin1 +Alias: l1 +Alias: IBM819 +Alias: CP819 +Alias: csISOLatin1 + +Name: ISO_8859-2:1987 [RFC1345,KXS2] +MIBenum: 5 +Source: ECMA registry +Alias: iso-ir-101 +Alias: ISO_8859-2 +Alias: ISO-8859-2 (preferred MIME name) +Alias: latin2 +Alias: l2 +Alias: csISOLatin2 + +Name: T.61-7bit [RFC1345,KXS2] +MIBenum: 75 +Source: ECMA registry +Alias: iso-ir-102 +Alias: csISO102T617bit + +Name: T.61-8bit [RFC1345,KXS2] +MIBenum: 76 +Alias: T.61 +Source: ECMA registry +Alias: iso-ir-103 +Alias: csISO103T618bit + +Name: ISO_8859-3:1988 [RFC1345,KXS2] +MIBenum: 6 +Source: ECMA registry +Alias: iso-ir-109 +Alias: ISO_8859-3 +Alias: ISO-8859-3 (preferred MIME name) +Alias: latin3 +Alias: l3 +Alias: csISOLatin3 + +Name: ISO_8859-4:1988 [RFC1345,KXS2] +MIBenum: 7 +Source: ECMA registry +Alias: iso-ir-110 +Alias: ISO_8859-4 +Alias: ISO-8859-4 (preferred MIME name) +Alias: latin4 +Alias: l4 +Alias: csISOLatin4 + +Name: ECMA-cyrillic +MIBenum: 77 +Source: ISO registry (formerly ECMA registry) + http://www.itscj.ipsj.jp/ISO-IR/111.pdf +Alias: iso-ir-111 +Alias: KOI8-E +Alias: csISO111ECMACyrillic + +Name: CSA_Z243.4-1985-1 [RFC1345,KXS2] +MIBenum: 78 +Source: ECMA registry +Alias: iso-ir-121 +Alias: ISO646-CA +Alias: csa7-1 +Alias: ca +Alias: csISO121Canadian1 + +Name: CSA_Z243.4-1985-2 [RFC1345,KXS2] +MIBenum: 79 +Source: ECMA registry +Alias: iso-ir-122 +Alias: ISO646-CA2 +Alias: csa7-2 +Alias: csISO122Canadian2 + +Name: CSA_Z243.4-1985-gr [RFC1345,KXS2] +MIBenum: 80 +Source: ECMA registry +Alias: iso-ir-123 +Alias: csISO123CSAZ24341985gr + +Name: ISO_8859-6:1987 [RFC1345,KXS2] +MIBenum: 9 +Source: ECMA registry +Alias: iso-ir-127 +Alias: ISO_8859-6 +Alias: ISO-8859-6 (preferred MIME name) +Alias: ECMA-114 +Alias: ASMO-708 +Alias: arabic +Alias: csISOLatinArabic + +Name: ISO_8859-6-E [RFC1556,IANA] +MIBenum: 81 +Source: RFC1556 +Alias: csISO88596E +Alias: ISO-8859-6-E (preferred MIME name) + +Name: ISO_8859-6-I [RFC1556,IANA] +MIBenum: 82 +Source: RFC1556 +Alias: csISO88596I +Alias: ISO-8859-6-I (preferred MIME name) + +Name: ISO_8859-7:1987 [RFC1947,RFC1345,KXS2] +MIBenum: 10 +Source: ECMA registry +Alias: iso-ir-126 +Alias: ISO_8859-7 +Alias: ISO-8859-7 (preferred MIME name) +Alias: ELOT_928 +Alias: ECMA-118 +Alias: greek +Alias: greek8 +Alias: csISOLatinGreek + +Name: T.101-G2 [RFC1345,KXS2] +MIBenum: 83 +Source: ECMA registry +Alias: iso-ir-128 +Alias: csISO128T101G2 + +Name: ISO_8859-8:1988 [RFC1345,KXS2] +MIBenum: 11 +Source: ECMA registry +Alias: iso-ir-138 +Alias: ISO_8859-8 +Alias: ISO-8859-8 (preferred MIME name) +Alias: hebrew +Alias: csISOLatinHebrew + +Name: ISO_8859-8-E [RFC1556,Nussbacher] +MIBenum: 84 +Source: RFC1556 +Alias: csISO88598E +Alias: ISO-8859-8-E (preferred MIME name) + +Name: ISO_8859-8-I [RFC1556,Nussbacher] +MIBenum: 85 +Source: RFC1556 +Alias: csISO88598I +Alias: ISO-8859-8-I (preferred MIME name) + +Name: CSN_369103 [RFC1345,KXS2] +MIBenum: 86 +Source: ECMA registry +Alias: iso-ir-139 +Alias: csISO139CSN369103 + +Name: JUS_I.B1.002 [RFC1345,KXS2] +MIBenum: 87 +Source: ECMA registry +Alias: iso-ir-141 +Alias: ISO646-YU +Alias: js +Alias: yu +Alias: csISO141JUSIB1002 + +Name: ISO_6937-2-add [RFC1345,KXS2] +MIBenum: 14 +Source: ECMA registry and ISO 6937-2:1983 +Alias: iso-ir-142 +Alias: csISOTextComm + +Name: IEC_P27-1 [RFC1345,KXS2] +MIBenum: 88 +Source: ECMA registry +Alias: iso-ir-143 +Alias: csISO143IECP271 + +Name: ISO_8859-5:1988 [RFC1345,KXS2] +MIBenum: 8 +Source: ECMA registry +Alias: iso-ir-144 +Alias: ISO_8859-5 +Alias: ISO-8859-5 (preferred MIME name) +Alias: cyrillic +Alias: csISOLatinCyrillic + +Name: JUS_I.B1.003-serb [RFC1345,KXS2] +MIBenum: 89 +Source: ECMA registry +Alias: iso-ir-146 +Alias: serbian +Alias: csISO146Serbian + +Name: JUS_I.B1.003-mac [RFC1345,KXS2] +MIBenum: 90 +Source: ECMA registry +Alias: macedonian +Alias: iso-ir-147 +Alias: csISO147Macedonian + +Name: ISO_8859-9:1989 [RFC1345,KXS2] +MIBenum: 12 +Source: ECMA registry +Alias: iso-ir-148 +Alias: ISO_8859-9 +Alias: ISO-8859-9 (preferred MIME name) +Alias: latin5 +Alias: l5 +Alias: csISOLatin5 + +Name: greek-ccitt [RFC1345,KXS2] +MIBenum: 91 +Source: ECMA registry +Alias: iso-ir-150 +Alias: csISO150 +Alias: csISO150GreekCCITT + +Name: NC_NC00-10:81 [RFC1345,KXS2] +MIBenum: 92 +Source: ECMA registry +Alias: cuba +Alias: iso-ir-151 +Alias: ISO646-CU +Alias: csISO151Cuba + +Name: ISO_6937-2-25 [RFC1345,KXS2] +MIBenum: 93 +Source: ECMA registry +Alias: iso-ir-152 +Alias: csISO6937Add + +Name: GOST_19768-74 [RFC1345,KXS2] +MIBenum: 94 +Source: ECMA registry +Alias: ST_SEV_358-88 +Alias: iso-ir-153 +Alias: csISO153GOST1976874 + +Name: ISO_8859-supp [RFC1345,KXS2] +MIBenum: 95 +Source: ECMA registry +Alias: iso-ir-154 +Alias: latin1-2-5 +Alias: csISO8859Supp + +Name: ISO_10367-box [RFC1345,KXS2] +MIBenum: 96 +Source: ECMA registry +Alias: iso-ir-155 +Alias: csISO10367Box + +Name: ISO-8859-10 (preferred MIME name) [RFC1345,KXS2] +MIBenum: 13 +Source: ECMA registry +Alias: iso-ir-157 +Alias: l6 +Alias: ISO_8859-10:1992 +Alias: csISOLatin6 +Alias: latin6 + +Name: latin-lap [RFC1345,KXS2] +MIBenum: 97 +Source: ECMA registry +Alias: lap +Alias: iso-ir-158 +Alias: csISO158Lap + +Name: JIS_X0212-1990 [RFC1345,KXS2] +MIBenum: 98 +Source: ECMA registry +Alias: x0212 +Alias: iso-ir-159 +Alias: csISO159JISX02121990 + +Name: DS_2089 [RFC1345,KXS2] +MIBenum: 99 +Source: Danish Standard, DS 2089, February 1974 +Alias: DS2089 +Alias: ISO646-DK +Alias: dk +Alias: csISO646Danish + +Name: us-dk [RFC1345,KXS2] +MIBenum: 100 +Alias: csUSDK + +Name: dk-us [RFC1345,KXS2] +MIBenum: 101 +Alias: csDKUS + +Name: JIS_X0201 [RFC1345,KXS2] +MIBenum: 15 +Source: JIS X 0201-1976. One byte only, this is equivalent to + JIS/Roman (similar to ASCII) plus eight-bit half-width + Katakana +Alias: X0201 +Alias: csHalfWidthKatakana + +Name: KSC5636 [RFC1345,KXS2] +MIBenum: 102 +Alias: ISO646-KR +Alias: csKSC5636 + +Name: ISO-10646-UCS-2 +MIBenum: 1000 +Source: the 2-octet Basic Multilingual Plane, aka Unicode + this needs to specify network byte order: the standard + does not specify (it is a 16-bit integer space) +Alias: csUnicode + +Name: ISO-10646-UCS-4 +MIBenum: 1001 +Source: the full code space. (same comment about byte order, + these are 31-bit numbers. +Alias: csUCS4 + +Name: DEC-MCS [RFC1345,KXS2] +MIBenum: 2008 +Source: VAX/VMS User's Manual, + Order Number: AI-Y517A-TE, April 1986. +Alias: dec +Alias: csDECMCS + +Name: hp-roman8 [HP-PCL5,RFC1345,KXS2] +MIBenum: 2004 +Source: LaserJet IIP Printer User's Manual, + HP part no 33471-90901, Hewlet-Packard, June 1989. +Alias: roman8 +Alias: r8 +Alias: csHPRoman8 + +Name: macintosh [RFC1345,KXS2] +MIBenum: 2027 +Source: The Unicode Standard ver1.0, ISBN 0-201-56788-1, Oct 1991 +Alias: mac +Alias: csMacintosh + +Name: IBM037 [RFC1345,KXS2] +MIBenum: 2028 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp037 +Alias: ebcdic-cp-us +Alias: ebcdic-cp-ca +Alias: ebcdic-cp-wt +Alias: ebcdic-cp-nl +Alias: csIBM037 + +Name: IBM038 [RFC1345,KXS2] +MIBenum: 2029 +Source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990 +Alias: EBCDIC-INT +Alias: cp038 +Alias: csIBM038 + +Name: IBM273 [RFC1345,KXS2] +MIBenum: 2030 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: CP273 +Alias: csIBM273 + +Name: IBM274 [RFC1345,KXS2] +MIBenum: 2031 +Source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990 +Alias: EBCDIC-BE +Alias: CP274 +Alias: csIBM274 + +Name: IBM275 [RFC1345,KXS2] +MIBenum: 2032 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: EBCDIC-BR +Alias: cp275 +Alias: csIBM275 + +Name: IBM277 [RFC1345,KXS2] +MIBenum: 2033 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: EBCDIC-CP-DK +Alias: EBCDIC-CP-NO +Alias: csIBM277 + +Name: IBM278 [RFC1345,KXS2] +MIBenum: 2034 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: CP278 +Alias: ebcdic-cp-fi +Alias: ebcdic-cp-se +Alias: csIBM278 + +Name: IBM280 [RFC1345,KXS2] +MIBenum: 2035 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: CP280 +Alias: ebcdic-cp-it +Alias: csIBM280 + +Name: IBM281 [RFC1345,KXS2] +MIBenum: 2036 +Source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990 +Alias: EBCDIC-JP-E +Alias: cp281 +Alias: csIBM281 + +Name: IBM284 [RFC1345,KXS2] +MIBenum: 2037 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: CP284 +Alias: ebcdic-cp-es +Alias: csIBM284 + +Name: IBM285 [RFC1345,KXS2] +MIBenum: 2038 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: CP285 +Alias: ebcdic-cp-gb +Alias: csIBM285 + +Name: IBM290 [RFC1345,KXS2] +MIBenum: 2039 +Source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990 +Alias: cp290 +Alias: EBCDIC-JP-kana +Alias: csIBM290 + +Name: IBM297 [RFC1345,KXS2] +MIBenum: 2040 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp297 +Alias: ebcdic-cp-fr +Alias: csIBM297 + +Name: IBM420 [RFC1345,KXS2] +MIBenum: 2041 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990, + IBM NLS RM p 11-11 +Alias: cp420 +Alias: ebcdic-cp-ar1 +Alias: csIBM420 + +Name: IBM423 [RFC1345,KXS2] +MIBenum: 2042 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp423 +Alias: ebcdic-cp-gr +Alias: csIBM423 + +Name: IBM424 [RFC1345,KXS2] +MIBenum: 2043 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp424 +Alias: ebcdic-cp-he +Alias: csIBM424 + +Name: IBM437 [RFC1345,KXS2] +MIBenum: 2011 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp437 +Alias: 437 +Alias: csPC8CodePage437 + +Name: IBM500 [RFC1345,KXS2] +MIBenum: 2044 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: CP500 +Alias: ebcdic-cp-be +Alias: ebcdic-cp-ch +Alias: csIBM500 + +Name: IBM775 [HP-PCL5] +MIBenum: 2087 +Source: HP PCL 5 Comparison Guide (P/N 5021-0329) pp B-13, 1996 +Alias: cp775 +Alias: csPC775Baltic + +Name: IBM850 [RFC1345,KXS2] +MIBenum: 2009 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp850 +Alias: 850 +Alias: csPC850Multilingual + +Name: IBM851 [RFC1345,KXS2] +MIBenum: 2045 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp851 +Alias: 851 +Alias: csIBM851 + +Name: IBM852 [RFC1345,KXS2] +MIBenum: 2010 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp852 +Alias: 852 +Alias: csPCp852 + +Name: IBM855 [RFC1345,KXS2] +MIBenum: 2046 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp855 +Alias: 855 +Alias: csIBM855 + +Name: IBM857 [RFC1345,KXS2] +MIBenum: 2047 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp857 +Alias: 857 +Alias: csIBM857 + +Name: IBM860 [RFC1345,KXS2] +MIBenum: 2048 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp860 +Alias: 860 +Alias: csIBM860 + +Name: IBM861 [RFC1345,KXS2] +MIBenum: 2049 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp861 +Alias: 861 +Alias: cp-is +Alias: csIBM861 + +Name: IBM862 [RFC1345,KXS2] +MIBenum: 2013 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp862 +Alias: 862 +Alias: csPC862LatinHebrew + +Name: IBM863 [RFC1345,KXS2] +MIBenum: 2050 +Source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991 +Alias: cp863 +Alias: 863 +Alias: csIBM863 + +Name: IBM864 [RFC1345,KXS2] +MIBenum: 2051 +Source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991 +Alias: cp864 +Alias: csIBM864 + +Name: IBM865 [RFC1345,KXS2] +MIBenum: 2052 +Source: IBM DOS 3.3 Ref (Abridged), 94X9575 (Feb 1987) +Alias: cp865 +Alias: 865 +Alias: csIBM865 + +Name: IBM866 [Pond] +MIBenum: 2086 +Source: IBM NLDG Volume 2 (SE09-8002-03) August 1994 +Alias: cp866 +Alias: 866 +Alias: csIBM866 + +Name: IBM868 [RFC1345,KXS2] +MIBenum: 2053 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: CP868 +Alias: cp-ar +Alias: csIBM868 + +Name: IBM869 [RFC1345,KXS2] +MIBenum: 2054 +Source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991 +Alias: cp869 +Alias: 869 +Alias: cp-gr +Alias: csIBM869 + +Name: IBM870 [RFC1345,KXS2] +MIBenum: 2055 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: CP870 +Alias: ebcdic-cp-roece +Alias: ebcdic-cp-yu +Alias: csIBM870 + +Name: IBM871 [RFC1345,KXS2] +MIBenum: 2056 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: CP871 +Alias: ebcdic-cp-is +Alias: csIBM871 + +Name: IBM880 [RFC1345,KXS2] +MIBenum: 2057 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp880 +Alias: EBCDIC-Cyrillic +Alias: csIBM880 + +Name: IBM891 [RFC1345,KXS2] +MIBenum: 2058 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp891 +Alias: csIBM891 + +Name: IBM903 [RFC1345,KXS2] +MIBenum: 2059 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp903 +Alias: csIBM903 + +Name: IBM904 [RFC1345,KXS2] +MIBenum: 2060 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: cp904 +Alias: 904 +Alias: csIBBM904 + +Name: IBM905 [RFC1345,KXS2] +MIBenum: 2061 +Source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990 +Alias: CP905 +Alias: ebcdic-cp-tr +Alias: csIBM905 + +Name: IBM918 [RFC1345,KXS2] +MIBenum: 2062 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: CP918 +Alias: ebcdic-cp-ar2 +Alias: csIBM918 + +Name: IBM1026 [RFC1345,KXS2] +MIBenum: 2063 +Source: IBM NLS RM Vol2 SE09-8002-01, March 1990 +Alias: CP1026 +Alias: csIBM1026 + +Name: EBCDIC-AT-DE [RFC1345,KXS2] +MIBenum: 2064 +Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 +Alias: csIBMEBCDICATDE + +Name: EBCDIC-AT-DE-A [RFC1345,KXS2] +MIBenum: 2065 +Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 +Alias: csEBCDICATDEA + +Name: EBCDIC-CA-FR [RFC1345,KXS2] +MIBenum: 2066 +Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 +Alias: csEBCDICCAFR + +Name: EBCDIC-DK-NO [RFC1345,KXS2] +MIBenum: 2067 +Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 +Alias: csEBCDICDKNO + +Name: EBCDIC-DK-NO-A [RFC1345,KXS2] +MIBenum: 2068 +Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 +Alias: csEBCDICDKNOA + +Name: EBCDIC-FI-SE [RFC1345,KXS2] +MIBenum: 2069 +Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 +Alias: csEBCDICFISE + +Name: EBCDIC-FI-SE-A [RFC1345,KXS2] +MIBenum: 2070 +Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 +Alias: csEBCDICFISEA + +Name: EBCDIC-FR [RFC1345,KXS2] +MIBenum: 2071 +Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 +Alias: csEBCDICFR + +Name: EBCDIC-IT [RFC1345,KXS2] +MIBenum: 2072 +Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 +Alias: csEBCDICIT + +Name: EBCDIC-PT [RFC1345,KXS2] +MIBenum: 2073 +Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 +Alias: csEBCDICPT + +Name: EBCDIC-ES [RFC1345,KXS2] +MIBenum: 2074 +Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 +Alias: csEBCDICES + +Name: EBCDIC-ES-A [RFC1345,KXS2] +MIBenum: 2075 +Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 +Alias: csEBCDICESA + +Name: EBCDIC-ES-S [RFC1345,KXS2] +MIBenum: 2076 +Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 +Alias: csEBCDICESS + +Name: EBCDIC-UK [RFC1345,KXS2] +MIBenum: 2077 +Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 +Alias: csEBCDICUK + +Name: EBCDIC-US [RFC1345,KXS2] +MIBenum: 2078 +Source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987 +Alias: csEBCDICUS + +Name: UNKNOWN-8BIT [RFC1428] +MIBenum: 2079 +Alias: csUnknown8BiT + +Name: MNEMONIC [RFC1345,KXS2] +MIBenum: 2080 +Source: RFC 1345, also known as "mnemonic+ascii+38" +Alias: csMnemonic + +Name: MNEM [RFC1345,KXS2] +MIBenum: 2081 +Source: RFC 1345, also known as "mnemonic+ascii+8200" +Alias: csMnem + +Name: VISCII [RFC1456] +MIBenum: 2082 +Source: RFC 1456 +Alias: csVISCII + +Name: VIQR [RFC1456] +MIBenum: 2083 +Source: RFC 1456 +Alias: csVIQR + +Name: KOI8-R (preferred MIME name) [RFC1489] +MIBenum: 2084 +Source: RFC 1489, based on GOST-19768-74, ISO-6937/8, + INIS-Cyrillic, ISO-5427. +Alias: csKOI8R + +Name: KOI8-U [RFC2319] +MIBenum: 2088 +Source: RFC 2319 + +Name: IBM00858 +MIBenum: 2089 +Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM00858) [Mahdi] +Alias: CCSID00858 +Alias: CP00858 +Alias: PC-Multilingual-850+euro + +Name: IBM00924 +MIBenum: 2090 +Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM00924) [Mahdi] +Alias: CCSID00924 +Alias: CP00924 +Alias: ebcdic-Latin9--euro + +Name: IBM01140 +MIBenum: 2091 +Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01140) [Mahdi] +Alias: CCSID01140 +Alias: CP01140 +Alias: ebcdic-us-37+euro + +Name: IBM01141 +MIBenum: 2092 +Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01141) [Mahdi] +Alias: CCSID01141 +Alias: CP01141 +Alias: ebcdic-de-273+euro + +Name: IBM01142 +MIBenum: 2093 +Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01142) [Mahdi] +Alias: CCSID01142 +Alias: CP01142 +Alias: ebcdic-dk-277+euro +Alias: ebcdic-no-277+euro + +Name: IBM01143 +MIBenum: 2094 +Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01143) [Mahdi] +Alias: CCSID01143 +Alias: CP01143 +Alias: ebcdic-fi-278+euro +Alias: ebcdic-se-278+euro + +Name: IBM01144 +MIBenum: 2095 +Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01144) [Mahdi] +Alias: CCSID01144 +Alias: CP01144 +Alias: ebcdic-it-280+euro + +Name: IBM01145 +MIBenum: 2096 +Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01145) [Mahdi] +Alias: CCSID01145 +Alias: CP01145 +Alias: ebcdic-es-284+euro + +Name: IBM01146 +MIBenum: 2097 +Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01146) [Mahdi] +Alias: CCSID01146 +Alias: CP01146 +Alias: ebcdic-gb-285+euro + +Name: IBM01147 +MIBenum: 2098 +Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01147) [Mahdi] +Alias: CCSID01147 +Alias: CP01147 +Alias: ebcdic-fr-297+euro + +Name: IBM01148 +MIBenum: 2099 +Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01148) [Mahdi] +Alias: CCSID01148 +Alias: CP01148 +Alias: ebcdic-international-500+euro + +Name: IBM01149 +MIBenum: 2100 +Source: IBM See (http://www.iana.org/assignments/charset-reg/IBM01149) [Mahdi] +Alias: CCSID01149 +Alias: CP01149 +Alias: ebcdic-is-871+euro + +Name: Big5-HKSCS [Yick] +MIBenum: 2101 +Source: See (http://www.iana.org/assignments/charset-reg/Big5-HKSCS) +Alias: None + +Name: IBM1047 [Robrigado] +MIBenum: 2102 +Source: IBM1047 (EBCDIC Latin 1/Open Systems) +http://www-1.ibm.com/servers/eserver/iseries/software/globalization/pdf/cp01047z.pdf +Alias: IBM-1047 + +Name: PTCP154 [Uskov] +MIBenum: 2103 +Source: See (http://www.iana.org/assignments/charset-reg/PTCP154) +Alias: csPTCP154 +Alias: PT154 +Alias: CP154 +Alias: Cyrillic-Asian + +Name: Amiga-1251 +MIBenum: 2104 +Source: See (http://www.amiga.ultranet.ru/Amiga-1251.html) +Alias: Ami1251 +Alias: Amiga1251 +Alias: Ami-1251 +(Aliases are provided for historical reasons and should not be used) + [Malyshev] + +Name: KOI7-switched +MIBenum: 2105 +Source: See +Aliases: None + +Name: UNICODE-1-1 [RFC1641] +MIBenum: 1010 +Source: RFC 1641 +Alias: csUnicode11 + +Name: SCSU +MIBenum: 1011 +Source: SCSU See (http://www.iana.org/assignments/charset-reg/SCSU) [Scherer] +Alias: None + +Name: UTF-7 [RFC2152] +MIBenum: 1012 +Source: RFC 2152 +Alias: None + +Name: UTF-16BE [RFC2781] +MIBenum: 1013 +Source: RFC 2781 +Alias: None + +Name: UTF-16LE [RFC2781] +MIBenum: 1014 +Source: RFC 2781 +Alias: None + +Name: UTF-16 [RFC2781] +MIBenum: 1015 +Source: RFC 2781 +Alias: None + +Name: CESU-8 [Phipps] +MIBenum: 1016 +Source: +Alias: csCESU-8 + +Name: UTF-32 [Davis] +MIBenum: 1017 +Source: +Alias: None + +Name: UTF-32BE [Davis] +MIBenum: 1018 +Source: +Alias: None + +Name: UTF-32LE [Davis] +MIBenum: 1019 +Source: +Alias: None + +Name: BOCU-1 [Scherer] +MIBenum: 1020 +Source: http://www.unicode.org/notes/tn6/ +Alias: csBOCU-1 + +Name: UNICODE-1-1-UTF-7 [RFC1642] +MIBenum: 103 +Source: RFC 1642 +Alias: csUnicode11UTF7 + +Name: UTF-8 [RFC3629] +MIBenum: 106 +Source: RFC 3629 +Alias: None + +Name: ISO-8859-13 +MIBenum: 109 +Source: ISO See (http://www.iana.org/assignments/charset-reg/iso-8859-13)[Tumasonis] +Alias: None + +Name: ISO-8859-14 +MIBenum: 110 +Source: ISO See (http://www.iana.org/assignments/charset-reg/iso-8859-14) [Simonsen] +Alias: iso-ir-199 +Alias: ISO_8859-14:1998 +Alias: ISO_8859-14 +Alias: latin8 +Alias: iso-celtic +Alias: l8 + +Name: ISO-8859-15 +MIBenum: 111 +Source: ISO + Please see: +Alias: ISO_8859-15 +Alias: Latin-9 + +Name: ISO-8859-16 +MIBenum: 112 +Source: ISO +Alias: iso-ir-226 +Alias: ISO_8859-16:2001 +Alias: ISO_8859-16 +Alias: latin10 +Alias: l10 + +Name: GBK +MIBenum: 113 +Source: Chinese IT Standardization Technical Committee + Please see: +Alias: CP936 +Alias: MS936 +Alias: windows-936 + +Name: GB18030 +MIBenum: 114 +Source: Chinese IT Standardization Technical Committee + Please see: +Alias: None + +Name: OSD_EBCDIC_DF04_15 +MIBenum: 115 +Source: Fujitsu-Siemens standard mainframe EBCDIC encoding + Please see: +Alias: None + +Name: OSD_EBCDIC_DF03_IRV +MIBenum: 116 +Source: Fujitsu-Siemens standard mainframe EBCDIC encoding + Please see: +Alias: None + +Name: OSD_EBCDIC_DF04_1 +MIBenum: 117 +Source: Fujitsu-Siemens standard mainframe EBCDIC encoding + Please see: +Alias: None + +Name: JIS_Encoding +MIBenum: 16 +Source: JIS X 0202-1991. Uses ISO 2022 escape sequences to + shift code sets as documented in JIS X 0202-1991. +Alias: csJISEncoding + +Name: Shift_JIS (preferred MIME name) +MIBenum: 17 +Source: This charset is an extension of csHalfWidthKatakana by + adding graphic characters in JIS X 0208. The CCS's are + JIS X0201:1997 and JIS X0208:1997. The + complete definition is shown in Appendix 1 of JIS + X0208:1997. + This charset can be used for the top-level media type "text". +Alias: MS_Kanji +Alias: csShiftJIS + +Name: Extended_UNIX_Code_Packed_Format_for_Japanese +MIBenum: 18 +Source: Standardized by OSF, UNIX International, and UNIX Systems + Laboratories Pacific. Uses ISO 2022 rules to select + code set 0: US-ASCII (a single 7-bit byte set) + code set 1: JIS X0208-1990 (a double 8-bit byte set) + restricted to A0-FF in both bytes + code set 2: Half Width Katakana (a single 7-bit byte set) + requiring SS2 as the character prefix + code set 3: JIS X0212-1990 (a double 7-bit byte set) + restricted to A0-FF in both bytes + requiring SS3 as the character prefix +Alias: csEUCPkdFmtJapanese +Alias: EUC-JP (preferred MIME name) + +Name: Extended_UNIX_Code_Fixed_Width_for_Japanese +MIBenum: 19 +Source: Used in Japan. Each character is 2 octets. + code set 0: US-ASCII (a single 7-bit byte set) + 1st byte = 00 + 2nd byte = 20-7E + code set 1: JIS X0208-1990 (a double 7-bit byte set) + restricted to A0-FF in both bytes + code set 2: Half Width Katakana (a single 7-bit byte set) + 1st byte = 00 + 2nd byte = A0-FF + code set 3: JIS X0212-1990 (a double 7-bit byte set) + restricted to A0-FF in + the first byte + and 21-7E in the second byte +Alias: csEUCFixWidJapanese + +Name: ISO-10646-UCS-Basic +MIBenum: 1002 +Source: ASCII subset of Unicode. Basic Latin = collection 1 + See ISO 10646, Appendix A +Alias: csUnicodeASCII + +Name: ISO-10646-Unicode-Latin1 +MIBenum: 1003 +Source: ISO Latin-1 subset of Unicode. Basic Latin and Latin-1 + Supplement = collections 1 and 2. See ISO 10646, + Appendix A. See RFC 1815. +Alias: csUnicodeLatin1 +Alias: ISO-10646 + +Name: ISO-10646-J-1 +Source: ISO 10646 Japanese, see RFC 1815. + +Name: ISO-Unicode-IBM-1261 +MIBenum: 1005 +Source: IBM Latin-2, -3, -5, Extended Presentation Set, GCSGID: 1261 +Alias: csUnicodeIBM1261 + +Name: ISO-Unicode-IBM-1268 +MIBenum: 1006 +Source: IBM Latin-4 Extended Presentation Set, GCSGID: 1268 +Alias: csUnicodeIBM1268 + +Name: ISO-Unicode-IBM-1276 +MIBenum: 1007 +Source: IBM Cyrillic Greek Extended Presentation Set, GCSGID: 1276 +Alias: csUnicodeIBM1276 + +Name: ISO-Unicode-IBM-1264 +MIBenum: 1008 +Source: IBM Arabic Presentation Set, GCSGID: 1264 +Alias: csUnicodeIBM1264 + +Name: ISO-Unicode-IBM-1265 +MIBenum: 1009 +Source: IBM Hebrew Presentation Set, GCSGID: 1265 +Alias: csUnicodeIBM1265 + +Name: ISO-8859-1-Windows-3.0-Latin-1 [HP-PCL5] +MIBenum: 2000 +Source: Extended ISO 8859-1 Latin-1 for Windows 3.0. + PCL Symbol Set id: 9U +Alias: csWindows30Latin1 + +Name: ISO-8859-1-Windows-3.1-Latin-1 [HP-PCL5] +MIBenum: 2001 +Source: Extended ISO 8859-1 Latin-1 for Windows 3.1. + PCL Symbol Set id: 19U +Alias: csWindows31Latin1 + +Name: ISO-8859-2-Windows-Latin-2 [HP-PCL5] +MIBenum: 2002 +Source: Extended ISO 8859-2. Latin-2 for Windows 3.1. + PCL Symbol Set id: 9E +Alias: csWindows31Latin2 + +Name: ISO-8859-9-Windows-Latin-5 [HP-PCL5] +MIBenum: 2003 +Source: Extended ISO 8859-9. Latin-5 for Windows 3.1 + PCL Symbol Set id: 5T +Alias: csWindows31Latin5 + +Name: Adobe-Standard-Encoding [Adobe] +MIBenum: 2005 +Source: PostScript Language Reference Manual + PCL Symbol Set id: 10J +Alias: csAdobeStandardEncoding + +Name: Ventura-US [HP-PCL5] +MIBenum: 2006 +Source: Ventura US. ASCII plus characters typically used in + publishing, like pilcrow, copyright, registered, trade mark, + section, dagger, and double dagger in the range A0 (hex) + to FF (hex). + PCL Symbol Set id: 14J +Alias: csVenturaUS + +Name: Ventura-International [HP-PCL5] +MIBenum: 2007 +Source: Ventura International. ASCII plus coded characters similar + to Roman8. + PCL Symbol Set id: 13J +Alias: csVenturaInternational + +Name: PC8-Danish-Norwegian [HP-PCL5] +MIBenum: 2012 +Source: PC Danish Norwegian + 8-bit PC set for Danish Norwegian + PCL Symbol Set id: 11U +Alias: csPC8DanishNorwegian + +Name: PC8-Turkish [HP-PCL5] +MIBenum: 2014 +Source: PC Latin Turkish. PCL Symbol Set id: 9T +Alias: csPC8Turkish + +Name: IBM-Symbols [IBM-CIDT] +MIBenum: 2015 +Source: Presentation Set, CPGID: 259 +Alias: csIBMSymbols + +Name: IBM-Thai [IBM-CIDT] +MIBenum: 2016 +Source: Presentation Set, CPGID: 838 +Alias: csIBMThai + +Name: HP-Legal [HP-PCL5] +MIBenum: 2017 +Source: PCL 5 Comparison Guide, Hewlett-Packard, + HP part number 5961-0510, October 1992 + PCL Symbol Set id: 1U +Alias: csHPLegal + +Name: HP-Pi-font [HP-PCL5] +MIBenum: 2018 +Source: PCL 5 Comparison Guide, Hewlett-Packard, + HP part number 5961-0510, October 1992 + PCL Symbol Set id: 15U +Alias: csHPPiFont + +Name: HP-Math8 [HP-PCL5] +MIBenum: 2019 +Source: PCL 5 Comparison Guide, Hewlett-Packard, + HP part number 5961-0510, October 1992 + PCL Symbol Set id: 8M +Alias: csHPMath8 + +Name: Adobe-Symbol-Encoding [Adobe] +MIBenum: 2020 +Source: PostScript Language Reference Manual + PCL Symbol Set id: 5M +Alias: csHPPSMath + +Name: HP-DeskTop [HP-PCL5] +MIBenum: 2021 +Source: PCL 5 Comparison Guide, Hewlett-Packard, + HP part number 5961-0510, October 1992 + PCL Symbol Set id: 7J +Alias: csHPDesktop + +Name: Ventura-Math [HP-PCL5] +MIBenum: 2022 +Source: PCL 5 Comparison Guide, Hewlett-Packard, + HP part number 5961-0510, October 1992 + PCL Symbol Set id: 6M +Alias: csVenturaMath + +Name: Microsoft-Publishing [HP-PCL5] +MIBenum: 2023 +Source: PCL 5 Comparison Guide, Hewlett-Packard, + HP part number 5961-0510, October 1992 + PCL Symbol Set id: 6J +Alias: csMicrosoftPublishing + +Name: Windows-31J +MIBenum: 2024 +Source: Windows Japanese. A further extension of Shift_JIS + to include NEC special characters (Row 13), NEC + selection of IBM extensions (Rows 89 to 92), and IBM + extensions (Rows 115 to 119). The CCS's are + JIS X0201:1997, JIS X0208:1997, and these extensions. + This charset can be used for the top-level media type "text", + but it is of limited or specialized use (see RFC2278). + PCL Symbol Set id: 19K +Alias: csWindows31J + +Name: GB2312 (preferred MIME name) +MIBenum: 2025 +Source: Chinese for People's Republic of China (PRC) mixed one byte, + two byte set: + 20-7E = one byte ASCII + A1-FE = two byte PRC Kanji + See GB 2312-80 + PCL Symbol Set Id: 18C +Alias: csGB2312 + +Name: Big5 (preferred MIME name) +MIBenum: 2026 +Source: Chinese for Taiwan Multi-byte set. + PCL Symbol Set Id: 18T +Alias: csBig5 + +Name: windows-1250 +MIBenum: 2250 +Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1250) [Lazhintseva] +Alias: None + +Name: windows-1251 +MIBenum: 2251 +Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1251) [Lazhintseva] +Alias: None + +Name: windows-1252 +MIBenum: 2252 +Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1252) [Wendt] +Alias: None + +Name: windows-1253 +MIBenum: 2253 +Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1253) [Lazhintseva] +Alias: None + +Name: windows-1254 +MIBenum: 2254 +Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1254) [Lazhintseva] +Alias: None + +Name: windows-1255 +MIBenum: 2255 +Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1255) [Lazhintseva] +Alias: None + +Name: windows-1256 +MIBenum: 2256 +Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1256) [Lazhintseva] +Alias: None + +Name: windows-1257 +MIBenum: 2257 +Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1257) [Lazhintseva] +Alias: None + +Name: windows-1258 +MIBenum: 2258 +Source: Microsoft (http://www.iana.org/assignments/charset-reg/windows-1258) [Lazhintseva] +Alias: None + +Name: TIS-620 +MIBenum: 2259 +Source: Thai Industrial Standards Institute (TISI) [Tantsetthi] + +Name: HZ-GB-2312 +MIBenum: 2085 +Source: RFC 1842, RFC 1843 [RFC1842, RFC1843] + + +REFERENCES +---------- + +[RFC1345] Simonsen, K., "Character Mnemonics & Character Sets", + RFC 1345, Rationel Almen Planlaegning, Rationel Almen + Planlaegning, June 1992. + +[RFC1428] Vaudreuil, G., "Transition of Internet Mail from + Just-Send-8 to 8bit-SMTP/MIME", RFC1428, CNRI, February + 1993. + +[RFC1456] Vietnamese Standardization Working Group, "Conventions for + Encoding the Vietnamese Language VISCII: VIetnamese + Standard Code for Information Interchange VIQR: VIetnamese + Quoted-Readable Specification Revision 1.1", RFC 1456, May + 1993. + +[RFC1468] Murai, J., Crispin, M., and E. van der Poel, "Japanese + Character Encoding for Internet Messages", RFC 1468, + Keio University, Panda Programming, June 1993. + +[RFC1489] Chernov, A., "Registration of a Cyrillic Character Set", + RFC1489, RELCOM Development Team, July 1993. + +[RFC1554] Ohta, M., and K. Handa, "ISO-2022-JP-2: Multilingual + Extension of ISO-2022-JP", RFC1554, Tokyo Institute of + Technology, ETL, December 1993. + +[RFC1556] Nussbacher, H., "Handling of Bi-directional Texts in MIME", + RFC1556, Israeli Inter-University, December 1993. + +[RFC1557] Choi, U., Chon, K., and H. Park, "Korean Character Encoding + for Internet Messages", KAIST, Solvit Chosun Media, + December 1993. + +[RFC1641] Goldsmith, D., and M. Davis, "Using Unicode with MIME", + RFC1641, Taligent, Inc., July 1994. + +[RFC1642] Goldsmith, D., and M. Davis, "UTF-7", RFC1642, Taligent, + Inc., July 1994. + +[RFC1815] Ohta, M., "Character Sets ISO-10646 and ISO-10646-J-1", + RFC 1815, Tokyo Institute of Technology, July 1995. + + +[Adobe] Adobe Systems Incorporated, PostScript Language Reference + Manual, second edition, Addison-Wesley Publishing Company, + Inc., 1990. + +[ECMA Registry] ISO-IR: International Register of Escape Sequences + http://www.itscj.ipsj.or.jp/ISO-IE/ Note: The current + registration authority is IPSJ/ITSCJ, Japan. + +[HP-PCL5] Hewlett-Packard Company, "HP PCL 5 Comparison Guide", + (P/N 5021-0329) pp B-13, 1996. + +[IBM-CIDT] IBM Corporation, "ABOUT TYPE: IBM's Technical Reference + for Core Interchange Digitized Type", Publication number + S544-3708-01 + +[RFC1842] Wei, Y., J. Li, and Y. Jiang, "ASCII Printable + Characters-Based Chinese Character Encoding for Internet + Messages", RFC 1842, Harvard University, Rice University, + University of Maryland, August 1995. + +[RFC1843] Lee, F., "HZ - A Data Format for Exchanging Files of + Arbitrarily Mixed Chinese and ASCII Characters", RFC 1843, + Stanford University, August 1995. + +[RFC2152] Goldsmith, D., M. Davis, "UTF-7: A Mail-Safe Transformation + Format of Unicode", RFC 2152, Apple Computer, Inc., + Taligent Inc., May 1997. + +[RFC2279] Yergeau, F., "UTF-8, A Transformation Format of ISO 10646", + RFC 2279, Alis Technologies, January, 1998. + +[RFC2781] Hoffman, P., Yergeau, F., "UTF-16, an encoding of ISO 10646", + RFC 2781, February 2000. + +[RFC3629] Yergeau, F., "UTF-8, a transformation format of ISO 10646", + RFC3629, November 2003. + +PEOPLE +------ + +[KXS2] Keld Simonsen + +[Choi] Woohyong Choi + +[Davis] Mark Davis, , April 2002. + +[Lazhintseva] Katya Lazhintseva, , May 1996. + +[Mahdi] Tamer Mahdi, , August 2000. + +[Malyshev] Michael Malyshev, , January 2004 + +[Murai] Jun Murai + +[Nussbacher] Hank Nussbacher, + +[Ohta] Masataka Ohta, , July 1995. + +[Phipps] Toby Phipps, , March 2002. + +[Pond] Rick Pond, , March 1997. + +[Robrigado] Reuel Robrigado, , September 2002. + +[Scherer] Markus Scherer, , August 2000, + September 2002. + +[Simonsen] Keld Simonsen, , August 2000. + +[Tantsetthi] Trin Tantsetthi, , September 1998. + +[Tumasonis] Vladas Tumasonis, , August 2000. + +[Uskov] Alexander Uskov, , September 2002. + +[Wendt] Chris Wendt, , December 1999. + +[Yick] Nicky Yick, , October 2000. + +[] + + + + + + + diff --git a/src/libs/freetype2/gzip/adler32.c b/src/libs/freetype2/gzip/adler32.c index c53f9dd125..b698f8a328 100644 --- a/src/libs/freetype2/gzip/adler32.c +++ b/src/libs/freetype2/gzip/adler32.c @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id$ */ +/* @(#) $Id: adler32.c 21879 2007-08-09 21:33:28Z korli $ */ #include "zlib.h" diff --git a/src/libs/freetype2/gzip/zconf.h b/src/libs/freetype2/gzip/zconf.h index 3abf0ba03b..e7ab131c57 100644 --- a/src/libs/freetype2/gzip/zconf.h +++ b/src/libs/freetype2/gzip/zconf.h @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id$ */ +/* @(#) $Id: zconf.h 33650 2009-10-19 07:03:46Z scottmc $ */ #ifndef _ZCONF_H #define _ZCONF_H diff --git a/src/libs/freetype2/gzip/zutil.c b/src/libs/freetype2/gzip/zutil.c index 7ad0c1f81b..00de7fb3dc 100644 --- a/src/libs/freetype2/gzip/zutil.c +++ b/src/libs/freetype2/gzip/zutil.c @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id$ */ +/* @(#) $Id: zutil.c 33650 2009-10-19 07:03:46Z scottmc $ */ #include "zutil.h" diff --git a/src/libs/freetype2/gzip/zutil.h b/src/libs/freetype2/gzip/zutil.h index c9688cd9c0..8f25aa2cae 100644 --- a/src/libs/freetype2/gzip/zutil.h +++ b/src/libs/freetype2/gzip/zutil.h @@ -8,7 +8,7 @@ subject to change. Applications should only use zlib.h. */ -/* @(#) $Id$ */ +/* @(#) $Id: zutil.h 21879 2007-08-09 21:33:28Z korli $ */ #ifndef _Z_UTIL_H #define _Z_UTIL_H diff --git a/src/libs/pdflib/Makefile b/src/libs/pdflib/Makefile index 5be37dfd6b..c71388826e 100644 --- a/src/libs/pdflib/Makefile +++ b/src/libs/pdflib/Makefile @@ -1,5 +1,5 @@ # Main PDFlib Makefile -# $Id$ +# $Id: Makefile 14574 2005-10-29 16:27:43Z bonefish $ top_builddir=. diff --git a/src/libs/pdflib/bind/Makefile b/src/libs/pdflib/bind/Makefile index 53912bc676..cb8e8a7212 100644 --- a/src/libs/pdflib/bind/Makefile +++ b/src/libs/pdflib/bind/Makefile @@ -1,5 +1,5 @@ # PDFlib bindings Makefile -# $Id$ +# $Id: Makefile 14574 2005-10-29 16:27:43Z bonefish $ include ../config/mkcommon.inc diff --git a/src/libs/pdflib/bind/pdflib/Makefile b/src/libs/pdflib/bind/pdflib/Makefile index 4720ce7624..eed33a2e4d 100644 --- a/src/libs/pdflib/bind/pdflib/Makefile +++ b/src/libs/pdflib/bind/pdflib/Makefile @@ -1,5 +1,5 @@ # PDFlib bindings Makefile -# $Id$ +# $Id: Makefile 14574 2005-10-29 16:27:43Z bonefish $ include ../../config/mkcommon.inc diff --git a/src/libs/pdflib/bind/pdflib/c/Makefile b/src/libs/pdflib/bind/pdflib/c/Makefile index 5a2279b953..9c6da97993 100644 --- a/src/libs/pdflib/bind/pdflib/c/Makefile +++ b/src/libs/pdflib/bind/pdflib/c/Makefile @@ -1,5 +1,5 @@ # Makefile for PDFlib C samples, C language binding -# $Id$ +# $Id: Makefile 14574 2005-10-29 16:27:43Z bonefish $ top_builddir = ../../.. diff --git a/src/libs/pdflib/bind/pdflib/c/businesscard.c b/src/libs/pdflib/bind/pdflib/c/businesscard.c index b349266fab..a8a4590c11 100644 --- a/src/libs/pdflib/bind/pdflib/c/businesscard.c +++ b/src/libs/pdflib/bind/pdflib/c/businesscard.c @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: businesscard.c 14574 2005-10-29 16:27:43Z bonefish $ * PDFlib client: block processing example in C * */ diff --git a/src/libs/pdflib/bind/pdflib/c/chartab.c b/src/libs/pdflib/bind/pdflib/c/chartab.c index 080abf5348..7ae853c6a7 100644 --- a/src/libs/pdflib/bind/pdflib/c/chartab.c +++ b/src/libs/pdflib/bind/pdflib/c/chartab.c @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: chartab.c 14574 2005-10-29 16:27:43Z bonefish $ * PDFlib client: character table in C * */ diff --git a/src/libs/pdflib/bind/pdflib/c/chartab.dsp b/src/libs/pdflib/bind/pdflib/c/chartab.dsp index c59f7b4cee..f3da7ae7cf 100644 --- a/src/libs/pdflib/bind/pdflib/c/chartab.dsp +++ b/src/libs/pdflib/bind/pdflib/c/chartab.dsp @@ -1,107 +1,107 @@ -# Microsoft Developer Studio Project File - Name="chartab" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=chartab - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "chartab.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "chartab.mak" CFG="chartab - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "chartab - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "chartab - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "chartab - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MT /W3 /O2 /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_MT" /YX /FD /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /debug /machine:I386 /out:"chartab.exe" /pdbtype:sept /libpath:"..\..\..\libs\pdflib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\libs\pdflib\Release" /libpath:"..\..\pdflib" -# SUBTRACT LINK32 /debug - -!ELSEIF "$(CFG)" == "chartab - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /O2 /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_MT" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "PDFLIB_STATIC" /D "_MT" /FR /YX /FD /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /machine:I386 /out:"chartab.exe" /pdbtype:sept /libpath:"..\..\..\libs\pdflib" -# SUBTRACT BASE LINK32 /debug -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libs\pdflib\Debug" /libpath:"..\..\pdflib" -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "chartab - Win32 Release" -# Name "chartab - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\chartab.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="chartab" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=chartab - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "chartab.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "chartab.mak" CFG="chartab - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "chartab - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "chartab - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "chartab - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MT /W3 /O2 /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_MT" /YX /FD /c +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /debug /machine:I386 /out:"chartab.exe" /pdbtype:sept /libpath:"..\..\..\libs\pdflib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\libs\pdflib\Release" /libpath:"..\..\pdflib" +# SUBTRACT LINK32 /debug + +!ELSEIF "$(CFG)" == "chartab - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /O2 /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_MT" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "PDFLIB_STATIC" /D "_MT" /FR /YX /FD /c +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /machine:I386 /out:"chartab.exe" /pdbtype:sept /libpath:"..\..\..\libs\pdflib" +# SUBTRACT BASE LINK32 /debug +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libs\pdflib\Debug" /libpath:"..\..\pdflib" +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "chartab - Win32 Release" +# Name "chartab - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\chartab.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/src/libs/pdflib/bind/pdflib/c/hello.c b/src/libs/pdflib/bind/pdflib/c/hello.c index 52b1d76cb8..5dd9da074c 100644 --- a/src/libs/pdflib/bind/pdflib/c/hello.c +++ b/src/libs/pdflib/bind/pdflib/c/hello.c @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: hello.c 14574 2005-10-29 16:27:43Z bonefish $ * PDFlib client: hello example in C * */ diff --git a/src/libs/pdflib/bind/pdflib/c/hello.dsp b/src/libs/pdflib/bind/pdflib/c/hello.dsp index 5f203c38f7..9c166e28d8 100644 --- a/src/libs/pdflib/bind/pdflib/c/hello.dsp +++ b/src/libs/pdflib/bind/pdflib/c/hello.dsp @@ -1,107 +1,107 @@ -# Microsoft Developer Studio Project File - Name="hello" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=hello - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "hello.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "hello.mak" CFG="hello - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "hello - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "hello - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "hello - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MT /W3 /O2 /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_MT" /YX /FD /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /debug /machine:I386 /out:"hello.exe" /pdbtype:sept /libpath:"..\..\..\libs\pdflib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\libs\pdflib\Release" /libpath:"..\..\pdflib" -# SUBTRACT LINK32 /debug - -!ELSEIF "$(CFG)" == "hello - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /O2 /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_MT" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "PDFLIB_STATIC" /D "_MT" /FR /YX /FD /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /machine:I386 /out:"hello.exe" /pdbtype:sept /libpath:"..\..\..\libs\pdflib" -# SUBTRACT BASE LINK32 /debug -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libs\pdflib\Debug" /libpath:"..\..\pdflib" -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "hello - Win32 Release" -# Name "hello - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\hello.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="hello" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=hello - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "hello.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "hello.mak" CFG="hello - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "hello - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "hello - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "hello - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MT /W3 /O2 /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_MT" /YX /FD /c +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /debug /machine:I386 /out:"hello.exe" /pdbtype:sept /libpath:"..\..\..\libs\pdflib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\libs\pdflib\Release" /libpath:"..\..\pdflib" +# SUBTRACT LINK32 /debug + +!ELSEIF "$(CFG)" == "hello - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /O2 /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_MT" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "PDFLIB_STATIC" /D "_MT" /FR /YX /FD /c +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /machine:I386 /out:"hello.exe" /pdbtype:sept /libpath:"..\..\..\libs\pdflib" +# SUBTRACT BASE LINK32 /debug +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libs\pdflib\Debug" /libpath:"..\..\pdflib" +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "hello - Win32 Release" +# Name "hello - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\hello.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/src/libs/pdflib/bind/pdflib/c/hellodl.c b/src/libs/pdflib/bind/pdflib/c/hellodl.c index 83070f7bbc..7c64ea05bb 100644 --- a/src/libs/pdflib/bind/pdflib/c/hellodl.c +++ b/src/libs/pdflib/bind/pdflib/c/hellodl.c @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: hellodl.c 14574 2005-10-29 16:27:43Z bonefish $ * PDFlib client: hello example in C with dynamic DLL loading * */ diff --git a/src/libs/pdflib/bind/pdflib/c/image.c b/src/libs/pdflib/bind/pdflib/c/image.c index b50a2d4828..51abce7bbf 100644 --- a/src/libs/pdflib/bind/pdflib/c/image.c +++ b/src/libs/pdflib/bind/pdflib/c/image.c @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: image.c 14574 2005-10-29 16:27:43Z bonefish $ * PDFlib client: image example in C * */ diff --git a/src/libs/pdflib/bind/pdflib/c/invoice.c b/src/libs/pdflib/bind/pdflib/c/invoice.c index 5619607356..e5bf97e532 100644 --- a/src/libs/pdflib/bind/pdflib/c/invoice.c +++ b/src/libs/pdflib/bind/pdflib/c/invoice.c @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: invoice.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib/PDI client: invoice generation demo */ diff --git a/src/libs/pdflib/bind/pdflib/c/invoice.dsp b/src/libs/pdflib/bind/pdflib/c/invoice.dsp index 51513f7d35..f1a61499f0 100644 --- a/src/libs/pdflib/bind/pdflib/c/invoice.dsp +++ b/src/libs/pdflib/bind/pdflib/c/invoice.dsp @@ -1,107 +1,107 @@ -# Microsoft Developer Studio Project File - Name="invoice" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=invoice - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "invoice.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "invoice.mak" CFG="invoice - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "invoice - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "invoice - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "invoice - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MT /W3 /O2 /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_MT" /YX /FD /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /debug /machine:I386 /out:"invoice.exe" /pdbtype:sept /libpath:"..\..\..\libs\pdflib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\libs\pdflib\Release" /libpath:"..\..\pdflib" -# SUBTRACT LINK32 /debug - -!ELSEIF "$(CFG)" == "invoice - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /O2 /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_MT" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "PDFLIB_STATIC" /D "_MT" /FR /YX /FD /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /machine:I386 /out:"invoice.exe" /pdbtype:sept /libpath:"..\..\..\libs\pdflib" -# SUBTRACT BASE LINK32 /debug -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libs\pdflib\Debug" /libpath:"..\..\pdflib" -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "invoice - Win32 Release" -# Name "invoice - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\invoice.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="invoice" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=invoice - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "invoice.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "invoice.mak" CFG="invoice - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "invoice - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "invoice - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "invoice - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MT /W3 /O2 /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_MT" /YX /FD /c +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /debug /machine:I386 /out:"invoice.exe" /pdbtype:sept /libpath:"..\..\..\libs\pdflib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\libs\pdflib\Release" /libpath:"..\..\pdflib" +# SUBTRACT LINK32 /debug + +!ELSEIF "$(CFG)" == "invoice - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /O2 /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_MT" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "PDFLIB_STATIC" /D "_MT" /FR /YX /FD /c +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /machine:I386 /out:"invoice.exe" /pdbtype:sept /libpath:"..\..\..\libs\pdflib" +# SUBTRACT BASE LINK32 /debug +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libs\pdflib\Debug" /libpath:"..\..\pdflib" +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "invoice - Win32 Release" +# Name "invoice - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\invoice.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/src/libs/pdflib/bind/pdflib/c/pdfclock.c b/src/libs/pdflib/bind/pdflib/c/pdfclock.c index 4ed88ecc31..be873c4839 100644 --- a/src/libs/pdflib/bind/pdflib/c/pdfclock.c +++ b/src/libs/pdflib/bind/pdflib/c/pdfclock.c @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: pdfclock.c 14574 2005-10-29 16:27:43Z bonefish $ * A little PDFlib application to draw an analog clock. * */ diff --git a/src/libs/pdflib/bind/pdflib/c/pdflibdl.c b/src/libs/pdflib/bind/pdflib/c/pdflibdl.c index f87c194e92..47092cb2c0 100644 --- a/src/libs/pdflib/bind/pdflib/c/pdflibdl.c +++ b/src/libs/pdflib/bind/pdflib/c/pdflibdl.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pdflibdl.c 14574 2005-10-29 16:27:43Z bonefish $ * * C wrapper code for dynamically loading the PDFlib DLL at runtime. * diff --git a/src/libs/pdflib/bind/pdflib/c/pdflibdl.h b/src/libs/pdflib/bind/pdflib/c/pdflibdl.h index ec3a574206..dc706b40d9 100644 --- a/src/libs/pdflib/bind/pdflib/c/pdflibdl.h +++ b/src/libs/pdflib/bind/pdflib/c/pdflibdl.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pdflibdl.h 14574 2005-10-29 16:27:43Z bonefish $ * * Function prototypes for dynamically loading the PDFlib DLL at runtime * diff --git a/src/libs/pdflib/bind/pdflib/c/quickreference.c b/src/libs/pdflib/bind/pdflib/c/quickreference.c index fa8373c5f3..d4f2613eb4 100644 --- a/src/libs/pdflib/bind/pdflib/c/quickreference.c +++ b/src/libs/pdflib/bind/pdflib/c/quickreference.c @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: quickreference.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib/PDI client: mini imposition demo */ diff --git a/src/libs/pdflib/bind/pdflib/c/quickreference.dsp b/src/libs/pdflib/bind/pdflib/c/quickreference.dsp index 0b5585ad7a..7224c57051 100644 --- a/src/libs/pdflib/bind/pdflib/c/quickreference.dsp +++ b/src/libs/pdflib/bind/pdflib/c/quickreference.dsp @@ -1,107 +1,107 @@ -# Microsoft Developer Studio Project File - Name="quickreference" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=quickreference - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "quickreference.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "quickreference.mak" CFG="quickreference - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "quickreference - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "quickreference - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "quickreference - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MT /W3 /O2 /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_MT" /YX /FD /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /debug /machine:I386 /out:"quickreference.exe" /pdbtype:sept /libpath:"..\..\..\libs\pdflib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\libs\pdflib\Release" /libpath:"..\..\pdflib" -# SUBTRACT LINK32 /debug - -!ELSEIF "$(CFG)" == "quickreference - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /O2 /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_MT" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "PDFLIB_STATIC" /D "_MT" /FR /YX /FD /c -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /machine:I386 /out:"quickreference.exe" /pdbtype:sept /libpath:"..\..\..\libs\pdflib" -# SUBTRACT BASE LINK32 /debug -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libs\pdflib\Debug" /libpath:"..\..\pdflib" -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "quickreference - Win32 Release" -# Name "quickreference - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\quickreference.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="quickreference" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=quickreference - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "quickreference.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "quickreference.mak" CFG="quickreference - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "quickreference - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "quickreference - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "quickreference - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MT /W3 /O2 /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_MT" /YX /FD /c +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /debug /machine:I386 /out:"quickreference.exe" /pdbtype:sept /libpath:"..\..\..\libs\pdflib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /pdb:none /machine:I386 /libpath:"..\..\..\libs\pdflib\Release" /libpath:"..\..\pdflib" +# SUBTRACT LINK32 /debug + +!ELSEIF "$(CFG)" == "quickreference - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /O2 /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "_MT" /YX /FD /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../libs/pdflib" /I "../../pdflib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "PDFLIB_STATIC" /D "_MT" /FR /YX /FD /c +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /machine:I386 /out:"quickreference.exe" /pdbtype:sept /libpath:"..\..\..\libs\pdflib" +# SUBTRACT BASE LINK32 /debug +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\libs\pdflib\Debug" /libpath:"..\..\pdflib" +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "quickreference - Win32 Release" +# Name "quickreference - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\quickreference.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/src/libs/pdflib/bind/pdflib/cpp/Makefile b/src/libs/pdflib/bind/pdflib/cpp/Makefile index 7bfe5be59c..f13745cb29 100644 --- a/src/libs/pdflib/bind/pdflib/cpp/Makefile +++ b/src/libs/pdflib/bind/pdflib/cpp/Makefile @@ -1,5 +1,5 @@ # Makefile for PDFlib, C++ language binding -# $Id$ +# $Id: Makefile 14574 2005-10-29 16:27:43Z bonefish $ top_builddir = ../../.. diff --git a/src/libs/pdflib/bind/pdflib/cpp/businesscard.cpp b/src/libs/pdflib/bind/pdflib/cpp/businesscard.cpp index b7787f4585..31885266f4 100644 --- a/src/libs/pdflib/bind/pdflib/cpp/businesscard.cpp +++ b/src/libs/pdflib/bind/pdflib/cpp/businesscard.cpp @@ -1,4 +1,4 @@ -// $Id$ +// $Id: businesscard.cpp 14574 2005-10-29 16:27:43Z bonefish $ // PDFlib client: hello example in C++ // // diff --git a/src/libs/pdflib/bind/pdflib/cpp/chartab.cpp b/src/libs/pdflib/bind/pdflib/cpp/chartab.cpp index 2f74ca5711..665ddcd80d 100644 --- a/src/libs/pdflib/bind/pdflib/cpp/chartab.cpp +++ b/src/libs/pdflib/bind/pdflib/cpp/chartab.cpp @@ -1,4 +1,4 @@ -// $Id$ +// $Id: chartab.cpp 14574 2005-10-29 16:27:43Z bonefish $ // PDFlib client: chartab example in C++ // // diff --git a/src/libs/pdflib/bind/pdflib/cpp/hello.cpp b/src/libs/pdflib/bind/pdflib/cpp/hello.cpp index ca04a1e4e2..c19e370883 100644 --- a/src/libs/pdflib/bind/pdflib/cpp/hello.cpp +++ b/src/libs/pdflib/bind/pdflib/cpp/hello.cpp @@ -1,4 +1,4 @@ -// $Id$ +// $Id: hello.cpp 14574 2005-10-29 16:27:43Z bonefish $ // PDFlib client: hello example in C++ // // diff --git a/src/libs/pdflib/bind/pdflib/cpp/image.cpp b/src/libs/pdflib/bind/pdflib/cpp/image.cpp index 3949281def..3d6ba46970 100644 --- a/src/libs/pdflib/bind/pdflib/cpp/image.cpp +++ b/src/libs/pdflib/bind/pdflib/cpp/image.cpp @@ -1,4 +1,4 @@ -// $Id$ +// $Id: image.cpp 14574 2005-10-29 16:27:43Z bonefish $ // PDFlib client: image example in C++ // // diff --git a/src/libs/pdflib/bind/pdflib/cpp/invoice.cpp b/src/libs/pdflib/bind/pdflib/cpp/invoice.cpp index 27bf2932c2..b032fa4213 100644 --- a/src/libs/pdflib/bind/pdflib/cpp/invoice.cpp +++ b/src/libs/pdflib/bind/pdflib/cpp/invoice.cpp @@ -1,4 +1,4 @@ -// $Id$ +// $Id: invoice.cpp 14574 2005-10-29 16:27:43Z bonefish $ // PDFlib client: invoice example in C++ // // diff --git a/src/libs/pdflib/bind/pdflib/cpp/pdfclock.cpp b/src/libs/pdflib/bind/pdflib/cpp/pdfclock.cpp index 84e7cba8e7..8475aaea9c 100644 --- a/src/libs/pdflib/bind/pdflib/cpp/pdfclock.cpp +++ b/src/libs/pdflib/bind/pdflib/cpp/pdfclock.cpp @@ -1,4 +1,4 @@ -// $Id$ +// $Id: pdfclock.cpp 14574 2005-10-29 16:27:43Z bonefish $ // A little PDFlib application to draw an analog clock. // // diff --git a/src/libs/pdflib/bind/pdflib/cpp/pdflib.cpp b/src/libs/pdflib/bind/pdflib/cpp/pdflib.cpp index 370e09e045..3e12e0e25b 100644 --- a/src/libs/pdflib/bind/pdflib/cpp/pdflib.cpp +++ b/src/libs/pdflib/bind/pdflib/cpp/pdflib.cpp @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -// $Id$ +// $Id: pdflib.cpp 14574 2005-10-29 16:27:43Z bonefish $ // // in sync with pdflib.h 1.151.2.22 // diff --git a/src/libs/pdflib/bind/pdflib/cpp/pdflib.hpp b/src/libs/pdflib/bind/pdflib/cpp/pdflib.hpp index 0aeb70f759..a3a47faa78 100644 --- a/src/libs/pdflib/bind/pdflib/cpp/pdflib.hpp +++ b/src/libs/pdflib/bind/pdflib/cpp/pdflib.hpp @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -// $Id$ +// $Id: pdflib.hpp 14574 2005-10-29 16:27:43Z bonefish $ // // in sync with pdflib.h 1.151.2.22 // diff --git a/src/libs/pdflib/bind/pdflib/cpp/quickreference.cpp b/src/libs/pdflib/bind/pdflib/cpp/quickreference.cpp index c7f8312320..b3c95573dc 100644 --- a/src/libs/pdflib/bind/pdflib/cpp/quickreference.cpp +++ b/src/libs/pdflib/bind/pdflib/cpp/quickreference.cpp @@ -1,4 +1,4 @@ -// $Id$ +// $Id: quickreference.cpp 14574 2005-10-29 16:27:43Z bonefish $ // // PDFlib/PDI client: mini imposition demo // diff --git a/src/libs/pdflib/bind/pdflib/java/Java.dsp b/src/libs/pdflib/bind/pdflib/java/Java.dsp index 0a19b8d10e..26b3994958 100644 --- a/src/libs/pdflib/bind/pdflib/java/Java.dsp +++ b/src/libs/pdflib/bind/pdflib/java/Java.dsp @@ -1,76 +1,76 @@ -# Microsoft Developer Studio Project File - Name="Java" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=Java - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Java.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Java.mak" CFG="Java - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Java - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Java___Win32_Release" -# PROP BASE Intermediate_Dir "Java___Win32_Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /Gz /MT /W3 /O2 /I "c:\jdk1.3\include" /I "c:\jdk1.3\include\win32" /I "..\..\..\libs\pdflib" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"pdf_java.dll" /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /base:"0x55320000" /dll /pdb:none /machine:I386 /out:"pdf_java.dll" /libpath:"..\..\..\libs\pdflib\Release" -# SUBTRACT LINK32 /map /debug -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Desc=Creating jar file and documentation... -PostBuild_Cmds=c:\jdk1.3\bin\javac PDFlibException.java pdflib.java rmdir /s /q com mkdir com\pdflib copy pdflib.class com\pdflib copy PDFlibException.class com\pdflib c:\jdk1.3\bin\jar cvf pdflib.jar com/pdflib/PDFlibException.class com/pdflib/pdflib.class rmdir /s /q javadoc mkdir javadoc c:\jdk1.3\bin\javadoc -notree -author -version -d javadoc -public pdflib.java -# End Special Build Tool -# Begin Target - -# Name "Java - Win32 Release" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\pdflib_java.c -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="Java" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=Java - Win32 Release +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "Java.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "Java.mak" CFG="Java - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "Java - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Java___Win32_Release" +# PROP BASE Intermediate_Dir "Java___Win32_Release" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /Gz /MT /W3 /O2 /I "c:\jdk1.3\include" /I "c:\jdk1.3\include\win32" /I "..\..\..\libs\pdflib" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"pdf_java.dll" /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib pdflib.lib /nologo /base:"0x55320000" /dll /pdb:none /machine:I386 /out:"pdf_java.dll" /libpath:"..\..\..\libs\pdflib\Release" +# SUBTRACT LINK32 /map /debug +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=Creating jar file and documentation... +PostBuild_Cmds=c:\jdk1.3\bin\javac PDFlibException.java pdflib.java rmdir /s /q com mkdir com\pdflib copy pdflib.class com\pdflib copy PDFlibException.class com\pdflib c:\jdk1.3\bin\jar cvf pdflib.jar com/pdflib/PDFlibException.class com/pdflib/pdflib.class rmdir /s /q javadoc mkdir javadoc c:\jdk1.3\bin\javadoc -notree -author -version -d javadoc -public pdflib.java +# End Special Build Tool +# Begin Target + +# Name "Java - Win32 Release" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\pdflib_java.c +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/src/libs/pdflib/bind/pdflib/java/Makefile b/src/libs/pdflib/bind/pdflib/java/Makefile index e856cda55b..8f3a6cbc6e 100644 --- a/src/libs/pdflib/bind/pdflib/java/Makefile +++ b/src/libs/pdflib/bind/pdflib/java/Makefile @@ -1,5 +1,5 @@ # Makefile for PDFlib's Java binding -# $Id$ +# $Id: Makefile 14574 2005-10-29 16:27:43Z bonefish $ top_builddir = ../../.. diff --git a/src/libs/pdflib/bind/pdflib/java/PDFlibException.java b/src/libs/pdflib/bind/pdflib/java/PDFlibException.java index 6ee50aa3b2..ebd861d4fe 100644 --- a/src/libs/pdflib/bind/pdflib/java/PDFlibException.java +++ b/src/libs/pdflib/bind/pdflib/java/PDFlibException.java @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: PDFlibException.java 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlibException Java class */ diff --git a/src/libs/pdflib/bind/pdflib/java/businesscard.java b/src/libs/pdflib/bind/pdflib/java/businesscard.java index 89e7c38f36..035cfc3412 100644 --- a/src/libs/pdflib/bind/pdflib/java/businesscard.java +++ b/src/libs/pdflib/bind/pdflib/java/businesscard.java @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: businesscard.java 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib client: hello example in Java */ diff --git a/src/libs/pdflib/bind/pdflib/java/chartab.java b/src/libs/pdflib/bind/pdflib/java/chartab.java index 79724c999a..a999d2446d 100644 --- a/src/libs/pdflib/bind/pdflib/java/chartab.java +++ b/src/libs/pdflib/bind/pdflib/java/chartab.java @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: chartab.java 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib client: character table */ diff --git a/src/libs/pdflib/bind/pdflib/java/hello.java b/src/libs/pdflib/bind/pdflib/java/hello.java index 8dd361b41e..b239a65aab 100644 --- a/src/libs/pdflib/bind/pdflib/java/hello.java +++ b/src/libs/pdflib/bind/pdflib/java/hello.java @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: hello.java 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib client: hello example in Java */ diff --git a/src/libs/pdflib/bind/pdflib/java/image.java b/src/libs/pdflib/bind/pdflib/java/image.java index 633736b5cb..4734aa6cc1 100644 --- a/src/libs/pdflib/bind/pdflib/java/image.java +++ b/src/libs/pdflib/bind/pdflib/java/image.java @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: image.java 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib client: image example in Java */ diff --git a/src/libs/pdflib/bind/pdflib/java/invoice.java b/src/libs/pdflib/bind/pdflib/java/invoice.java index ff5dd238c2..af119d794c 100644 --- a/src/libs/pdflib/bind/pdflib/java/invoice.java +++ b/src/libs/pdflib/bind/pdflib/java/invoice.java @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: invoice.java 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib client: invoice example in Java */ diff --git a/src/libs/pdflib/bind/pdflib/java/jsp/businesscard.jsp b/src/libs/pdflib/bind/pdflib/java/jsp/businesscard.jsp index 48090dfecb..4ebc34504e 100644 --- a/src/libs/pdflib/bind/pdflib/java/jsp/businesscard.jsp +++ b/src/libs/pdflib/bind/pdflib/java/jsp/businesscard.jsp @@ -1,6 +1,6 @@ <%@page import="java.io.*, javax.servlet.*, com.pdflib.pdflib" %><% - /* $Id$ + /* $Id: businesscard.jsp 14574 2005-10-29 16:27:43Z bonefish $ * * businesscard.jsp */ diff --git a/src/libs/pdflib/bind/pdflib/java/jsp/chartab.jsp b/src/libs/pdflib/bind/pdflib/java/jsp/chartab.jsp index 1160a2fbae..70c870c6f1 100644 --- a/src/libs/pdflib/bind/pdflib/java/jsp/chartab.jsp +++ b/src/libs/pdflib/bind/pdflib/java/jsp/chartab.jsp @@ -1,6 +1,6 @@ <%@page import="java.io.*, javax.servlet.*, com.pdflib.pdflib" %><% - /* $Id$ + /* $Id: chartab.jsp 14574 2005-10-29 16:27:43Z bonefish $ * * chartab.jsp */ diff --git a/src/libs/pdflib/bind/pdflib/java/jsp/hello.jsp b/src/libs/pdflib/bind/pdflib/java/jsp/hello.jsp index 8cf479df2f..321d2a8f00 100644 --- a/src/libs/pdflib/bind/pdflib/java/jsp/hello.jsp +++ b/src/libs/pdflib/bind/pdflib/java/jsp/hello.jsp @@ -1,6 +1,6 @@ <%@page import="java.io.*, javax.servlet.*, com.pdflib.pdflib" %><% - /* $Id$ + /* $Id: hello.jsp 14574 2005-10-29 16:27:43Z bonefish $ * * hello.jsp */ diff --git a/src/libs/pdflib/bind/pdflib/java/jsp/image.jsp b/src/libs/pdflib/bind/pdflib/java/jsp/image.jsp index 772755d65e..17231c62aa 100644 --- a/src/libs/pdflib/bind/pdflib/java/jsp/image.jsp +++ b/src/libs/pdflib/bind/pdflib/java/jsp/image.jsp @@ -1,5 +1,5 @@ <%@page import="java.io.*, javax.servlet.*, com.pdflib.pdflib" %><% -/* $Id$ +/* $Id: image.jsp 14574 2005-10-29 16:27:43Z bonefish $ * * image.jsp */ diff --git a/src/libs/pdflib/bind/pdflib/java/jsp/invoice.jsp b/src/libs/pdflib/bind/pdflib/java/jsp/invoice.jsp index 6dad94278e..fb9dbaf814 100644 --- a/src/libs/pdflib/bind/pdflib/java/jsp/invoice.jsp +++ b/src/libs/pdflib/bind/pdflib/java/jsp/invoice.jsp @@ -5,7 +5,7 @@ com.pdflib.pdflib" %><% - /* $Id$ + /* $Id: invoice.jsp 14574 2005-10-29 16:27:43Z bonefish $ * * invoice.jsp */ diff --git a/src/libs/pdflib/bind/pdflib/java/jsp/pdfclock.jsp b/src/libs/pdflib/bind/pdflib/java/jsp/pdfclock.jsp index e01a2c826d..bbfda7180e 100644 --- a/src/libs/pdflib/bind/pdflib/java/jsp/pdfclock.jsp +++ b/src/libs/pdflib/bind/pdflib/java/jsp/pdfclock.jsp @@ -3,7 +3,7 @@ java.text.*, java.util.*, com.pdflib.pdflib" %><% - /* $Id$ + /* $Id: pdfclock.jsp 14574 2005-10-29 16:27:43Z bonefish $ * * PDFclock.jsp */ diff --git a/src/libs/pdflib/bind/pdflib/java/jsp/quickreference.jsp b/src/libs/pdflib/bind/pdflib/java/jsp/quickreference.jsp index 4b5c5c1a3d..2ce8b8c5f1 100644 --- a/src/libs/pdflib/bind/pdflib/java/jsp/quickreference.jsp +++ b/src/libs/pdflib/bind/pdflib/java/jsp/quickreference.jsp @@ -1,7 +1,7 @@ <%@page import="java.io.*, javax.servlet.*, com.pdflib.pdflib" %><% - /* $Id$ + /* $Id: quickreference.jsp 14574 2005-10-29 16:27:43Z bonefish $ * * quickreference.jsp */ diff --git a/src/libs/pdflib/bind/pdflib/java/pdfclock.java b/src/libs/pdflib/bind/pdflib/java/pdfclock.java index 8fb3665e40..29172fb7d5 100644 --- a/src/libs/pdflib/bind/pdflib/java/pdfclock.java +++ b/src/libs/pdflib/bind/pdflib/java/pdfclock.java @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: pdfclock.java 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib client: pdfclock example in Java */ diff --git a/src/libs/pdflib/bind/pdflib/java/pdflib.java b/src/libs/pdflib/bind/pdflib/java/pdflib.java index 7d863efcfc..af4d7ab5e1 100644 --- a/src/libs/pdflib/bind/pdflib/java/pdflib.java +++ b/src/libs/pdflib/bind/pdflib/java/pdflib.java @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pdflib.java 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib Java class */ diff --git a/src/libs/pdflib/bind/pdflib/java/pdflib_java.c b/src/libs/pdflib/bind/pdflib/java/pdflib_java.c index 5844fa353d..9dc1ce13d2 100644 --- a/src/libs/pdflib/bind/pdflib/java/pdflib_java.c +++ b/src/libs/pdflib/bind/pdflib/java/pdflib_java.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pdflib_java.c 14574 2005-10-29 16:27:43Z bonefish $ * * synch'd with pdflib.h 1.151.2.22 * diff --git a/src/libs/pdflib/bind/pdflib/java/quickreference.java b/src/libs/pdflib/bind/pdflib/java/quickreference.java index 91b28a8e96..7cfe836f8b 100644 --- a/src/libs/pdflib/bind/pdflib/java/quickreference.java +++ b/src/libs/pdflib/bind/pdflib/java/quickreference.java @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: quickreference.java 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib/PDI client: mini imposition demo */ diff --git a/src/libs/pdflib/bind/pdflib/java/servlet/businesscardServlet.java b/src/libs/pdflib/bind/pdflib/java/servlet/businesscardServlet.java index 8bc96493aa..c51a430efe 100644 --- a/src/libs/pdflib/bind/pdflib/java/servlet/businesscardServlet.java +++ b/src/libs/pdflib/bind/pdflib/java/servlet/businesscardServlet.java @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: businesscardServlet.java 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib client: hello servlet example in Java */ diff --git a/src/libs/pdflib/bind/pdflib/java/servlet/chartabServlet.java b/src/libs/pdflib/bind/pdflib/java/servlet/chartabServlet.java index 381a2f3d6d..e3d5bbc1ce 100644 --- a/src/libs/pdflib/bind/pdflib/java/servlet/chartabServlet.java +++ b/src/libs/pdflib/bind/pdflib/java/servlet/chartabServlet.java @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: chartabServlet.java 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib client: hello servlet example in Java */ diff --git a/src/libs/pdflib/bind/pdflib/java/servlet/helloServlet.java b/src/libs/pdflib/bind/pdflib/java/servlet/helloServlet.java index 9ffb786725..e2fef66c57 100644 --- a/src/libs/pdflib/bind/pdflib/java/servlet/helloServlet.java +++ b/src/libs/pdflib/bind/pdflib/java/servlet/helloServlet.java @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: helloServlet.java 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib client: hello servlet example in Java */ diff --git a/src/libs/pdflib/bind/pdflib/java/servlet/imageServlet.java b/src/libs/pdflib/bind/pdflib/java/servlet/imageServlet.java index efb3662ace..d0aba17359 100644 --- a/src/libs/pdflib/bind/pdflib/java/servlet/imageServlet.java +++ b/src/libs/pdflib/bind/pdflib/java/servlet/imageServlet.java @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: imageServlet.java 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib client: image example in JavaServlet */ diff --git a/src/libs/pdflib/bind/pdflib/java/servlet/invoiceServlet.java b/src/libs/pdflib/bind/pdflib/java/servlet/invoiceServlet.java index 100f23e89a..50b8bd10bc 100644 --- a/src/libs/pdflib/bind/pdflib/java/servlet/invoiceServlet.java +++ b/src/libs/pdflib/bind/pdflib/java/servlet/invoiceServlet.java @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: invoiceServlet.java 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib client: invoice servlet example in Java */ diff --git a/src/libs/pdflib/bind/pdflib/java/servlet/pdfclockServlet.java b/src/libs/pdflib/bind/pdflib/java/servlet/pdfclockServlet.java index 146296821d..70e2ef23e7 100644 --- a/src/libs/pdflib/bind/pdflib/java/servlet/pdfclockServlet.java +++ b/src/libs/pdflib/bind/pdflib/java/servlet/pdfclockServlet.java @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: pdfclockServlet.java 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib client: pdfclock example in Java */ diff --git a/src/libs/pdflib/bind/pdflib/java/servlet/quickreferenceServlet.java b/src/libs/pdflib/bind/pdflib/java/servlet/quickreferenceServlet.java index 5f2abae1b5..25f3747a9a 100644 --- a/src/libs/pdflib/bind/pdflib/java/servlet/quickreferenceServlet.java +++ b/src/libs/pdflib/bind/pdflib/java/servlet/quickreferenceServlet.java @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: quickreferenceServlet.java 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib/PDI client: mini imposition demo */ diff --git a/src/libs/pdflib/bind/pdflib/perl/Makefile b/src/libs/pdflib/bind/pdflib/perl/Makefile index 8cbdc7da6d..3733fd0c2a 100644 --- a/src/libs/pdflib/bind/pdflib/perl/Makefile +++ b/src/libs/pdflib/bind/pdflib/perl/Makefile @@ -1,5 +1,5 @@ # Makefile for PDFlib's Perl binding -# $Id$ +# $Id: Makefile 14574 2005-10-29 16:27:43Z bonefish $ top_builddir = ../../.. diff --git a/src/libs/pdflib/bind/pdflib/perl/businesscard.pl b/src/libs/pdflib/bind/pdflib/perl/businesscard.pl index 3aa522220f..cf8b765b22 100644 --- a/src/libs/pdflib/bind/pdflib/perl/businesscard.pl +++ b/src/libs/pdflib/bind/pdflib/perl/businesscard.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id$ +# $Id: businesscard.pl 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: block processing example in C # diff --git a/src/libs/pdflib/bind/pdflib/perl/chartab.pl b/src/libs/pdflib/bind/pdflib/perl/chartab.pl index a6115b1ba7..360c20ddeb 100644 --- a/src/libs/pdflib/bind/pdflib/perl/chartab.pl +++ b/src/libs/pdflib/bind/pdflib/perl/chartab.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id$ +# $Id: chartab.pl 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: hello example in Perl # diff --git a/src/libs/pdflib/bind/pdflib/perl/hello.pl b/src/libs/pdflib/bind/pdflib/perl/hello.pl index 6866f83b6f..a5aec9d0a7 100644 --- a/src/libs/pdflib/bind/pdflib/perl/hello.pl +++ b/src/libs/pdflib/bind/pdflib/perl/hello.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id$ +# $Id: hello.pl 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: hello example in Perl # diff --git a/src/libs/pdflib/bind/pdflib/perl/image.pl b/src/libs/pdflib/bind/pdflib/perl/image.pl index 4bd2a38cea..07b6df734b 100644 --- a/src/libs/pdflib/bind/pdflib/perl/image.pl +++ b/src/libs/pdflib/bind/pdflib/perl/image.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id$ +# $Id: image.pl 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: image example in Perl # diff --git a/src/libs/pdflib/bind/pdflib/perl/invoice.pl b/src/libs/pdflib/bind/pdflib/perl/invoice.pl index 06b92ed1cd..3a0d8d0070 100644 --- a/src/libs/pdflib/bind/pdflib/perl/invoice.pl +++ b/src/libs/pdflib/bind/pdflib/perl/invoice.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id$ +# $Id: invoice.pl 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: invoice generation demo # diff --git a/src/libs/pdflib/bind/pdflib/perl/pdfclock.cgi.pl b/src/libs/pdflib/bind/pdflib/perl/pdfclock.cgi.pl index 9dc9ba8d41..575916ad11 100644 --- a/src/libs/pdflib/bind/pdflib/perl/pdfclock.cgi.pl +++ b/src/libs/pdflib/bind/pdflib/perl/pdfclock.cgi.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id$ +# $Id: pdfclock.cgi.pl 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: pdfclock CGI example in Perl # diff --git a/src/libs/pdflib/bind/pdflib/perl/pdfclock.pl b/src/libs/pdflib/bind/pdflib/perl/pdfclock.pl index a15ff248e3..17ed511f7a 100644 --- a/src/libs/pdflib/bind/pdflib/perl/pdfclock.pl +++ b/src/libs/pdflib/bind/pdflib/perl/pdfclock.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id$ +# $Id: pdfclock.pl 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: pdfclock example in Perl # diff --git a/src/libs/pdflib/bind/pdflib/perl/pdflib_pl.c b/src/libs/pdflib/bind/pdflib/perl/pdflib_pl.c index 3e25e3a5d5..16b9150555 100644 --- a/src/libs/pdflib/bind/pdflib/perl/pdflib_pl.c +++ b/src/libs/pdflib/bind/pdflib/perl/pdflib_pl.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pdflib_pl.c 14574 2005-10-29 16:27:43Z bonefish $ * * Wrapper code for the PDFlib Perl binding * diff --git a/src/libs/pdflib/bind/pdflib/perl/pdflib_pl.pm b/src/libs/pdflib/bind/pdflib/perl/pdflib_pl.pm index 45b2c95720..daa3e0fa92 100644 --- a/src/libs/pdflib/bind/pdflib/perl/pdflib_pl.pm +++ b/src/libs/pdflib/bind/pdflib/perl/pdflib_pl.pm @@ -1,4 +1,4 @@ -# $Id$ +# $Id: pdflib_pl.pm 14574 2005-10-29 16:27:43Z bonefish $ package pdflib_pl; require Exporter; require DynaLoader; diff --git a/src/libs/pdflib/bind/pdflib/perl/quickreference.pl b/src/libs/pdflib/bind/pdflib/perl/quickreference.pl index bc4516bc33..fe6420afdf 100644 --- a/src/libs/pdflib/bind/pdflib/perl/quickreference.pl +++ b/src/libs/pdflib/bind/pdflib/perl/quickreference.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $Id$ +# $Id: quickreference.pl 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib/PDI client: mini imposition demo # diff --git a/src/libs/pdflib/bind/pdflib/php/businesscard.php b/src/libs/pdflib/bind/pdflib/php/businesscard.php index 914cbabdab..9c75ff86ac 100644 --- a/src/libs/pdflib/bind/pdflib/php/businesscard.php +++ b/src/libs/pdflib/bind/pdflib/php/businesscard.php @@ -1,5 +1,5 @@ -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=Python - Win32 python23 -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Python.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Python.mak" CFG="Python - Win32 python23" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Python - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "Python - Win32 oldpython" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "Python - Win32 python21" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "Python - Win32 python22" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "Python - Win32 python23" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Python - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Python___Win32_Release" -# PROP BASE Intermediate_Dir "Python___Win32_Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MT /W3 /O2 /I "c:\Programme\Python20\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python15.lib /nologo /dll /debug /machine:I386 /out:"pdflib.dll" /pdbtype:sept -# SUBTRACT BASE LINK32 /nodefaultlib -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python20.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"pdflib_py.dll" /libpath:"c:\programme\python20\libs" /libpath:"..\..\..\libs\pdflib\Release" -# SUBTRACT LINK32 /debug /nodefaultlib - -!ELSEIF "$(CFG)" == "Python - Win32 oldpython" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Python___Win32_oldpython" -# PROP BASE Intermediate_Dir "Python___Win32_oldpython" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "oldpython" -# PROP Intermediate_Dir "oldpython" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /O2 /I "c:\Programme\Python 1.5.2\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /O2 /I "c:\Programme\Python 1.5.2\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python15.lib libpng.lib libtiff.lib zlib.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"pdflib_py.dll" /libpath:"..\..\..\..\libs\zlib" /libpath:"c:\programme\python 1.5.2\libs" /libpath:"..\..\..\libs\pdflib" /libpath:"..\..\..\..\libs\libpng" /libpath:"..\..\..\..\libs\libtiff" -# SUBTRACT BASE LINK32 /debug /nodefaultlib -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python15.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"oldpython/pdflib_py.dll" /libpath:"c:\programme\python 1.5.2\libs" /libpath:"..\..\..\libs\pdflib" -# SUBTRACT LINK32 /debug /nodefaultlib - -!ELSEIF "$(CFG)" == "Python - Win32 python21" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Python___Win32_python21" -# PROP BASE Intermediate_Dir "Python___Win32_python21" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "python21" -# PROP Intermediate_Dir "python21" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /O2 /I "D:\Programme\Python21\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /O2 /I "C:\Programme\Python21\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python15.lib libpng.lib libtiff.lib zlib.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"pdflib_py.dll" /libpath:"..\..\..\..\libs\zlib" /libpath:"c:\programme\python21\libs" /libpath:"..\..\..\libs\pdflib" /libpath:"..\..\..\..\libs\libpng" /libpath:"..\..\..\..\libs\libtiff" -# SUBTRACT BASE LINK32 /debug /nodefaultlib -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python21.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"python21/pdflib_py.dll" /libpath:"C:\programme\python21\libs" /libpath:"..\..\..\libs\pdflib\Release" -# SUBTRACT LINK32 /debug /nodefaultlib - -!ELSEIF "$(CFG)" == "Python - Win32 python22" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Python___Win32_python22" -# PROP BASE Intermediate_Dir "Python___Win32_python22" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "python22" -# PROP Intermediate_Dir "python22" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /O2 /I "C:\Programme\Python21\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /O2 /I "C:\Programme\Python22\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python21.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"python21/pdflib_py.dll" /libpath:"C:\programme\python21\libs" /libpath:"..\..\..\libs\pdflib\Release" -# SUBTRACT BASE LINK32 /debug /nodefaultlib -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python22.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"python22/pdflib_py.dll" /libpath:"C:\programme\python22\libs" /libpath:"..\..\..\libs\pdflib\Release" -# SUBTRACT LINK32 /debug /nodefaultlib - -!ELSEIF "$(CFG)" == "Python - Win32 python23" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Python___Win32_python23" -# PROP BASE Intermediate_Dir "Python___Win32_python23" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Python23" -# PROP Intermediate_Dir "Python23" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /O2 /I "C:\Programme\Python22\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /O2 /I "C:\Programme\Python23\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python22.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"python22/pdflib_py.dll" /libpath:"C:\programme\python22\libs" /libpath:"..\..\..\libs\pdflib\Release" -# SUBTRACT BASE LINK32 /debug /nodefaultlib -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python23.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"python23/pdflib_py.dll" /libpath:"C:\programme\python23\libs" /libpath:"..\..\..\libs\pdflib\Release" -# SUBTRACT LINK32 /debug /nodefaultlib - -!ENDIF - -# Begin Target - -# Name "Python - Win32 Release" -# Name "Python - Win32 oldpython" -# Name "Python - Win32 python21" -# Name "Python - Win32 python22" -# Name "Python - Win32 python23" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\pdflib_py.c -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="Python" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=Python - Win32 python23 +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "Python.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "Python.mak" CFG="Python - Win32 python23" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "Python - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Python - Win32 oldpython" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Python - Win32 python21" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Python - Win32 python22" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Python - Win32 python23" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "Python - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Python___Win32_Release" +# PROP BASE Intermediate_Dir "Python___Win32_Release" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MT /W3 /O2 /I "c:\Programme\Python20\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python15.lib /nologo /dll /debug /machine:I386 /out:"pdflib.dll" /pdbtype:sept +# SUBTRACT BASE LINK32 /nodefaultlib +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python20.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"pdflib_py.dll" /libpath:"c:\programme\python20\libs" /libpath:"..\..\..\libs\pdflib\Release" +# SUBTRACT LINK32 /debug /nodefaultlib + +!ELSEIF "$(CFG)" == "Python - Win32 oldpython" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Python___Win32_oldpython" +# PROP BASE Intermediate_Dir "Python___Win32_oldpython" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "oldpython" +# PROP Intermediate_Dir "oldpython" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /O2 /I "c:\Programme\Python 1.5.2\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c +# ADD CPP /nologo /MT /W3 /O2 /I "c:\Programme\Python 1.5.2\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python15.lib libpng.lib libtiff.lib zlib.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"pdflib_py.dll" /libpath:"..\..\..\..\libs\zlib" /libpath:"c:\programme\python 1.5.2\libs" /libpath:"..\..\..\libs\pdflib" /libpath:"..\..\..\..\libs\libpng" /libpath:"..\..\..\..\libs\libtiff" +# SUBTRACT BASE LINK32 /debug /nodefaultlib +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python15.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"oldpython/pdflib_py.dll" /libpath:"c:\programme\python 1.5.2\libs" /libpath:"..\..\..\libs\pdflib" +# SUBTRACT LINK32 /debug /nodefaultlib + +!ELSEIF "$(CFG)" == "Python - Win32 python21" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Python___Win32_python21" +# PROP BASE Intermediate_Dir "Python___Win32_python21" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "python21" +# PROP Intermediate_Dir "python21" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /O2 /I "D:\Programme\Python21\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c +# ADD CPP /nologo /MT /W3 /O2 /I "C:\Programme\Python21\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python15.lib libpng.lib libtiff.lib zlib.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"pdflib_py.dll" /libpath:"..\..\..\..\libs\zlib" /libpath:"c:\programme\python21\libs" /libpath:"..\..\..\libs\pdflib" /libpath:"..\..\..\..\libs\libpng" /libpath:"..\..\..\..\libs\libtiff" +# SUBTRACT BASE LINK32 /debug /nodefaultlib +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python21.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"python21/pdflib_py.dll" /libpath:"C:\programme\python21\libs" /libpath:"..\..\..\libs\pdflib\Release" +# SUBTRACT LINK32 /debug /nodefaultlib + +!ELSEIF "$(CFG)" == "Python - Win32 python22" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Python___Win32_python22" +# PROP BASE Intermediate_Dir "Python___Win32_python22" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "python22" +# PROP Intermediate_Dir "python22" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /O2 /I "C:\Programme\Python21\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c +# ADD CPP /nologo /MT /W3 /O2 /I "C:\Programme\Python22\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python21.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"python21/pdflib_py.dll" /libpath:"C:\programme\python21\libs" /libpath:"..\..\..\libs\pdflib\Release" +# SUBTRACT BASE LINK32 /debug /nodefaultlib +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python22.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"python22/pdflib_py.dll" /libpath:"C:\programme\python22\libs" /libpath:"..\..\..\libs\pdflib\Release" +# SUBTRACT LINK32 /debug /nodefaultlib + +!ELSEIF "$(CFG)" == "Python - Win32 python23" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Python___Win32_python23" +# PROP BASE Intermediate_Dir "Python___Win32_python23" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Python23" +# PROP Intermediate_Dir "Python23" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /O2 /I "C:\Programme\Python22\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c +# ADD CPP /nologo /MT /W3 /O2 /I "C:\Programme\Python23\include" /I "..\..\..\libs\pdflib" /D "__WIN32__" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python22.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"python22/pdflib_py.dll" /libpath:"C:\programme\python22\libs" /libpath:"..\..\..\libs\pdflib\Release" +# SUBTRACT BASE LINK32 /debug /nodefaultlib +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib python23.lib pdflib.lib /nologo /base:"0x55340000" /dll /pdb:none /machine:I386 /out:"python23/pdflib_py.dll" /libpath:"C:\programme\python23\libs" /libpath:"..\..\..\libs\pdflib\Release" +# SUBTRACT LINK32 /debug /nodefaultlib + +!ENDIF + +# Begin Target + +# Name "Python - Win32 Release" +# Name "Python - Win32 oldpython" +# Name "Python - Win32 python21" +# Name "Python - Win32 python22" +# Name "Python - Win32 python23" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\pdflib_py.c +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/src/libs/pdflib/bind/pdflib/python/businesscard.py b/src/libs/pdflib/bind/pdflib/python/businesscard.py index 75bc6b7fa7..bb6d84bd14 100644 --- a/src/libs/pdflib/bind/pdflib/python/businesscard.py +++ b/src/libs/pdflib/bind/pdflib/python/businesscard.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# $Id$ +# $Id: businesscard.py 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: block processing example in Python # diff --git a/src/libs/pdflib/bind/pdflib/python/chartab.py b/src/libs/pdflib/bind/pdflib/python/chartab.py index 55232fbc19..c152791077 100644 --- a/src/libs/pdflib/bind/pdflib/python/chartab.py +++ b/src/libs/pdflib/bind/pdflib/python/chartab.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# $Id$ +# $Id: chartab.py 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: hello character table in Python # diff --git a/src/libs/pdflib/bind/pdflib/python/hello.py b/src/libs/pdflib/bind/pdflib/python/hello.py index e4c6179639..3f02d518f2 100644 --- a/src/libs/pdflib/bind/pdflib/python/hello.py +++ b/src/libs/pdflib/bind/pdflib/python/hello.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# $Id$ +# $Id: hello.py 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: hello example in Python # diff --git a/src/libs/pdflib/bind/pdflib/python/image.py b/src/libs/pdflib/bind/pdflib/python/image.py index e15e045dac..71c46b79f3 100644 --- a/src/libs/pdflib/bind/pdflib/python/image.py +++ b/src/libs/pdflib/bind/pdflib/python/image.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# $Id$ +# $Id: image.py 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: image example in Python # diff --git a/src/libs/pdflib/bind/pdflib/python/invoice.py b/src/libs/pdflib/bind/pdflib/python/invoice.py index e1fb7a212c..245aae77b9 100644 --- a/src/libs/pdflib/bind/pdflib/python/invoice.py +++ b/src/libs/pdflib/bind/pdflib/python/invoice.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# $Id$ +# $Id: invoice.py 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: invoice generation demo # diff --git a/src/libs/pdflib/bind/pdflib/python/pdfclock.py b/src/libs/pdflib/bind/pdflib/python/pdfclock.py index eb544f3ee5..b4831ea356 100644 --- a/src/libs/pdflib/bind/pdflib/python/pdfclock.py +++ b/src/libs/pdflib/bind/pdflib/python/pdfclock.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# $Id$ +# $Id: pdfclock.py 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: pdfclock example in Python # diff --git a/src/libs/pdflib/bind/pdflib/python/pdflib_py.c b/src/libs/pdflib/bind/pdflib/python/pdflib_py.c index 40b9a1d986..590ef3a2fa 100644 --- a/src/libs/pdflib/bind/pdflib/python/pdflib_py.c +++ b/src/libs/pdflib/bind/pdflib/python/pdflib_py.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pdflib_py.c 14574 2005-10-29 16:27:43Z bonefish $ * * Wrapper code for the PDFlib Python binding * diff --git a/src/libs/pdflib/bind/pdflib/python/quickreference.py b/src/libs/pdflib/bind/pdflib/python/quickreference.py index 29ebc6ed69..b6bf26eb82 100644 --- a/src/libs/pdflib/bind/pdflib/python/quickreference.py +++ b/src/libs/pdflib/bind/pdflib/python/quickreference.py @@ -1,5 +1,5 @@ #!/usr/bin/python -# $Id$ +# $Id: quickreference.py 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib/PDI client: mini imposition demo # diff --git a/src/libs/pdflib/bind/pdflib/tcl/Makefile b/src/libs/pdflib/bind/pdflib/tcl/Makefile index d390358f56..0b669220c4 100644 --- a/src/libs/pdflib/bind/pdflib/tcl/Makefile +++ b/src/libs/pdflib/bind/pdflib/tcl/Makefile @@ -1,5 +1,5 @@ # Makefile for PDFlib's Tcl binding -# $Id$ +# $Id: Makefile 14574 2005-10-29 16:27:43Z bonefish $ top_builddir = ../../.. diff --git a/src/libs/pdflib/bind/pdflib/tcl/Tcl.dsp b/src/libs/pdflib/bind/pdflib/tcl/Tcl.dsp index ee062e4b41..7e9cc006cf 100644 --- a/src/libs/pdflib/bind/pdflib/tcl/Tcl.dsp +++ b/src/libs/pdflib/bind/pdflib/tcl/Tcl.dsp @@ -1,109 +1,109 @@ -# Microsoft Developer Studio Project File - Name="Tcl" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=Tcl - Win32 Release -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Tcl.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Tcl.mak" CFG="Tcl - Win32 Release" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Tcl - Win32 Release mtDLL" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "Tcl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Tcl - Win32 Release mtDLL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Release_mtDLL" -# PROP BASE Intermediate_Dir "Release_mtDLL" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "" -# PROP Intermediate_Dir "Release_mtDLL" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /O2 /I "..\..\..\libs\pdflib" /I "c:\programme\tcl\include" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c -# ADD CPP /nologo /MD /W3 /O2 /I "..\..\..\libs\pdflib" /I "c:\programme\tcl\include" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tclstub82.lib /nologo /base:"0x55350000" /dll /pdb:none /machine:I386 /out:"pdflib_tcl.dll" /libpath:"c:\programme\tcl\lib" -# SUBTRACT BASE LINK32 /debug -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tclstub84.lib pdflib.lib /nologo /base:"0x55350000" /dll /pdb:none /machine:I386 /out:"pdflib_tcl.dll" /libpath:"..\..\..\libs\pdflib\Release_mtDLL" /libpath:"c:\programme\tcl\lib" -# SUBTRACT LINK32 /debug - -!ELSEIF "$(CFG)" == "Tcl - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Tcl___Win32_Release" -# PROP BASE Intermediate_Dir "Tcl___Win32_Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /O2 /I "..\..\..\libs\pdflib" /I "c:\programme\tcl\include" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c -# ADD CPP /nologo /MT /W3 /O2 /I "..\..\..\libs\pdflib" /I "c:\programme\tcl\include" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /mktyplib203 /win32 -# ADD BASE RSC /l 0x407 /d "_DEBUG" -# ADD RSC /l 0x407 /x -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tclstub84.lib pdflib.lib /nologo /base:"0x55350000" /dll /pdb:none /machine:I386 /out:"pdflib_tcl.dll" /libpath:"..\..\..\libs\pdflib\Release_mtDLL" /libpath:"c:\programme\tcl\lib" -# SUBTRACT BASE LINK32 /debug -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tclstub84.lib pdflib.lib /nologo /base:"0x55350000" /dll /pdb:none /machine:I386 /out:"pdflib_tcl.dll" /libpath:"..\..\..\libs\pdflib\Release" /libpath:"c:\programme\tcl\lib" -# SUBTRACT LINK32 /debug - -!ENDIF - -# Begin Target - -# Name "Tcl - Win32 Release mtDLL" -# Name "Tcl - Win32 Release" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=pdflib_tcl.c -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="Tcl" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=Tcl - Win32 Release +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "Tcl.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "Tcl.mak" CFG="Tcl - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "Tcl - Win32 Release mtDLL" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Tcl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "Tcl - Win32 Release mtDLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Release_mtDLL" +# PROP BASE Intermediate_Dir "Release_mtDLL" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "" +# PROP Intermediate_Dir "Release_mtDLL" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /O2 /I "..\..\..\libs\pdflib" /I "c:\programme\tcl\include" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c +# ADD CPP /nologo /MD /W3 /O2 /I "..\..\..\libs\pdflib" /I "c:\programme\tcl\include" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tclstub82.lib /nologo /base:"0x55350000" /dll /pdb:none /machine:I386 /out:"pdflib_tcl.dll" /libpath:"c:\programme\tcl\lib" +# SUBTRACT BASE LINK32 /debug +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tclstub84.lib pdflib.lib /nologo /base:"0x55350000" /dll /pdb:none /machine:I386 /out:"pdflib_tcl.dll" /libpath:"..\..\..\libs\pdflib\Release_mtDLL" /libpath:"c:\programme\tcl\lib" +# SUBTRACT LINK32 /debug + +!ELSEIF "$(CFG)" == "Tcl - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Tcl___Win32_Release" +# PROP BASE Intermediate_Dir "Tcl___Win32_Release" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /O2 /I "..\..\..\libs\pdflib" /I "c:\programme\tcl\include" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c +# ADD CPP /nologo /MT /W3 /O2 /I "..\..\..\libs\pdflib" /I "c:\programme\tcl\include" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_MT" /D "PDFLIB_STATIC" /YX /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /mktyplib203 /win32 +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /x +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tclstub84.lib pdflib.lib /nologo /base:"0x55350000" /dll /pdb:none /machine:I386 /out:"pdflib_tcl.dll" /libpath:"..\..\..\libs\pdflib\Release_mtDLL" /libpath:"c:\programme\tcl\lib" +# SUBTRACT BASE LINK32 /debug +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tclstub84.lib pdflib.lib /nologo /base:"0x55350000" /dll /pdb:none /machine:I386 /out:"pdflib_tcl.dll" /libpath:"..\..\..\libs\pdflib\Release" /libpath:"c:\programme\tcl\lib" +# SUBTRACT LINK32 /debug + +!ENDIF + +# Begin Target + +# Name "Tcl - Win32 Release mtDLL" +# Name "Tcl - Win32 Release" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=pdflib_tcl.c +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/src/libs/pdflib/bind/pdflib/tcl/businesscard.tcl b/src/libs/pdflib/bind/pdflib/tcl/businesscard.tcl index c2f9636583..730cda8599 100644 --- a/src/libs/pdflib/bind/pdflib/tcl/businesscard.tcl +++ b/src/libs/pdflib/bind/pdflib/tcl/businesscard.tcl @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# $Id: businesscard.tcl 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: block processing example in tcl # diff --git a/src/libs/pdflib/bind/pdflib/tcl/chartab.tcl b/src/libs/pdflib/bind/pdflib/tcl/chartab.tcl index 5ef3cab1a5..71d7008be7 100644 --- a/src/libs/pdflib/bind/pdflib/tcl/chartab.tcl +++ b/src/libs/pdflib/bind/pdflib/tcl/chartab.tcl @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# $Id: chartab.tcl 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: character table example in Tcl # diff --git a/src/libs/pdflib/bind/pdflib/tcl/hello.tcl b/src/libs/pdflib/bind/pdflib/tcl/hello.tcl index e24d0f8db6..767d07f441 100644 --- a/src/libs/pdflib/bind/pdflib/tcl/hello.tcl +++ b/src/libs/pdflib/bind/pdflib/tcl/hello.tcl @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# $Id: hello.tcl 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: hello example in Tcl # diff --git a/src/libs/pdflib/bind/pdflib/tcl/image.tcl b/src/libs/pdflib/bind/pdflib/tcl/image.tcl index c96b6e2e44..0de2eacb67 100644 --- a/src/libs/pdflib/bind/pdflib/tcl/image.tcl +++ b/src/libs/pdflib/bind/pdflib/tcl/image.tcl @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# $Id: image.tcl 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: image example in Tcl # diff --git a/src/libs/pdflib/bind/pdflib/tcl/invoice.tcl b/src/libs/pdflib/bind/pdflib/tcl/invoice.tcl index b162edbd04..0db36d5383 100644 --- a/src/libs/pdflib/bind/pdflib/tcl/invoice.tcl +++ b/src/libs/pdflib/bind/pdflib/tcl/invoice.tcl @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# $Id: invoice.tcl 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: invoice generation demo # diff --git a/src/libs/pdflib/bind/pdflib/tcl/pdfclock.tcl b/src/libs/pdflib/bind/pdflib/tcl/pdfclock.tcl index 382a651af7..4c89bf8927 100644 --- a/src/libs/pdflib/bind/pdflib/tcl/pdfclock.tcl +++ b/src/libs/pdflib/bind/pdflib/tcl/pdfclock.tcl @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# $Id: pdfclock.tcl 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib client: pdfclock example in Tcl # diff --git a/src/libs/pdflib/bind/pdflib/tcl/pdflib_tcl.c b/src/libs/pdflib/bind/pdflib/tcl/pdflib_tcl.c index 446f84091c..61a6f217ae 100644 --- a/src/libs/pdflib/bind/pdflib/tcl/pdflib_tcl.c +++ b/src/libs/pdflib/bind/pdflib/tcl/pdflib_tcl.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pdflib_tcl.c 14574 2005-10-29 16:27:43Z bonefish $ * * in sync with pdflib.h 1.151.2.22 * diff --git a/src/libs/pdflib/bind/pdflib/tcl/quickreference.tcl b/src/libs/pdflib/bind/pdflib/tcl/quickreference.tcl index 962ae5aafc..cbe3564e49 100644 --- a/src/libs/pdflib/bind/pdflib/tcl/quickreference.tcl +++ b/src/libs/pdflib/bind/pdflib/tcl/quickreference.tcl @@ -1,5 +1,5 @@ #!/bin/sh -# $Id$ +# $Id: quickreference.tcl 14574 2005-10-29 16:27:43Z bonefish $ # # PDFlib/PDI client: mini imposition demo # diff --git a/src/libs/pdflib/config/mkbind.inc.in b/src/libs/pdflib/config/mkbind.inc.in index 543a5087f6..b33c2bca14 100644 --- a/src/libs/pdflib/config/mkbind.inc.in +++ b/src/libs/pdflib/config/mkbind.inc.in @@ -1,5 +1,5 @@ # Template to be included from every makefile that creates bindings -# $Id$ +# $Id: mkbind.inc.in 14574 2005-10-29 16:27:43Z bonefish $ # all:: $(BASEPROGS) $(LIBNAME) diff --git a/src/libs/pdflib/config/mkcommon.inc.in b/src/libs/pdflib/config/mkcommon.inc.in index a9a1f2aa0b..5a4ce10bd1 100644 --- a/src/libs/pdflib/config/mkcommon.inc.in +++ b/src/libs/pdflib/config/mkcommon.inc.in @@ -1,5 +1,5 @@ # Template to be included from every makefile that creates libs/progs -# $Id$ +# $Id: mkcommon.inc.in 14574 2005-10-29 16:27:43Z bonefish $ # # # The Makefile that uses this template has to set diff --git a/src/libs/pdflib/config/mklibs.inc.in b/src/libs/pdflib/config/mklibs.inc.in index 6772d245fc..0855b21387 100644 --- a/src/libs/pdflib/config/mklibs.inc.in +++ b/src/libs/pdflib/config/mklibs.inc.in @@ -1,5 +1,5 @@ # Template to be included from every makefile that creates libs -# $Id$ +# $Id: mklibs.inc.in 14574 2005-10-29 16:27:43Z bonefish $ # all:: $(LIBNAME) diff --git a/src/libs/pdflib/config/mkmainlib.inc b/src/libs/pdflib/config/mkmainlib.inc index 0d49c62625..849ebe1f25 100644 --- a/src/libs/pdflib/config/mkmainlib.inc +++ b/src/libs/pdflib/config/mkmainlib.inc @@ -1,5 +1,5 @@ # Template to be included from every makefile that creates libs -# $Id$ +# $Id: mkmainlib.inc 14574 2005-10-29 16:27:43Z bonefish $ # LIBLINKSELF = $(RPATH) $(MAINOBJ) $(INTERNALLIBS) $(EXTERNALLIBS) diff --git a/src/libs/pdflib/config/mkprogs.inc.in b/src/libs/pdflib/config/mkprogs.inc.in index 9e8870fa5d..db1b74b25e 100644 --- a/src/libs/pdflib/config/mkprogs.inc.in +++ b/src/libs/pdflib/config/mkprogs.inc.in @@ -1,5 +1,5 @@ # Template to be included from every makefile that creates progs -# $Id$ +# $Id: mkprogs.inc.in 14574 2005-10-29 16:27:43Z bonefish $ # PROGS_BUILD = $(LIBTOOL_LD) $(CC) -static $(FLAGS) -o $@ \ diff --git a/src/libs/pdflib/config/mksubdirs.inc.in b/src/libs/pdflib/config/mksubdirs.inc.in index 35c3aa6d82..13f967c84b 100644 --- a/src/libs/pdflib/config/mksubdirs.inc.in +++ b/src/libs/pdflib/config/mksubdirs.inc.in @@ -1,5 +1,5 @@ # Template to be included from every makefile that handles subdirs -# $Id$ +# $Id: mksubdirs.inc.in 14574 2005-10-29 16:27:43Z bonefish $ # # # The Makefile that uses this template has to set diff --git a/src/libs/pdflib/configure.in b/src/libs/pdflib/configure.in index 7e1efd6d53..d5f4b57d53 100644 --- a/src/libs/pdflib/configure.in +++ b/src/libs/pdflib/configure.in @@ -10,7 +10,7 @@ dnl available, please check http://www.pdflib.com. | dnl | dnl --------------------------------------------------------------------------*/ -dnl $Id$ +dnl $Id: configure.in 14574 2005-10-29 16:27:43Z bonefish $ dnl dnl Process this file with autoconf to produce a configure script. dnl diff --git a/src/libs/pdflib/doc/PDFlib-license.rtf b/src/libs/pdflib/doc/PDFlib-license.rtf index a1ec416e66..2c09e00f8b 100644 --- a/src/libs/pdflib/doc/PDFlib-license.rtf +++ b/src/libs/pdflib/doc/PDFlib-license.rtf @@ -1,53 +1,53 @@ -{\rtf1\ansi \deff0 \adeflang1033 {\fonttbl {\f0\froman Arial;} -{\f1\froman TheSans-Plain;}{\f2\fswiss Helvetica;}{\f3\fmodern MS LineDraw;}{\f4\fdecor Symbol;}} -{\colortbl;\red0\green0\blue0;\red0\green0\blue127;\red0\green127\blue0;\red0\green127\blue127;\red127\green0\blue0;\red127\green0\blue127;\red127\green127\blue0;\red127\green127\blue127;\red192\green192\blue192;\red0\green0\blue255;\red0\green255\blue0;\red0\green255\blue255;\red255\green0\blue0;\red255\green0\blue255;\red255\green255\blue0;\red255\green255\blue255;}\linex0 \sbknone -\paperh16842 \paperw11907 \margl1248 \margr1020 \margt1440 \margb1440 \plain {\stylesheet {\snext0 Normal;} -{\s2 \qc \fs36 \f0 \cf1 \b \sbasedon0 \snext2 1_Level;} -{\s3 \ql \tx681 \fs18 \f0 \cf1 \b \sbasedon0 \snext3 2_Level;} -{\s4 \ql \tx681 \fs18 \f0 \cf1 \b \sbasedon0 \snext4 3_Level;} -{\s5 \ql \tx1020 \fs22 \f1 \cf1 \sbasedon0 \snext5 Aufzaehlung;} -{\s6 \ql \tx4587 \fs18 \f0 \cf1 \sbasedon0 \snext6 Body;} -{\s7 \qc \tx963 \fs18 \f0 \cf1 \sbasedon0 \snext7 Body-centered;} -{\s8 \ql \tqdec \tx2439 \tx2778 \fs20 \f1 \cf1 \sbasedon0 \snext8 Fusszeile-links;} -{\s9 \ql \tx1020 \fs18 \f0 \cf1 \sbasedon0 \snext9 List;} -}\fs24 \f2 \fs36 \f0 \cf1 \b \lang1031 \b \linex0 \linemod0 \sbknone \pgnrestart \pgnstart1 \pgnstarts1 \pard \s2 \qc \sb280 \sa120 PDFlib License Agreement\lang1031 \plain \fs36 \cf1 \lang1031 -\par \fs18 \f0 \cf1 \lang1031 \pard \s7 \qc \tx285 \sa80 PDFlib GmbH, Tal 40, 80331 Munich, Germany\lang1031 \line \lang1031 phone +49 89 29 16 46 87,\lang1031 fax +49 89 29 16 46 86\lang1031 \line \lang1031 sales@pdflib.com,\lang1031 support@pdflib.com,\lang1031 www.pdflib.com\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s3 \tx567 \sb100 \sa80 1\tab {\*\bkmkstart X92461}\lang1031 Definitions{\*\bkmkend X92461}\lang1031 \plain \fs18 \cf1 \lang1031 -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 The effective date of this agreement is the date shown on the invoice. This agreement defines the licensing terms for the \lang1031 following software products:\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \lang1031 \pard \s9 \tx228 \sa60 (a) \lang1031 PDFlib \lang1031 5.0.3\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \lang1031 \pard \s9 \tx228 \sa60 (b) \lang1031 PDFlib+PDI \lang1031 5.0.3\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \lang1031 \pard \s9 \tx228 \sa60 (c) \lang1031 PDFlib Personalization Server (PPS) \lang1031 5.0.3\lang1031 and Block Plugin\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 These products, as well as all maintenance updates which are designated as such by PDFlib GmbH will be collectively re\-\lang1031 ferred to as "the program" in this agreement. The program is delivered with a digital manual which describes the program\-\lang1031 ming features and their usage ("the documentation").\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s3 \tx567 \sb120 \sa80 2\tab \lang1031 CPU-based License\lang1031 \plain \fs18 \cf1 \lang1031 -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Licensee is granted the non-transferable, non-exclusive, and perpetual right to use the program on a number of comput\-\lang1031 ers. For the license fee the total number of CPUs (processors as reported by the operating system) is taken into account, \lang1031 while the number of users accessing the computer is irrelevant. The total number of computers is also irrelevant (e.g., two \lang1031 dual-processor machines plus a single-processor machine result in a total CPU count of five).\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 A purchased license may be transferred to another computer running under the same operating system if no two comput\-\lang1031 ers are driven concurrently under the same license.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Licensee may use the program on an unlimited number of development machines, provided these machines are not used \lang1031 for production purposes at the same time (for example, they cannot be accessed over a network except by developers \lang1031 working on products which incorporate a licensed copy of the program), and run under the same operating system for which a license was purchased.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s3 \tx567 \sb120 \sa80 3\tab \lang1031 Restrictions\lang1031 \plain \fs18 \cf1 \lang1031 -\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s4 \tx567 \sb40 \sa80 3.1\tab {\*\bkmkstart X62529}\lang1031 Intellectual Property{\*\bkmkend X62529}\lang1031 \plain \fs18 \cf1 \lang1031 -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Licensee acknowledges that the program is copyrighted intellectual property of PDFlib GmbH, and that PDFlib GmbH re\-\lang1031 tains exclusive ownership of the program and documentation, subject however to all terms and conditions of this agree\-\lang1031 ment.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 It is expressly agreed that this license does not include ownership of the programs source code, but only the right-to-use \lang1031 as defined by this agreement.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s4 \tx567 \sb60 \sa80 3.2\tab \lang1031 Sublicensing\lang1031 \plain \fs18 \cf1 \lang1031 -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Licensee may not resell, transfer, rent or lease the program. Licensee is not allowed to transfer the rights obtained under \lang1031 this license to any third party.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 This license applies to one incorporated unit, and does not extend to subsidiaries.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s4 \tx567 \sb60 \sa80 3.3\tab \lang1031 Reverse Engineering and Confidentiality\lang1031 \plain \fs18 \cf1 \lang1031 -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Licensee agrees to not translate, disassemble, or reverse-engineer the program.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Licensee agrees to not redistribute or make publicly available any license key received from PDFlib \lang1031 GmbH.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s3 \tx567 \sb120 \sa80 4\tab {\*\bkmkstart X63085}\lang1031 Delivery{\*\bkmkend X63085}\lang1031 \plain \fs18 \cf1 \lang1031 -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 The program and documentation are delivered in digital format only. Licensee agrees to retrieve the program and docu\-\lang1031 mentation, as well as any relevant maintenance updates from PDFlib GmbHs Web site at www.pdflib.com. N\lang1031 either digital \lang1031 storage media nor printed documentation will be delivered to licen\lang1031 see by PDFlib GmbH.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s3 \tx567 \sb120 \sa80 5\tab \lang1031 Warranty and {\*\bkmkstart X63838}\lang1031 Support{\*\bkmkend X63838}\lang1031 \plain \fs18 \cf1 \lang1031 -\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s4 \tx567 \sb40 \sa80 5.1\tab \lang1031 Performance of the Program\lang1031 \plain \fs18 \cf1 \lang1031 -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 PDFlib GmbH warrants that the program will perform substantially in accordance with the documentation when used as di\-\lang1031 rected in the documentation. This warranty does not cover use of the program in ways which are not covered in the docu\-\lang1031 mentation (e.g., by calling undocumented functions, or by not obeying documented restrictions), or using modified copies \lang1031 of the program unless such modifications have been authorized by PDFlib GmbH.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 PDFlib GmbH warrants that it is owner of the program with authority to license the program to licensee, and that the pro\-\lang1031 gram does not infringe third party intellectual property rights. PDFlib GmbH agrees to indemnify, defend and hold harmless \lang1031 licensee from any claims either that PDFlib GmbH does not own the program, or that the program infringes a third partys \lang1031 intellectual property rights.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 In the event the unmodified program fails to satisfy this limited warranty during a warranty period of 30 days after the effec\-\lang1031 tive date of this agreement, PDFlib GmbH shall promptly, at its expense and in its discretion, (i) provide a correction or \lang1031 workaround for any reproducible errors which are reported by licensee, and deliver an updated version of the program, or \lang1031 (ii) return a refund of any license fees paid pursuant to this agreement. In this event licensee will immediately terminate \lang1031 any use and distribution of the program.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Technical support as described above is available by e-mail only. Maintenance updates of the program as indicated in \lang1031 section \lang1031 {\field \fldlock {\*\fldinst REF X92461 \\n }{\fldrslt 1}}\lang1031 do not extend the initial warranty period.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s4 \tx567 \sb60 \sa80 5.2\tab \lang1031 Warranty against Disablement\lang1031 \plain \fs18 \cf1 \lang1031 -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 PDFlib GmbH expressly represents and warrants that, other than a disabling mechanism on the functional evaluation copy \lang1031 of the program which disabling mechanism is removed upon receipt by licensee of the license key for the full version of the \lang1031 program, the program will not intentionally cause or permit any portion of the program provided or developed by PDFlib \lang1031 GmbH hereunder to contain any protection feature designed to prevent its use. These protection features include, without \lang1031 limitation, any computer virus, worm, software lock, drop dead device, Trojan-horse routine, trap door, time bomb, or any \lang1031 other codes or instructions that may be used to access, modify, delete, damage or disable the program or any other com\-\lang1031 ponent of licensees computer systems. If PDFlib GmbH becomes aware of any such feature, PDFlib GmbH will promptly \lang1031 notify licensee thereof. PDFlib GmbH further represents and warrants that it will not impair the operation of the program in \lang1031 any way other than pursuant to an order of a court of law.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s4 \tx567 \sb60 \sa80 5.3\tab \lang1031 Limitations and Disclaimer\lang1031 \plain \fs18 \cf1 \lang1031 -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Except for breach of PDFlib GmbHs warranties of ownership of the program and non-infringement of third party intellectual \lang1031 property, the foregoing states the sole and exclusive remedies for PDFlib \lang1031 GmbHs breach of warranty. The foregoing war\-\lang1031 ranties are in lieu of all other warranties or conditions, express or implied, and any implied warranty or condition of fitness \lang1031 for a particular purpose, merchantability, or merchantable quality. No person is authorized to make any other warranty or \lang1031 representation concerning the performance of the program other than according to this paragraph. Licensee shall make no \lang1031 other warranty, express or implied, on behalf of \lang1031 PDFlib GmbH.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s3 \tx567 \sb120 \sa80 6\tab \lang1031 Consequential Damages Waiver\lang1031 \plain \fs18 \cf1 \lang1031 -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Neither party will be liable for any loss of use, interruption of business, or any indirect, special, incidental, or consequential \lang1031 damages of any kind (including lost profits), regardless of the form of action whether in contract, tort (including negli\-\lang1031 gence), strict product liability or otherwise.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s3 \tx567 \sb120 \sa80 7\tab \lang1031 Applicable Law\lang1031 \plain \fs18 \cf1 \lang1031 -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 This license is governed by the laws of Germany, excluding choice of law rules. If any part of this license is found to be in \lang1031 conflict with the law, that part shall be interpreted in its broadest meaning consistent with the law, and no other parts of the \lang1031 license shall be affected.\lang1031 \widowctrl -\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s3 \tx567 \sb120 \sa80 8\tab \lang1031 Final Agreement\lang1031 \plain \fs18 \cf1 \lang1031 -\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 This agreement constitutes the complete, final and exclusive expression of the parties agreement, and supersedes all pro\-\lang1031 posals and other communications made between the parties concerning the subject matter hereof. This agreement cannot \lang1031 be modified except by written agreement signed by all the parties hereto.\lang1031 \widowctrl -\par } +{\rtf1\ansi \deff0 \adeflang1033 {\fonttbl {\f0\froman Arial;} +{\f1\froman TheSans-Plain;}{\f2\fswiss Helvetica;}{\f3\fmodern MS LineDraw;}{\f4\fdecor Symbol;}} +{\colortbl;\red0\green0\blue0;\red0\green0\blue127;\red0\green127\blue0;\red0\green127\blue127;\red127\green0\blue0;\red127\green0\blue127;\red127\green127\blue0;\red127\green127\blue127;\red192\green192\blue192;\red0\green0\blue255;\red0\green255\blue0;\red0\green255\blue255;\red255\green0\blue0;\red255\green0\blue255;\red255\green255\blue0;\red255\green255\blue255;}\linex0 \sbknone +\paperh16842 \paperw11907 \margl1248 \margr1020 \margt1440 \margb1440 \plain {\stylesheet {\snext0 Normal;} +{\s2 \qc \fs36 \f0 \cf1 \b \sbasedon0 \snext2 1_Level;} +{\s3 \ql \tx681 \fs18 \f0 \cf1 \b \sbasedon0 \snext3 2_Level;} +{\s4 \ql \tx681 \fs18 \f0 \cf1 \b \sbasedon0 \snext4 3_Level;} +{\s5 \ql \tx1020 \fs22 \f1 \cf1 \sbasedon0 \snext5 Aufzaehlung;} +{\s6 \ql \tx4587 \fs18 \f0 \cf1 \sbasedon0 \snext6 Body;} +{\s7 \qc \tx963 \fs18 \f0 \cf1 \sbasedon0 \snext7 Body-centered;} +{\s8 \ql \tqdec \tx2439 \tx2778 \fs20 \f1 \cf1 \sbasedon0 \snext8 Fusszeile-links;} +{\s9 \ql \tx1020 \fs18 \f0 \cf1 \sbasedon0 \snext9 List;} +}\fs24 \f2 \fs36 \f0 \cf1 \b \lang1031 \b \linex0 \linemod0 \sbknone \pgnrestart \pgnstart1 \pgnstarts1 \pard \s2 \qc \sb280 \sa120 PDFlib License Agreement\lang1031 \plain \fs36 \cf1 \lang1031 +\par \fs18 \f0 \cf1 \lang1031 \pard \s7 \qc \tx285 \sa80 PDFlib GmbH, Tal 40, 80331 Munich, Germany\lang1031 \line \lang1031 phone +49 89 29 16 46 87,\lang1031 fax +49 89 29 16 46 86\lang1031 \line \lang1031 sales@pdflib.com,\lang1031 support@pdflib.com,\lang1031 www.pdflib.com\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s3 \tx567 \sb100 \sa80 1\tab {\*\bkmkstart X92461}\lang1031 Definitions{\*\bkmkend X92461}\lang1031 \plain \fs18 \cf1 \lang1031 +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 The effective date of this agreement is the date shown on the invoice. This agreement defines the licensing terms for the \lang1031 following software products:\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \lang1031 \pard \s9 \tx228 \sa60 (a) \lang1031 PDFlib \lang1031 5.0.3\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \lang1031 \pard \s9 \tx228 \sa60 (b) \lang1031 PDFlib+PDI \lang1031 5.0.3\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \lang1031 \pard \s9 \tx228 \sa60 (c) \lang1031 PDFlib Personalization Server (PPS) \lang1031 5.0.3\lang1031 and Block Plugin\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 These products, as well as all maintenance updates which are designated as such by PDFlib GmbH will be collectively re\-\lang1031 ferred to as "the program" in this agreement. The program is delivered with a digital manual which describes the program\-\lang1031 ming features and their usage ("the documentation").\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s3 \tx567 \sb120 \sa80 2\tab \lang1031 CPU-based License\lang1031 \plain \fs18 \cf1 \lang1031 +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Licensee is granted the non-transferable, non-exclusive, and perpetual right to use the program on a number of comput\-\lang1031 ers. For the license fee the total number of CPUs (processors as reported by the operating system) is taken into account, \lang1031 while the number of users accessing the computer is irrelevant. The total number of computers is also irrelevant (e.g., two \lang1031 dual-processor machines plus a single-processor machine result in a total CPU count of five).\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 A purchased license may be transferred to another computer running under the same operating system if no two comput\-\lang1031 ers are driven concurrently under the same license.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Licensee may use the program on an unlimited number of development machines, provided these machines are not used \lang1031 for production purposes at the same time (for example, they cannot be accessed over a network except by developers \lang1031 working on products which incorporate a licensed copy of the program), and run under the same operating system for which a license was purchased.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s3 \tx567 \sb120 \sa80 3\tab \lang1031 Restrictions\lang1031 \plain \fs18 \cf1 \lang1031 +\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s4 \tx567 \sb40 \sa80 3.1\tab {\*\bkmkstart X62529}\lang1031 Intellectual Property{\*\bkmkend X62529}\lang1031 \plain \fs18 \cf1 \lang1031 +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Licensee acknowledges that the program is copyrighted intellectual property of PDFlib GmbH, and that PDFlib GmbH re\-\lang1031 tains exclusive ownership of the program and documentation, subject however to all terms and conditions of this agree\-\lang1031 ment.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 It is expressly agreed that this license does not include ownership of the programs source code, but only the right-to-use \lang1031 as defined by this agreement.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s4 \tx567 \sb60 \sa80 3.2\tab \lang1031 Sublicensing\lang1031 \plain \fs18 \cf1 \lang1031 +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Licensee may not resell, transfer, rent or lease the program. Licensee is not allowed to transfer the rights obtained under \lang1031 this license to any third party.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 This license applies to one incorporated unit, and does not extend to subsidiaries.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s4 \tx567 \sb60 \sa80 3.3\tab \lang1031 Reverse Engineering and Confidentiality\lang1031 \plain \fs18 \cf1 \lang1031 +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Licensee agrees to not translate, disassemble, or reverse-engineer the program.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Licensee agrees to not redistribute or make publicly available any license key received from PDFlib \lang1031 GmbH.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s3 \tx567 \sb120 \sa80 4\tab {\*\bkmkstart X63085}\lang1031 Delivery{\*\bkmkend X63085}\lang1031 \plain \fs18 \cf1 \lang1031 +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 The program and documentation are delivered in digital format only. Licensee agrees to retrieve the program and docu\-\lang1031 mentation, as well as any relevant maintenance updates from PDFlib GmbHs Web site at www.pdflib.com. N\lang1031 either digital \lang1031 storage media nor printed documentation will be delivered to licen\lang1031 see by PDFlib GmbH.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s3 \tx567 \sb120 \sa80 5\tab \lang1031 Warranty and {\*\bkmkstart X63838}\lang1031 Support{\*\bkmkend X63838}\lang1031 \plain \fs18 \cf1 \lang1031 +\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s4 \tx567 \sb40 \sa80 5.1\tab \lang1031 Performance of the Program\lang1031 \plain \fs18 \cf1 \lang1031 +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 PDFlib GmbH warrants that the program will perform substantially in accordance with the documentation when used as di\-\lang1031 rected in the documentation. This warranty does not cover use of the program in ways which are not covered in the docu\-\lang1031 mentation (e.g., by calling undocumented functions, or by not obeying documented restrictions), or using modified copies \lang1031 of the program unless such modifications have been authorized by PDFlib GmbH.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 PDFlib GmbH warrants that it is owner of the program with authority to license the program to licensee, and that the pro\-\lang1031 gram does not infringe third party intellectual property rights. PDFlib GmbH agrees to indemnify, defend and hold harmless \lang1031 licensee from any claims either that PDFlib GmbH does not own the program, or that the program infringes a third partys \lang1031 intellectual property rights.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 In the event the unmodified program fails to satisfy this limited warranty during a warranty period of 30 days after the effec\-\lang1031 tive date of this agreement, PDFlib GmbH shall promptly, at its expense and in its discretion, (i) provide a correction or \lang1031 workaround for any reproducible errors which are reported by licensee, and deliver an updated version of the program, or \lang1031 (ii) return a refund of any license fees paid pursuant to this agreement. In this event licensee will immediately terminate \lang1031 any use and distribution of the program.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Technical support as described above is available by e-mail only. Maintenance updates of the program as indicated in \lang1031 section \lang1031 {\field \fldlock {\*\fldinst REF X92461 \\n }{\fldrslt 1}}\lang1031 do not extend the initial warranty period.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s4 \tx567 \sb60 \sa80 5.2\tab \lang1031 Warranty against Disablement\lang1031 \plain \fs18 \cf1 \lang1031 +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 PDFlib GmbH expressly represents and warrants that, other than a disabling mechanism on the functional evaluation copy \lang1031 of the program which disabling mechanism is removed upon receipt by licensee of the license key for the full version of the \lang1031 program, the program will not intentionally cause or permit any portion of the program provided or developed by PDFlib \lang1031 GmbH hereunder to contain any protection feature designed to prevent its use. These protection features include, without \lang1031 limitation, any computer virus, worm, software lock, drop dead device, Trojan-horse routine, trap door, time bomb, or any \lang1031 other codes or instructions that may be used to access, modify, delete, damage or disable the program or any other com\-\lang1031 ponent of licensees computer systems. If PDFlib GmbH becomes aware of any such feature, PDFlib GmbH will promptly \lang1031 notify licensee thereof. PDFlib GmbH further represents and warrants that it will not impair the operation of the program in \lang1031 any way other than pursuant to an order of a court of law.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s4 \tx567 \sb60 \sa80 5.3\tab \lang1031 Limitations and Disclaimer\lang1031 \plain \fs18 \cf1 \lang1031 +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Except for breach of PDFlib GmbHs warranties of ownership of the program and non-infringement of third party intellectual \lang1031 property, the foregoing states the sole and exclusive remedies for PDFlib \lang1031 GmbHs breach of warranty. The foregoing war\-\lang1031 ranties are in lieu of all other warranties or conditions, express or implied, and any implied warranty or condition of fitness \lang1031 for a particular purpose, merchantability, or merchantable quality. No person is authorized to make any other warranty or \lang1031 representation concerning the performance of the program other than according to this paragraph. Licensee shall make no \lang1031 other warranty, express or implied, on behalf of \lang1031 PDFlib GmbH.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s3 \tx567 \sb120 \sa80 6\tab \lang1031 Consequential Damages Waiver\lang1031 \plain \fs18 \cf1 \lang1031 +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 Neither party will be liable for any loss of use, interruption of business, or any indirect, special, incidental, or consequential \lang1031 damages of any kind (including lost profits), regardless of the form of action whether in contract, tort (including negli\-\lang1031 gence), strict product liability or otherwise.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s3 \tx567 \sb120 \sa80 7\tab \lang1031 Applicable Law\lang1031 \plain \fs18 \cf1 \lang1031 +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 This license is governed by the laws of Germany, excluding choice of law rules. If any part of this license is found to be in \lang1031 conflict with the law, that part shall be interpreted in its broadest meaning consistent with the law, and no other parts of the \lang1031 license shall be affected.\lang1031 \widowctrl +\par \fs18 \f0 \cf1 \b \lang1031 \b \pard \s3 \tx567 \sb120 \sa80 8\tab \lang1031 Final Agreement\lang1031 \plain \fs18 \cf1 \lang1031 +\par \fs18 \f0 \cf1 \lang1031 \pard \s6 \tx5835 \sa60 This agreement constitutes the complete, final and exclusive expression of the parties agreement, and supersedes all pro\-\lang1031 posals and other communications made between the parties concerning the subject matter hereof. This agreement cannot \lang1031 be modified except by written agreement signed by all the parties hereto.\lang1031 \widowctrl +\par } diff --git a/src/libs/pdflib/libs/Makefile b/src/libs/pdflib/libs/Makefile index c3762225b7..db69331ae7 100644 --- a/src/libs/pdflib/libs/Makefile +++ b/src/libs/pdflib/libs/Makefile @@ -1,6 +1,6 @@ # Generated automatically from Makefile.in by configure. # Main libs Makefile -# $Id$ +# $Id: Makefile 14574 2005-10-29 16:27:43Z bonefish $ # keep the order, some libs have to be build before others # PDU not yet working => MAKEOPT -i diff --git a/src/libs/pdflib/libs/flate/Makefile b/src/libs/pdflib/libs/flate/Makefile index 63eb97a69a..0982c74882 100644 --- a/src/libs/pdflib/libs/flate/Makefile +++ b/src/libs/pdflib/libs/flate/Makefile @@ -1,6 +1,6 @@ # Makefile for zlib # This generates a libtool convenience library -# $Id$ +# $Id: Makefile 14574 2005-10-29 16:27:43Z bonefish $ top_builddir = ../.. diff --git a/src/libs/pdflib/libs/flate/adler32.c b/src/libs/pdflib/libs/flate/adler32.c index fe160a6065..1fa4355c68 100644 --- a/src/libs/pdflib/libs/flate/adler32.c +++ b/src/libs/pdflib/libs/flate/adler32.c @@ -3,8 +3,8 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id$ */ -/* @(#) $Id$ */ +/* $Id: adler32.c 14574 2005-10-29 16:27:43Z bonefish $ */ +/* @(#) $Id: adler32.c 14574 2005-10-29 16:27:43Z bonefish $ */ #include "zlib.h" diff --git a/src/libs/pdflib/libs/flate/compress.c b/src/libs/pdflib/libs/flate/compress.c index 0bad8ec49d..1173cd3efb 100644 --- a/src/libs/pdflib/libs/flate/compress.c +++ b/src/libs/pdflib/libs/flate/compress.c @@ -3,8 +3,8 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id$ */ -/* @(#) $Id$ */ +/* $Id: compress.c 14574 2005-10-29 16:27:43Z bonefish $ */ +/* @(#) $Id: compress.c 14574 2005-10-29 16:27:43Z bonefish $ */ #include "zlib.h" diff --git a/src/libs/pdflib/libs/flate/crc32.c b/src/libs/pdflib/libs/flate/crc32.c index 6b12d34214..57ebe55d83 100644 --- a/src/libs/pdflib/libs/flate/crc32.c +++ b/src/libs/pdflib/libs/flate/crc32.c @@ -3,8 +3,8 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id$ */ -/* @(#) $Id$ */ +/* $Id: crc32.c 14574 2005-10-29 16:27:43Z bonefish $ */ +/* @(#) $Id: crc32.c 14574 2005-10-29 16:27:43Z bonefish $ */ #include "zlib.h" diff --git a/src/libs/pdflib/libs/flate/deflate.c b/src/libs/pdflib/libs/flate/deflate.c index 1e3956e010..f0e1d0f8c3 100644 --- a/src/libs/pdflib/libs/flate/deflate.c +++ b/src/libs/pdflib/libs/flate/deflate.c @@ -47,8 +47,8 @@ * */ -/* $Id$ */ -/* @(#) $Id$ */ +/* $Id: deflate.c 14574 2005-10-29 16:27:43Z bonefish $ */ +/* @(#) $Id: deflate.c 14574 2005-10-29 16:27:43Z bonefish $ */ #include "deflate.h" diff --git a/src/libs/pdflib/libs/flate/deflate.h b/src/libs/pdflib/libs/flate/deflate.h index 22ae5f1a53..98ccea1fe3 100644 --- a/src/libs/pdflib/libs/flate/deflate.h +++ b/src/libs/pdflib/libs/flate/deflate.h @@ -9,9 +9,9 @@ */ -/* $Id$ */ +/* $Id: deflate.h 14574 2005-10-29 16:27:43Z bonefish $ */ -/* @(#) $Id$ */ +/* @(#) $Id: deflate.h 14574 2005-10-29 16:27:43Z bonefish $ */ #ifndef _DEFLATE_H #define _DEFLATE_H diff --git a/src/libs/pdflib/libs/flate/infblock.c b/src/libs/pdflib/libs/flate/infblock.c index 4a80f22991..c011250efe 100644 --- a/src/libs/pdflib/libs/flate/infblock.c +++ b/src/libs/pdflib/libs/flate/infblock.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id$ */ +/* $Id: infblock.c 14574 2005-10-29 16:27:43Z bonefish $ */ #include "zutil.h" #include "infblock.h" diff --git a/src/libs/pdflib/libs/flate/infblock.h b/src/libs/pdflib/libs/flate/infblock.h index d26bd7817f..0002c6b8f6 100644 --- a/src/libs/pdflib/libs/flate/infblock.h +++ b/src/libs/pdflib/libs/flate/infblock.h @@ -9,7 +9,7 @@ */ -/* $Id$ */ +/* $Id: infblock.h 14574 2005-10-29 16:27:43Z bonefish $ */ /* struct inflate_blocks_state; */ typedef struct inflate_blocks_state FAR inflate_blocks_statef; diff --git a/src/libs/pdflib/libs/flate/infcodes.c b/src/libs/pdflib/libs/flate/infcodes.c index 258e7cc652..b9061bdfe9 100644 --- a/src/libs/pdflib/libs/flate/infcodes.c +++ b/src/libs/pdflib/libs/flate/infcodes.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id$ */ +/* $Id: infcodes.c 14574 2005-10-29 16:27:43Z bonefish $ */ #include "zutil.h" #include "inftrees.h" diff --git a/src/libs/pdflib/libs/flate/infcodes.h b/src/libs/pdflib/libs/flate/infcodes.h index d3988a251a..afc2430262 100644 --- a/src/libs/pdflib/libs/flate/infcodes.h +++ b/src/libs/pdflib/libs/flate/infcodes.h @@ -9,7 +9,7 @@ */ -/* $Id$ */ +/* $Id: infcodes.h 14574 2005-10-29 16:27:43Z bonefish $ */ struct inflate_codes_state; typedef struct inflate_codes_state FAR inflate_codes_statef; diff --git a/src/libs/pdflib/libs/flate/inffast.c b/src/libs/pdflib/libs/flate/inffast.c index 35b71dad90..13cab90cb9 100644 --- a/src/libs/pdflib/libs/flate/inffast.c +++ b/src/libs/pdflib/libs/flate/inffast.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id$ */ +/* $Id: inffast.c 14574 2005-10-29 16:27:43Z bonefish $ */ #include "zutil.h" #include "inftrees.h" diff --git a/src/libs/pdflib/libs/flate/inffast.h b/src/libs/pdflib/libs/flate/inffast.h index 8b3a6ea80f..acb552e00c 100644 --- a/src/libs/pdflib/libs/flate/inffast.h +++ b/src/libs/pdflib/libs/flate/inffast.h @@ -9,7 +9,7 @@ */ -/* $Id$ */ +/* $Id: inffast.h 14574 2005-10-29 16:27:43Z bonefish $ */ extern int inflate_fast OF(( uInt, diff --git a/src/libs/pdflib/libs/flate/inffixed.h b/src/libs/pdflib/libs/flate/inffixed.h index 4cc54b7752..7cc30e5637 100644 --- a/src/libs/pdflib/libs/flate/inffixed.h +++ b/src/libs/pdflib/libs/flate/inffixed.h @@ -8,7 +8,7 @@ */ -/* $Id$ */ +/* $Id: inffixed.h 14574 2005-10-29 16:27:43Z bonefish $ */ local uInt fixed_bl = 9; local uInt fixed_bd = 5; diff --git a/src/libs/pdflib/libs/flate/inflate.c b/src/libs/pdflib/libs/flate/inflate.c index 4c2ffc746e..059b96f9a5 100644 --- a/src/libs/pdflib/libs/flate/inflate.c +++ b/src/libs/pdflib/libs/flate/inflate.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id$ */ +/* $Id: inflate.c 14574 2005-10-29 16:27:43Z bonefish $ */ #include "zutil.h" #include "infblock.h" diff --git a/src/libs/pdflib/libs/flate/inftrees.c b/src/libs/pdflib/libs/flate/inftrees.c index 44715cc32d..9177e1f079 100644 --- a/src/libs/pdflib/libs/flate/inftrees.c +++ b/src/libs/pdflib/libs/flate/inftrees.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id$ */ +/* $Id: inftrees.c 14574 2005-10-29 16:27:43Z bonefish $ */ #include "zutil.h" #include "inftrees.h" diff --git a/src/libs/pdflib/libs/flate/inftrees.h b/src/libs/pdflib/libs/flate/inftrees.h index 0418b11aa1..a57b7d3033 100644 --- a/src/libs/pdflib/libs/flate/inftrees.h +++ b/src/libs/pdflib/libs/flate/inftrees.h @@ -12,7 +12,7 @@ that have 16-bit pointers (e.g. PC's in the small or medium model). */ -/* $Id$ */ +/* $Id: inftrees.h 14574 2005-10-29 16:27:43Z bonefish $ */ typedef struct inflate_huft_s FAR inflate_huft; diff --git a/src/libs/pdflib/libs/flate/infutil.c b/src/libs/pdflib/libs/flate/infutil.c index 4710b5a8c7..a901aa6cfe 100644 --- a/src/libs/pdflib/libs/flate/infutil.c +++ b/src/libs/pdflib/libs/flate/infutil.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id$ */ +/* $Id: infutil.c 14574 2005-10-29 16:27:43Z bonefish $ */ #include "zutil.h" #include "infblock.h" diff --git a/src/libs/pdflib/libs/flate/infutil.h b/src/libs/pdflib/libs/flate/infutil.h index e2740d052c..0f88af75ff 100644 --- a/src/libs/pdflib/libs/flate/infutil.h +++ b/src/libs/pdflib/libs/flate/infutil.h @@ -9,7 +9,7 @@ */ -/* $Id$ */ +/* $Id: infutil.h 14574 2005-10-29 16:27:43Z bonefish $ */ #ifndef _INFUTIL_H #define _INFUTIL_H diff --git a/src/libs/pdflib/libs/flate/trees.c b/src/libs/pdflib/libs/flate/trees.c index 789a9d2b4c..12d359f97b 100644 --- a/src/libs/pdflib/libs/flate/trees.c +++ b/src/libs/pdflib/libs/flate/trees.c @@ -29,8 +29,8 @@ * Addison-Wesley, 1983. ISBN 0-201-06672-6. */ -/* $Id$ */ -/* @(#) $Id$ */ +/* $Id: trees.c 14574 2005-10-29 16:27:43Z bonefish $ */ +/* @(#) $Id: trees.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* #define GEN_TREES_H */ diff --git a/src/libs/pdflib/libs/flate/trees.h b/src/libs/pdflib/libs/flate/trees.h index a85e989e8f..2788317b1d 100644 --- a/src/libs/pdflib/libs/flate/trees.h +++ b/src/libs/pdflib/libs/flate/trees.h @@ -1,7 +1,7 @@ /* header created automatically with -DGEN_TREES_H */ -/* $Id$ */ +/* $Id: trees.h 14574 2005-10-29 16:27:43Z bonefish $ */ local const ct_data static_ltree[L_CODES+2] = { {{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}}, diff --git a/src/libs/pdflib/libs/flate/uncompr.c b/src/libs/pdflib/libs/flate/uncompr.c index bcd60fefaf..fd51507224 100644 --- a/src/libs/pdflib/libs/flate/uncompr.c +++ b/src/libs/pdflib/libs/flate/uncompr.c @@ -3,8 +3,8 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id$ */ -/* @(#) $Id$ */ +/* $Id: uncompr.c 14574 2005-10-29 16:27:43Z bonefish $ */ +/* @(#) $Id: uncompr.c 14574 2005-10-29 16:27:43Z bonefish $ */ #include "zlib.h" diff --git a/src/libs/pdflib/libs/flate/zconf.h b/src/libs/pdflib/libs/flate/zconf.h index 06b296f2bc..5e51ea525b 100644 --- a/src/libs/pdflib/libs/flate/zconf.h +++ b/src/libs/pdflib/libs/flate/zconf.h @@ -4,9 +4,9 @@ */ -/* $Id$ */ +/* $Id: zconf.h 20092 2007-02-07 08:00:01Z axeld $ */ -/* @(#) $Id$ */ +/* @(#) $Id: zconf.h 20092 2007-02-07 08:00:01Z axeld $ */ #ifndef _ZCONF_H #define _ZCONF_H diff --git a/src/libs/pdflib/libs/flate/zlib.h b/src/libs/pdflib/libs/flate/zlib.h index cdf40d6268..1bfff7a070 100644 --- a/src/libs/pdflib/libs/flate/zlib.h +++ b/src/libs/pdflib/libs/flate/zlib.h @@ -29,7 +29,7 @@ */ -/* $Id$ */ +/* $Id: zlib.h 14574 2005-10-29 16:27:43Z bonefish $ */ #ifndef _ZLIB_H #define _ZLIB_H diff --git a/src/libs/pdflib/libs/flate/zutil.c b/src/libs/pdflib/libs/flate/zutil.c index 60f7e30536..0a48aa7a31 100644 --- a/src/libs/pdflib/libs/flate/zutil.c +++ b/src/libs/pdflib/libs/flate/zutil.c @@ -3,8 +3,8 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* $Id$ */ -/* @(#) $Id$ */ +/* $Id: zutil.c 14574 2005-10-29 16:27:43Z bonefish $ */ +/* @(#) $Id: zutil.c 14574 2005-10-29 16:27:43Z bonefish $ */ #include "zutil.h" diff --git a/src/libs/pdflib/libs/flate/zutil.h b/src/libs/pdflib/libs/flate/zutil.h index 3325b3e973..fa1df6a6cd 100644 --- a/src/libs/pdflib/libs/flate/zutil.h +++ b/src/libs/pdflib/libs/flate/zutil.h @@ -9,9 +9,9 @@ */ -/* $Id$ */ +/* $Id: zutil.h 14574 2005-10-29 16:27:43Z bonefish $ */ -/* @(#) $Id$ */ +/* @(#) $Id: zutil.h 14574 2005-10-29 16:27:43Z bonefish $ */ #ifndef _Z_UTIL_H #define _Z_UTIL_H diff --git a/src/libs/pdflib/libs/pdcore/Makefile b/src/libs/pdflib/libs/pdcore/Makefile index a24a97fd53..f81288bfd8 100644 --- a/src/libs/pdflib/libs/pdcore/Makefile +++ b/src/libs/pdflib/libs/pdcore/Makefile @@ -1,6 +1,6 @@ # Makefile for libpdcore # This generates a libtool convenience library -# $Id$ +# $Id: Makefile 14574 2005-10-29 16:27:43Z bonefish $ top_builddir = ../.. diff --git a/src/libs/pdflib/libs/pdcore/pc_chartabs.h b/src/libs/pdflib/libs/pdcore/pc_chartabs.h index dd69bdd482..4387b14a75 100644 --- a/src/libs/pdflib/libs/pdcore/pc_chartabs.h +++ b/src/libs/pdflib/libs/pdcore/pc_chartabs.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_chartabs.h 14574 2005-10-29 16:27:43Z bonefish $ * * This file contains all Adobe Glyph Names and Unicode tables. * diff --git a/src/libs/pdflib/libs/pdcore/pc_config.h b/src/libs/pdflib/libs/pdcore/pc_config.h index 5e284f3597..5c10a2365f 100644 --- a/src/libs/pdflib/libs/pdcore/pc_config.h +++ b/src/libs/pdflib/libs/pdcore/pc_config.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_config.h 29803 2009-03-30 14:48:57Z bonefish $ * * PDFlib portability and configuration definitions * diff --git a/src/libs/pdflib/libs/pdcore/pc_core.c b/src/libs/pdflib/libs/pdcore/pc_core.c index 72846323e5..1d2428f5a3 100644 --- a/src/libs/pdflib/libs/pdcore/pc_core.c +++ b/src/libs/pdflib/libs/pdcore/pc_core.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_core.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib core services * diff --git a/src/libs/pdflib/libs/pdcore/pc_core.h b/src/libs/pdflib/libs/pdcore/pc_core.h index 9f3f152e2a..980707c2a7 100644 --- a/src/libs/pdflib/libs/pdcore/pc_core.h +++ b/src/libs/pdflib/libs/pdcore/pc_core.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_core.h 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib core services: * - memory management diff --git a/src/libs/pdflib/libs/pdcore/pc_corefont.c b/src/libs/pdflib/libs/pdcore/pc_corefont.c index a867060005..3ebcd65722 100644 --- a/src/libs/pdflib/libs/pdcore/pc_corefont.c +++ b/src/libs/pdflib/libs/pdcore/pc_corefont.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_corefont.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib in-core font and basic font metric functions * diff --git a/src/libs/pdflib/libs/pdcore/pc_corefont.h b/src/libs/pdflib/libs/pdcore/pc_corefont.h index 095605b8bc..ff757c3684 100644 --- a/src/libs/pdflib/libs/pdcore/pc_corefont.h +++ b/src/libs/pdflib/libs/pdcore/pc_corefont.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_corefont.h 14574 2005-10-29 16:27:43Z bonefish $ * * Core font data structures and routines * diff --git a/src/libs/pdflib/libs/pdcore/pc_coremetr.h b/src/libs/pdflib/libs/pdcore/pc_coremetr.h index 8d07ee9f02..1b2375cf4f 100644 --- a/src/libs/pdflib/libs/pdcore/pc_coremetr.h +++ b/src/libs/pdflib/libs/pdcore/pc_coremetr.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_coremetr.h 14574 2005-10-29 16:27:43Z bonefish $ * * This file contains the metrics for the 14 base fonts independent * of an encoding. This file can be generated by the utility program diff --git a/src/libs/pdflib/libs/pdcore/pc_crypt.c b/src/libs/pdflib/libs/pdcore/pc_crypt.c index 1d029dfcb5..5174f46796 100644 --- a/src/libs/pdflib/libs/pdcore/pc_crypt.c +++ b/src/libs/pdflib/libs/pdcore/pc_crypt.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_crypt.c 14574 2005-10-29 16:27:43Z bonefish $ * * Routines for PDF encryption and decryption * diff --git a/src/libs/pdflib/libs/pdcore/pc_crypt.h b/src/libs/pdflib/libs/pdcore/pc_crypt.h index 561555a690..8ec3abc458 100644 --- a/src/libs/pdflib/libs/pdcore/pc_crypt.h +++ b/src/libs/pdflib/libs/pdcore/pc_crypt.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_crypt.h 14574 2005-10-29 16:27:43Z bonefish $ * * Crypto routines * diff --git a/src/libs/pdflib/libs/pdcore/pc_ebcdic.c b/src/libs/pdflib/libs/pdcore/pc_ebcdic.c index 8af37c4dea..4dc2583f6b 100644 --- a/src/libs/pdflib/libs/pdcore/pc_ebcdic.c +++ b/src/libs/pdflib/libs/pdcore/pc_ebcdic.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_ebcdic.c 14574 2005-10-29 16:27:43Z bonefish $ * * EBCDIC conversion routines * diff --git a/src/libs/pdflib/libs/pdcore/pc_ebcdic.h b/src/libs/pdflib/libs/pdcore/pc_ebcdic.h index 407b270670..83bac2ff66 100644 --- a/src/libs/pdflib/libs/pdcore/pc_ebcdic.h +++ b/src/libs/pdflib/libs/pdcore/pc_ebcdic.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_ebcdic.h 14574 2005-10-29 16:27:43Z bonefish $ * * EBCDIC conversion routines * diff --git a/src/libs/pdflib/libs/pdcore/pc_encoding.c b/src/libs/pdflib/libs/pdcore/pc_encoding.c index b0d6469f8a..ee3eda3c46 100644 --- a/src/libs/pdflib/libs/pdcore/pc_encoding.c +++ b/src/libs/pdflib/libs/pdcore/pc_encoding.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_encoding.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib in-core encodings and basic encoding functions * diff --git a/src/libs/pdflib/libs/pdcore/pc_encoding.h b/src/libs/pdflib/libs/pdcore/pc_encoding.h index d7a105404f..a082d14b55 100644 --- a/src/libs/pdflib/libs/pdcore/pc_encoding.h +++ b/src/libs/pdflib/libs/pdcore/pc_encoding.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_encoding.h 14574 2005-10-29 16:27:43Z bonefish $ * * Encoding data structures and routines * diff --git a/src/libs/pdflib/libs/pdcore/pc_file.c b/src/libs/pdflib/libs/pdcore/pc_file.c index 68ded647d7..b07dddfee1 100644 --- a/src/libs/pdflib/libs/pdcore/pc_file.c +++ b/src/libs/pdflib/libs/pdcore/pc_file.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_file.c 14574 2005-10-29 16:27:43Z bonefish $ * * Various file routines * diff --git a/src/libs/pdflib/libs/pdcore/pc_file.h b/src/libs/pdflib/libs/pdcore/pc_file.h index f97c300694..317dd74b46 100644 --- a/src/libs/pdflib/libs/pdcore/pc_file.h +++ b/src/libs/pdflib/libs/pdcore/pc_file.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_file.h 14574 2005-10-29 16:27:43Z bonefish $ * * Definitions for file routines * diff --git a/src/libs/pdflib/libs/pdcore/pc_font.c b/src/libs/pdflib/libs/pdcore/pc_font.c index ba6d471393..e258faa925 100644 --- a/src/libs/pdflib/libs/pdcore/pc_font.c +++ b/src/libs/pdflib/libs/pdcore/pc_font.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_font.c 14574 2005-10-29 16:27:43Z bonefish $ * * Basic font functions * diff --git a/src/libs/pdflib/libs/pdcore/pc_font.h b/src/libs/pdflib/libs/pdcore/pc_font.h index 03ffc160fd..203176a1ee 100644 --- a/src/libs/pdflib/libs/pdcore/pc_font.h +++ b/src/libs/pdflib/libs/pdcore/pc_font.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_font.h 14574 2005-10-29 16:27:43Z bonefish $ * * Header file for font handling * diff --git a/src/libs/pdflib/libs/pdcore/pc_generr.h b/src/libs/pdflib/libs/pdcore/pc_generr.h index c1efc8777b..411db83362 100644 --- a/src/libs/pdflib/libs/pdcore/pc_generr.h +++ b/src/libs/pdflib/libs/pdcore/pc_generr.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_generr.h 14574 2005-10-29 16:27:43Z bonefish $ * * PDCORE error messages * diff --git a/src/libs/pdflib/libs/pdcore/pc_geom.c b/src/libs/pdflib/libs/pdcore/pc_geom.c index 5eccfe5f1a..50890c65d8 100644 --- a/src/libs/pdflib/libs/pdcore/pc_geom.c +++ b/src/libs/pdflib/libs/pdcore/pc_geom.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_geom.c 14574 2005-10-29 16:27:43Z bonefish $ * * Various geometry routines * diff --git a/src/libs/pdflib/libs/pdcore/pc_geom.h b/src/libs/pdflib/libs/pdcore/pc_geom.h index 24f1bcb449..f740bb368a 100644 --- a/src/libs/pdflib/libs/pdcore/pc_geom.h +++ b/src/libs/pdflib/libs/pdcore/pc_geom.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_geom.h 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib core geometry utilities * diff --git a/src/libs/pdflib/libs/pdcore/pc_md5.c b/src/libs/pdflib/libs/pdcore/pc_md5.c index e4e5fc9386..466aa6696a 100644 --- a/src/libs/pdflib/libs/pdcore/pc_md5.c +++ b/src/libs/pdflib/libs/pdcore/pc_md5.c @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: pc_md5.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib MD5 message digest routines * diff --git a/src/libs/pdflib/libs/pdcore/pc_md5.h b/src/libs/pdflib/libs/pdcore/pc_md5.h index 048b37ea74..4b1064fe73 100644 --- a/src/libs/pdflib/libs/pdcore/pc_md5.h +++ b/src/libs/pdflib/libs/pdcore/pc_md5.h @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: pc_md5.h 14574 2005-10-29 16:27:43Z bonefish $ * * Header file for the PDFlib MD5 message digest routines * diff --git a/src/libs/pdflib/libs/pdcore/pc_nocarbon.h b/src/libs/pdflib/libs/pdcore/pc_nocarbon.h index f571d5320d..5fb967416b 100644 --- a/src/libs/pdflib/libs/pdcore/pc_nocarbon.h +++ b/src/libs/pdflib/libs/pdcore/pc_nocarbon.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_nocarbon.h 14574 2005-10-29 16:27:43Z bonefish $ * * Header for CodeWarrior to activate non-Carbon builds. * diff --git a/src/libs/pdflib/libs/pdcore/pc_optparse.c b/src/libs/pdflib/libs/pdcore/pc_optparse.c index d3d4e69d98..13ff7a4e70 100644 --- a/src/libs/pdflib/libs/pdcore/pc_optparse.c +++ b/src/libs/pdflib/libs/pdcore/pc_optparse.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_optparse.c 14574 2005-10-29 16:27:43Z bonefish $ * * Parser options routines * diff --git a/src/libs/pdflib/libs/pdcore/pc_optparse.h b/src/libs/pdflib/libs/pdcore/pc_optparse.h index 70a23ae049..5a5ac8e254 100644 --- a/src/libs/pdflib/libs/pdcore/pc_optparse.h +++ b/src/libs/pdflib/libs/pdcore/pc_optparse.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_optparse.h 14574 2005-10-29 16:27:43Z bonefish $ * * Definitions for option parser routines * diff --git a/src/libs/pdflib/libs/pdcore/pc_output.c b/src/libs/pdflib/libs/pdcore/pc_output.c index 808e07eb89..2e50238aa6 100644 --- a/src/libs/pdflib/libs/pdcore/pc_output.c +++ b/src/libs/pdflib/libs/pdcore/pc_output.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_output.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib output routines * diff --git a/src/libs/pdflib/libs/pdcore/pc_output.h b/src/libs/pdflib/libs/pdcore/pc_output.h index aabac603b4..ce9c5a5426 100644 --- a/src/libs/pdflib/libs/pdcore/pc_output.h +++ b/src/libs/pdflib/libs/pdcore/pc_output.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_output.h 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib output routines * diff --git a/src/libs/pdflib/libs/pdcore/pc_sbuf.c b/src/libs/pdflib/libs/pdcore/pc_sbuf.c index 4953aa11f5..7e6a9ce042 100644 --- a/src/libs/pdflib/libs/pdcore/pc_sbuf.c +++ b/src/libs/pdflib/libs/pdcore/pc_sbuf.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_sbuf.c 14574 2005-10-29 16:27:43Z bonefish $ * * Dynamically growing string buffers. * diff --git a/src/libs/pdflib/libs/pdcore/pc_sbuf.h b/src/libs/pdflib/libs/pdcore/pc_sbuf.h index 1c5baf08ad..a58565f3e5 100644 --- a/src/libs/pdflib/libs/pdcore/pc_sbuf.h +++ b/src/libs/pdflib/libs/pdcore/pc_sbuf.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_sbuf.h 14574 2005-10-29 16:27:43Z bonefish $ * * Dynamically growing string buffers. * diff --git a/src/libs/pdflib/libs/pdcore/pc_scope.c b/src/libs/pdflib/libs/pdcore/pc_scope.c index 27645faaf3..5c18f7d67c 100644 --- a/src/libs/pdflib/libs/pdcore/pc_scope.c +++ b/src/libs/pdflib/libs/pdcore/pc_scope.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_scope.c 14574 2005-10-29 16:27:43Z bonefish $ * * Scoping routines and macros * diff --git a/src/libs/pdflib/libs/pdcore/pc_scope.h b/src/libs/pdflib/libs/pdcore/pc_scope.h index 437909eca2..01bfb123b0 100644 --- a/src/libs/pdflib/libs/pdcore/pc_scope.h +++ b/src/libs/pdflib/libs/pdcore/pc_scope.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_scope.h 14574 2005-10-29 16:27:43Z bonefish $ * * Scoping routines and macros * diff --git a/src/libs/pdflib/libs/pdcore/pc_unicode.c b/src/libs/pdflib/libs/pdcore/pc_unicode.c index ac0bdd45ff..6c02680ee0 100644 --- a/src/libs/pdflib/libs/pdcore/pc_unicode.c +++ b/src/libs/pdflib/libs/pdcore/pc_unicode.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_unicode.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib routines for converting between Unicode values and Adobe glyph names * diff --git a/src/libs/pdflib/libs/pdcore/pc_unicode.h b/src/libs/pdflib/libs/pdcore/pc_unicode.h index 314f82dfbf..5dd185e547 100644 --- a/src/libs/pdflib/libs/pdcore/pc_unicode.h +++ b/src/libs/pdflib/libs/pdcore/pc_unicode.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_unicode.h 14574 2005-10-29 16:27:43Z bonefish $ * * Unicode glyph name conversion routines * diff --git a/src/libs/pdflib/libs/pdcore/pc_util.c b/src/libs/pdflib/libs/pdcore/pc_util.c index cfc23b0b00..3a1dff6ccc 100644 --- a/src/libs/pdflib/libs/pdcore/pc_util.c +++ b/src/libs/pdflib/libs/pdcore/pc_util.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_util.c 14574 2005-10-29 16:27:43Z bonefish $ * * Various utility routines * diff --git a/src/libs/pdflib/libs/pdcore/pc_util.h b/src/libs/pdflib/libs/pdcore/pc_util.h index adb5a61052..7ca575cdcf 100644 --- a/src/libs/pdflib/libs/pdcore/pc_util.h +++ b/src/libs/pdflib/libs/pdcore/pc_util.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pc_util.h 14574 2005-10-29 16:27:43Z bonefish $ * * Various utility routines * diff --git a/src/libs/pdflib/libs/pdflib/Makefile b/src/libs/pdflib/libs/pdflib/Makefile index 90a608bc76..9d865e4c30 100644 --- a/src/libs/pdflib/libs/pdflib/Makefile +++ b/src/libs/pdflib/libs/pdflib/Makefile @@ -1,5 +1,5 @@ # Makefile for PDFlib -# $Id$ +# $Id: Makefile 14574 2005-10-29 16:27:43Z bonefish $ top_builddir = ../.. diff --git a/src/libs/pdflib/libs/pdflib/PDFlib.bpf b/src/libs/pdflib/libs/pdflib/PDFlib.bpf index 4b134c56d1..38151c89cf 100644 --- a/src/libs/pdflib/libs/pdflib/PDFlib.bpf +++ b/src/libs/pdflib/libs/pdflib/PDFlib.bpf @@ -1,120 +1,120 @@ -//--------------------------------------------------------------------------- - -#include -#pragma hdrstop -//--------------------------------------------------------------------------- -USEUNIT("p_xgstate.c"); -USEUNIT("p_afm.c"); -USEUNIT("p_annots.c"); -USEUNIT("p_basic.c"); -USEUNIT("p_block.c"); -USEUNIT("p_bmp.c"); -USEUNIT("p_ccitt.c"); -USEUNIT("p_cid.c"); -USEUNIT("p_color.c"); -USEUNIT("p_draw.c"); -USEUNIT("p_encoding.c"); -USEUNIT("p_filter.c"); -USEUNIT("p_font.c"); -USEUNIT("p_gif.c"); -USEUNIT("p_gstate.c"); -USEUNIT("p_hostfont.c"); -USEUNIT("p_hyper.c"); -USEUNIT("p_icc.c"); -USEUNIT("p_icclib.c"); -USEUNIT("p_image.c"); -USEUNIT("p_jpeg.c"); -USEUNIT("p_kerning.c"); -USEUNIT("p_params.c"); -USEUNIT("p_pattern.c"); -USEUNIT("p_pdi.c"); -USEUNIT("p_pfm.c"); -USEUNIT("p_png.c"); -USEUNIT("p_resource.c"); -USEUNIT("p_shading.c"); -USEUNIT("p_subsett.c"); -USEUNIT("p_template.c"); -USEUNIT("p_text.c"); -USEUNIT("p_tiff.c"); -USEUNIT("p_truetype.c"); -USEUNIT("p_type1.c"); -USEUNIT("p_type3.c"); -USEUNIT("..\flate\zutil.c"); -USEUNIT("..\flate\adler32.c"); -USEUNIT("..\flate\compress.c"); -USEUNIT("..\flate\crc32.c"); -USEUNIT("..\flate\deflate.c"); -USEUNIT("..\flate\infblock.c"); -USEUNIT("..\flate\infcodes.c"); -USEUNIT("..\flate\inffast.c"); -USEUNIT("..\flate\inflate.c"); -USEUNIT("..\flate\inftrees.c"); -USEUNIT("..\flate\infutil.c"); -USEUNIT("..\flate\trees.c"); -USEUNIT("..\flate\uncompr.c"); -USEUNIT("..\pdcore\pc_util.c"); -USEUNIT("..\pdcore\pc_arc4.c"); -USEUNIT("..\pdcore\pc_core.c"); -USEUNIT("..\pdcore\pc_corefont.c"); -USEUNIT("..\pdcore\pc_crypt.c"); -USEUNIT("..\pdcore\pc_ebcdic.c"); -USEUNIT("..\pdcore\pc_encoding.c"); -USEUNIT("..\pdcore\pc_file.c"); -USEUNIT("..\pdcore\pc_font.c"); -USEUNIT("..\pdcore\pc_geom.c"); -USEUNIT("..\pdcore\pc_md5.c"); -USEUNIT("..\pdcore\pc_optparse.c"); -USEUNIT("..\pdcore\pc_output.c"); -USEUNIT("..\pdcore\pc_sbuf.c"); -USEUNIT("..\pdcore\pc_scope.c"); -USEUNIT("..\pdcore\pc_unicode.c"); -USEUNIT("..\png\pngvcrd.c"); -USEUNIT("..\png\png.c"); -USEUNIT("..\png\pngerror.c"); -USEUNIT("..\png\pngget.c"); -USEUNIT("..\png\pngmem.c"); -USEUNIT("..\png\pngread.c"); -USEUNIT("..\png\pngrio.c"); -USEUNIT("..\png\pngrtran.c"); -USEUNIT("..\png\pngrutil.c"); -USEUNIT("..\png\pngset.c"); -USEUNIT("..\png\pngtrans.c"); -USEUNIT("..\tiff\tif_zip.c"); -USEUNIT("..\tiff\tif_auxx.c"); -USEUNIT("..\tiff\tif_close.c"); -USEUNIT("..\tiff\tif_codec.c"); -USEUNIT("..\tiff\tif_compress.c"); -USEUNIT("..\tiff\tif_dir.c"); -USEUNIT("..\tiff\tif_dirinfo.c"); -USEUNIT("..\tiff\tif_dirread.c"); -USEUNIT("..\tiff\tif_dirwrite.c"); -USEUNIT("..\tiff\tif_dumpmode.c"); -USEUNIT("..\tiff\tif_error.c"); -USEUNIT("..\tiff\tif_fax3.c"); -USEUNIT("..\tiff\tif_fax3sm.c"); -USEUNIT("..\tiff\tif_flush.c"); -USEUNIT("..\tiff\tif_getimage.c"); -USEUNIT("..\tiff\tif_jpeg.c"); -USEUNIT("..\tiff\tif_luv.c"); -USEUNIT("..\tiff\tif_lzw.c"); -USEUNIT("..\tiff\tif_next.c"); -USEUNIT("..\tiff\tif_ojpeg.c"); -USEUNIT("..\tiff\tif_open.c"); -USEUNIT("..\tiff\tif_packbits.c"); -USEUNIT("..\tiff\tif_pixarlog.c"); -USEUNIT("..\tiff\tif_predict.c"); -USEUNIT("..\tiff\tif_print.c"); -USEUNIT("..\tiff\tif_read.c"); -USEUNIT("..\tiff\tif_strip.c"); -USEUNIT("..\tiff\tif_swab.c"); -USEUNIT("..\tiff\tif_thunder.c"); -USEUNIT("..\tiff\tif_tile.c"); -USEUNIT("..\tiff\tif_unix.c"); -USEUNIT("..\tiff\tif_version.c"); -USEUNIT("..\tiff\tif_warning.c"); -USEUNIT("..\tiff\tif_write.c"); -//--------------------------------------------------------------------------- -#define Library - -// Um eine Datei zur Bibliothek hinzuzufügen, wählen Sie im Projektmenü 'Zum Projekt hinzufügen'. - +//--------------------------------------------------------------------------- + +#include +#pragma hdrstop +//--------------------------------------------------------------------------- +USEUNIT("p_xgstate.c"); +USEUNIT("p_afm.c"); +USEUNIT("p_annots.c"); +USEUNIT("p_basic.c"); +USEUNIT("p_block.c"); +USEUNIT("p_bmp.c"); +USEUNIT("p_ccitt.c"); +USEUNIT("p_cid.c"); +USEUNIT("p_color.c"); +USEUNIT("p_draw.c"); +USEUNIT("p_encoding.c"); +USEUNIT("p_filter.c"); +USEUNIT("p_font.c"); +USEUNIT("p_gif.c"); +USEUNIT("p_gstate.c"); +USEUNIT("p_hostfont.c"); +USEUNIT("p_hyper.c"); +USEUNIT("p_icc.c"); +USEUNIT("p_icclib.c"); +USEUNIT("p_image.c"); +USEUNIT("p_jpeg.c"); +USEUNIT("p_kerning.c"); +USEUNIT("p_params.c"); +USEUNIT("p_pattern.c"); +USEUNIT("p_pdi.c"); +USEUNIT("p_pfm.c"); +USEUNIT("p_png.c"); +USEUNIT("p_resource.c"); +USEUNIT("p_shading.c"); +USEUNIT("p_subsett.c"); +USEUNIT("p_template.c"); +USEUNIT("p_text.c"); +USEUNIT("p_tiff.c"); +USEUNIT("p_truetype.c"); +USEUNIT("p_type1.c"); +USEUNIT("p_type3.c"); +USEUNIT("..\flate\zutil.c"); +USEUNIT("..\flate\adler32.c"); +USEUNIT("..\flate\compress.c"); +USEUNIT("..\flate\crc32.c"); +USEUNIT("..\flate\deflate.c"); +USEUNIT("..\flate\infblock.c"); +USEUNIT("..\flate\infcodes.c"); +USEUNIT("..\flate\inffast.c"); +USEUNIT("..\flate\inflate.c"); +USEUNIT("..\flate\inftrees.c"); +USEUNIT("..\flate\infutil.c"); +USEUNIT("..\flate\trees.c"); +USEUNIT("..\flate\uncompr.c"); +USEUNIT("..\pdcore\pc_util.c"); +USEUNIT("..\pdcore\pc_arc4.c"); +USEUNIT("..\pdcore\pc_core.c"); +USEUNIT("..\pdcore\pc_corefont.c"); +USEUNIT("..\pdcore\pc_crypt.c"); +USEUNIT("..\pdcore\pc_ebcdic.c"); +USEUNIT("..\pdcore\pc_encoding.c"); +USEUNIT("..\pdcore\pc_file.c"); +USEUNIT("..\pdcore\pc_font.c"); +USEUNIT("..\pdcore\pc_geom.c"); +USEUNIT("..\pdcore\pc_md5.c"); +USEUNIT("..\pdcore\pc_optparse.c"); +USEUNIT("..\pdcore\pc_output.c"); +USEUNIT("..\pdcore\pc_sbuf.c"); +USEUNIT("..\pdcore\pc_scope.c"); +USEUNIT("..\pdcore\pc_unicode.c"); +USEUNIT("..\png\pngvcrd.c"); +USEUNIT("..\png\png.c"); +USEUNIT("..\png\pngerror.c"); +USEUNIT("..\png\pngget.c"); +USEUNIT("..\png\pngmem.c"); +USEUNIT("..\png\pngread.c"); +USEUNIT("..\png\pngrio.c"); +USEUNIT("..\png\pngrtran.c"); +USEUNIT("..\png\pngrutil.c"); +USEUNIT("..\png\pngset.c"); +USEUNIT("..\png\pngtrans.c"); +USEUNIT("..\tiff\tif_zip.c"); +USEUNIT("..\tiff\tif_auxx.c"); +USEUNIT("..\tiff\tif_close.c"); +USEUNIT("..\tiff\tif_codec.c"); +USEUNIT("..\tiff\tif_compress.c"); +USEUNIT("..\tiff\tif_dir.c"); +USEUNIT("..\tiff\tif_dirinfo.c"); +USEUNIT("..\tiff\tif_dirread.c"); +USEUNIT("..\tiff\tif_dirwrite.c"); +USEUNIT("..\tiff\tif_dumpmode.c"); +USEUNIT("..\tiff\tif_error.c"); +USEUNIT("..\tiff\tif_fax3.c"); +USEUNIT("..\tiff\tif_fax3sm.c"); +USEUNIT("..\tiff\tif_flush.c"); +USEUNIT("..\tiff\tif_getimage.c"); +USEUNIT("..\tiff\tif_jpeg.c"); +USEUNIT("..\tiff\tif_luv.c"); +USEUNIT("..\tiff\tif_lzw.c"); +USEUNIT("..\tiff\tif_next.c"); +USEUNIT("..\tiff\tif_ojpeg.c"); +USEUNIT("..\tiff\tif_open.c"); +USEUNIT("..\tiff\tif_packbits.c"); +USEUNIT("..\tiff\tif_pixarlog.c"); +USEUNIT("..\tiff\tif_predict.c"); +USEUNIT("..\tiff\tif_print.c"); +USEUNIT("..\tiff\tif_read.c"); +USEUNIT("..\tiff\tif_strip.c"); +USEUNIT("..\tiff\tif_swab.c"); +USEUNIT("..\tiff\tif_thunder.c"); +USEUNIT("..\tiff\tif_tile.c"); +USEUNIT("..\tiff\tif_unix.c"); +USEUNIT("..\tiff\tif_version.c"); +USEUNIT("..\tiff\tif_warning.c"); +USEUNIT("..\tiff\tif_write.c"); +//--------------------------------------------------------------------------- +#define Library + +// Um eine Datei zur Bibliothek hinzuzufügen, wählen Sie im Projektmenü 'Zum Projekt hinzufügen'. + diff --git a/src/libs/pdflib/libs/pdflib/p_afm.c b/src/libs/pdflib/libs/pdflib/p_afm.c index 17dc896a0d..1c39fa6120 100644 --- a/src/libs/pdflib/libs/pdflib/p_afm.c +++ b/src/libs/pdflib/libs/pdflib/p_afm.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_afm.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib AFM parsing routines * diff --git a/src/libs/pdflib/libs/pdflib/p_annots.c b/src/libs/pdflib/libs/pdflib/p_annots.c index abf857cab8..9584f52230 100644 --- a/src/libs/pdflib/libs/pdflib/p_annots.c +++ b/src/libs/pdflib/libs/pdflib/p_annots.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_annots.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib routines for annnotations * diff --git a/src/libs/pdflib/libs/pdflib/p_basic.c b/src/libs/pdflib/libs/pdflib/p_basic.c index 9eeb9095e5..880500b420 100644 --- a/src/libs/pdflib/libs/pdflib/p_basic.c +++ b/src/libs/pdflib/libs/pdflib/p_basic.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_basic.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib general routines * diff --git a/src/libs/pdflib/libs/pdflib/p_block.c b/src/libs/pdflib/libs/pdflib/p_block.c index 5288218c6b..8bf7ac0482 100644 --- a/src/libs/pdflib/libs/pdflib/p_block.c +++ b/src/libs/pdflib/libs/pdflib/p_block.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_block.c 14574 2005-10-29 16:27:43Z bonefish $ * * Block processing routines (require the PDI library) * diff --git a/src/libs/pdflib/libs/pdflib/p_bmp.c b/src/libs/pdflib/libs/pdflib/p_bmp.c index baa551815b..67adccfb7b 100644 --- a/src/libs/pdflib/libs/pdflib/p_bmp.c +++ b/src/libs/pdflib/libs/pdflib/p_bmp.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_bmp.c 14574 2005-10-29 16:27:43Z bonefish $ * * BMP processing for PDFlib * diff --git a/src/libs/pdflib/libs/pdflib/p_ccitt.c b/src/libs/pdflib/libs/pdflib/p_ccitt.c index 4055d321fb..866c8c2c61 100644 --- a/src/libs/pdflib/libs/pdflib/p_ccitt.c +++ b/src/libs/pdflib/libs/pdflib/p_ccitt.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_ccitt.c 14574 2005-10-29 16:27:43Z bonefish $ * * CCITT (Fax G3 and G4) processing for PDFlib * diff --git a/src/libs/pdflib/libs/pdflib/p_cid.c b/src/libs/pdflib/libs/pdflib/p_cid.c index 67ce4b5a10..8fb922b00e 100644 --- a/src/libs/pdflib/libs/pdflib/p_cid.c +++ b/src/libs/pdflib/libs/pdflib/p_cid.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_cid.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib CID font handling routines * diff --git a/src/libs/pdflib/libs/pdflib/p_cid.h b/src/libs/pdflib/libs/pdflib/p_cid.h index 28db6cc3b4..6969db4272 100644 --- a/src/libs/pdflib/libs/pdflib/p_cid.h +++ b/src/libs/pdflib/libs/pdflib/p_cid.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_cid.h 14574 2005-10-29 16:27:43Z bonefish $ * * Header file for PDFlib CID font information * diff --git a/src/libs/pdflib/libs/pdflib/p_color.c b/src/libs/pdflib/libs/pdflib/p_color.c index b50cf46c5c..aec4b48866 100644 --- a/src/libs/pdflib/libs/pdflib/p_color.c +++ b/src/libs/pdflib/libs/pdflib/p_color.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_color.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib color routines * diff --git a/src/libs/pdflib/libs/pdflib/p_color.h b/src/libs/pdflib/libs/pdflib/p_color.h index 2d3f885a00..a1238209c7 100644 --- a/src/libs/pdflib/libs/pdflib/p_color.h +++ b/src/libs/pdflib/libs/pdflib/p_color.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_color.h 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib color definitions * diff --git a/src/libs/pdflib/libs/pdflib/p_draw.c b/src/libs/pdflib/libs/pdflib/p_draw.c index 2e885a574f..328757c00d 100644 --- a/src/libs/pdflib/libs/pdflib/p_draw.c +++ b/src/libs/pdflib/libs/pdflib/p_draw.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_draw.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib drawing routines * diff --git a/src/libs/pdflib/libs/pdflib/p_encoding.c b/src/libs/pdflib/libs/pdflib/p_encoding.c index 02229aa8e6..9d96fdc8ea 100644 --- a/src/libs/pdflib/libs/pdflib/p_encoding.c +++ b/src/libs/pdflib/libs/pdflib/p_encoding.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_encoding.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib encoding handling routines * diff --git a/src/libs/pdflib/libs/pdflib/p_filter.c b/src/libs/pdflib/libs/pdflib/p_filter.c index 344cbee3cc..bb038e94e3 100644 --- a/src/libs/pdflib/libs/pdflib/p_filter.c +++ b/src/libs/pdflib/libs/pdflib/p_filter.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_filter.c 14574 2005-10-29 16:27:43Z bonefish $ * * ASCII85 and Hex encoding for PDFlib * diff --git a/src/libs/pdflib/libs/pdflib/p_font.c b/src/libs/pdflib/libs/pdflib/p_font.c index 9af84bb6ef..ba423a0c63 100644 --- a/src/libs/pdflib/libs/pdflib/p_font.c +++ b/src/libs/pdflib/libs/pdflib/p_font.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_font.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib font handling routines * diff --git a/src/libs/pdflib/libs/pdflib/p_font.h b/src/libs/pdflib/libs/pdflib/p_font.h index 511caf1691..cfc7e13f7d 100644 --- a/src/libs/pdflib/libs/pdflib/p_font.h +++ b/src/libs/pdflib/libs/pdflib/p_font.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_font.h 14574 2005-10-29 16:27:43Z bonefish $ * * Header file for the PDFlib font subsystem * diff --git a/src/libs/pdflib/libs/pdflib/p_generr.h b/src/libs/pdflib/libs/pdflib/p_generr.h index 899a8cad68..922451f126 100644 --- a/src/libs/pdflib/libs/pdflib/p_generr.h +++ b/src/libs/pdflib/libs/pdflib/p_generr.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_generr.h 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib error messages * diff --git a/src/libs/pdflib/libs/pdflib/p_gif.c b/src/libs/pdflib/libs/pdflib/p_gif.c index 5407907ea2..db4c08f880 100644 --- a/src/libs/pdflib/libs/pdflib/p_gif.c +++ b/src/libs/pdflib/libs/pdflib/p_gif.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_gif.c 14574 2005-10-29 16:27:43Z bonefish $ * * GIF processing for PDFlib * diff --git a/src/libs/pdflib/libs/pdflib/p_gstate.c b/src/libs/pdflib/libs/pdflib/p_gstate.c index 02a3482f3e..bbe06ca09a 100644 --- a/src/libs/pdflib/libs/pdflib/p_gstate.c +++ b/src/libs/pdflib/libs/pdflib/p_gstate.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_gstate.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib routines dealing with the graphics states * diff --git a/src/libs/pdflib/libs/pdflib/p_hkscmyk.h b/src/libs/pdflib/libs/pdflib/p_hkscmyk.h index 6f622cdd18..b507703382 100644 --- a/src/libs/pdflib/libs/pdflib/p_hkscmyk.h +++ b/src/libs/pdflib/libs/pdflib/p_hkscmyk.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_hkscmyk.h 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib HKS spot CMYK color table * diff --git a/src/libs/pdflib/libs/pdflib/p_hkslab.h b/src/libs/pdflib/libs/pdflib/p_hkslab.h index d77a79b4e2..5b195be17f 100644 --- a/src/libs/pdflib/libs/pdflib/p_hkslab.h +++ b/src/libs/pdflib/libs/pdflib/p_hkslab.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_hkslab.h 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib HKS spot LAB color table * diff --git a/src/libs/pdflib/libs/pdflib/p_hostfont.c b/src/libs/pdflib/libs/pdflib/p_hostfont.c index fad4ae82b2..840aeb42da 100644 --- a/src/libs/pdflib/libs/pdflib/p_hostfont.c +++ b/src/libs/pdflib/libs/pdflib/p_hostfont.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_hostfont.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib host font handling routines for Windows and Mac * diff --git a/src/libs/pdflib/libs/pdflib/p_hyper.c b/src/libs/pdflib/libs/pdflib/p_hyper.c index 58fff821b7..f1cfb4fdbf 100644 --- a/src/libs/pdflib/libs/pdflib/p_hyper.c +++ b/src/libs/pdflib/libs/pdflib/p_hyper.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_hyper.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib routines for hypertext stuff: bookmarks, document info, transitions * diff --git a/src/libs/pdflib/libs/pdflib/p_icc.c b/src/libs/pdflib/libs/pdflib/p_icc.c index 554ae37afe..ca6217df81 100644 --- a/src/libs/pdflib/libs/pdflib/p_icc.c +++ b/src/libs/pdflib/libs/pdflib/p_icc.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_icc.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib ICC handling routines * diff --git a/src/libs/pdflib/libs/pdflib/p_icc.h b/src/libs/pdflib/libs/pdflib/p_icc.h index 0366c8cb78..cfa12219f3 100644 --- a/src/libs/pdflib/libs/pdflib/p_icc.h +++ b/src/libs/pdflib/libs/pdflib/p_icc.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_icc.h 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib ICC typedefs, structures, and enums * diff --git a/src/libs/pdflib/libs/pdflib/p_icc9809.h b/src/libs/pdflib/libs/pdflib/p_icc9809.h index 16ba9d7b97..189d207a45 100644 --- a/src/libs/pdflib/libs/pdflib/p_icc9809.h +++ b/src/libs/pdflib/libs/pdflib/p_icc9809.h @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: p_icc9809.h 14574 2005-10-29 16:27:43Z bonefish $ * * Header file of ICC (name see note above) for ICClib and PDFlib * diff --git a/src/libs/pdflib/libs/pdflib/p_icclib.c b/src/libs/pdflib/libs/pdflib/p_icclib.c index c16b276555..ca8c7cb268 100644 --- a/src/libs/pdflib/libs/pdflib/p_icclib.c +++ b/src/libs/pdflib/libs/pdflib/p_icclib.c @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: p_icclib.c 14574 2005-10-29 16:27:43Z bonefish $ * * ICClib routines for PDFlib, slightly modified from the original ICClib. * (see below). diff --git a/src/libs/pdflib/libs/pdflib/p_icclib.h b/src/libs/pdflib/libs/pdflib/p_icclib.h index bbd78a4a2e..9b6dbc179e 100644 --- a/src/libs/pdflib/libs/pdflib/p_icclib.h +++ b/src/libs/pdflib/libs/pdflib/p_icclib.h @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: p_icclib.h 14574 2005-10-29 16:27:43Z bonefish $ * * ICClib Header file icc.h for PDFlib * diff --git a/src/libs/pdflib/libs/pdflib/p_image.c b/src/libs/pdflib/libs/pdflib/p_image.c index 374f43f0b4..11c58f0c64 100644 --- a/src/libs/pdflib/libs/pdflib/p_image.c +++ b/src/libs/pdflib/libs/pdflib/p_image.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_image.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib image routines * diff --git a/src/libs/pdflib/libs/pdflib/p_image.h b/src/libs/pdflib/libs/pdflib/p_image.h index 6195b50abf..f426a8d049 100644 --- a/src/libs/pdflib/libs/pdflib/p_image.h +++ b/src/libs/pdflib/libs/pdflib/p_image.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_image.h 14574 2005-10-29 16:27:43Z bonefish $ * * Header file for the PDFlib image subsystem * diff --git a/src/libs/pdflib/libs/pdflib/p_intern.h b/src/libs/pdflib/libs/pdflib/p_intern.h index 3cb84f9bb8..cc5b17a4a9 100644 --- a/src/libs/pdflib/libs/pdflib/p_intern.h +++ b/src/libs/pdflib/libs/pdflib/p_intern.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_intern.h 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib internal definitions * diff --git a/src/libs/pdflib/libs/pdflib/p_jpeg.c b/src/libs/pdflib/libs/pdflib/p_jpeg.c index 3af42b5299..fd47380751 100644 --- a/src/libs/pdflib/libs/pdflib/p_jpeg.c +++ b/src/libs/pdflib/libs/pdflib/p_jpeg.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_jpeg.c 14574 2005-10-29 16:27:43Z bonefish $ * * JPEG processing for PDFlib * diff --git a/src/libs/pdflib/libs/pdflib/p_kerning.c b/src/libs/pdflib/libs/pdflib/p_kerning.c index 281fd1b6bb..6237f20d31 100644 --- a/src/libs/pdflib/libs/pdflib/p_kerning.c +++ b/src/libs/pdflib/libs/pdflib/p_kerning.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_kerning.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib kerning routines * diff --git a/src/libs/pdflib/libs/pdflib/p_keyconn.h b/src/libs/pdflib/libs/pdflib/p_keyconn.h index ab58a2e3a8..19db744d75 100644 --- a/src/libs/pdflib/libs/pdflib/p_keyconn.h +++ b/src/libs/pdflib/libs/pdflib/p_keyconn.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_keyconn.h 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib shared keys connection lists * diff --git a/src/libs/pdflib/libs/pdflib/p_pantlab.h b/src/libs/pdflib/libs/pdflib/p_pantlab.h index d657d9b619..041e7ea170 100644 --- a/src/libs/pdflib/libs/pdflib/p_pantlab.h +++ b/src/libs/pdflib/libs/pdflib/p_pantlab.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_pantlab.h 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib PANTONE spot LAB color table derived from * PANTONE MATCHING SYSTEM diff --git a/src/libs/pdflib/libs/pdflib/p_params.c b/src/libs/pdflib/libs/pdflib/p_params.c index f45128850b..656f402882 100644 --- a/src/libs/pdflib/libs/pdflib/p_params.c +++ b/src/libs/pdflib/libs/pdflib/p_params.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_params.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib parameter handling * diff --git a/src/libs/pdflib/libs/pdflib/p_params.h b/src/libs/pdflib/libs/pdflib/p_params.h index 281d0dfc36..a0fd73b734 100644 --- a/src/libs/pdflib/libs/pdflib/p_params.h +++ b/src/libs/pdflib/libs/pdflib/p_params.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_params.h 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib parameter table * diff --git a/src/libs/pdflib/libs/pdflib/p_pattern.c b/src/libs/pdflib/libs/pdflib/p_pattern.c index 98f21945e5..9a4b10e9e7 100644 --- a/src/libs/pdflib/libs/pdflib/p_pattern.c +++ b/src/libs/pdflib/libs/pdflib/p_pattern.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_pattern.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib pattern routines * diff --git a/src/libs/pdflib/libs/pdflib/p_pdi.c b/src/libs/pdflib/libs/pdflib/p_pdi.c index 71e6bc0b03..4b10467637 100644 --- a/src/libs/pdflib/libs/pdflib/p_pdi.c +++ b/src/libs/pdflib/libs/pdflib/p_pdi.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_pdi.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDF import routines (require the PDI library) * diff --git a/src/libs/pdflib/libs/pdflib/p_pfm.c b/src/libs/pdflib/libs/pdflib/p_pfm.c index be49b32137..c459291c2c 100644 --- a/src/libs/pdflib/libs/pdflib/p_pfm.c +++ b/src/libs/pdflib/libs/pdflib/p_pfm.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_pfm.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib routines for fast reading of PFM font metrics files * diff --git a/src/libs/pdflib/libs/pdflib/p_png.c b/src/libs/pdflib/libs/pdflib/p_png.c index 618b3b1dc4..e02e221503 100644 --- a/src/libs/pdflib/libs/pdflib/p_png.c +++ b/src/libs/pdflib/libs/pdflib/p_png.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_png.c 14574 2005-10-29 16:27:43Z bonefish $ * * PNG processing for PDFlib * diff --git a/src/libs/pdflib/libs/pdflib/p_resource.c b/src/libs/pdflib/libs/pdflib/p_resource.c index 6bada5ec10..af06577071 100644 --- a/src/libs/pdflib/libs/pdflib/p_resource.c +++ b/src/libs/pdflib/libs/pdflib/p_resource.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_resource.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib resource routines * diff --git a/src/libs/pdflib/libs/pdflib/p_shading.c b/src/libs/pdflib/libs/pdflib/p_shading.c index 6cef5fe8c4..34dbfd8477 100644 --- a/src/libs/pdflib/libs/pdflib/p_shading.c +++ b/src/libs/pdflib/libs/pdflib/p_shading.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_shading.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib routines for smooth shading * diff --git a/src/libs/pdflib/libs/pdflib/p_subsett.c b/src/libs/pdflib/libs/pdflib/p_subsett.c index bdebb8cc8b..63c7be9b15 100644 --- a/src/libs/pdflib/libs/pdflib/p_subsett.c +++ b/src/libs/pdflib/libs/pdflib/p_subsett.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_subsett.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib subsetting routines * diff --git a/src/libs/pdflib/libs/pdflib/p_template.c b/src/libs/pdflib/libs/pdflib/p_template.c index b1e42e77cb..7ed8977c3e 100644 --- a/src/libs/pdflib/libs/pdflib/p_template.c +++ b/src/libs/pdflib/libs/pdflib/p_template.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_template.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib template routines * diff --git a/src/libs/pdflib/libs/pdflib/p_text.c b/src/libs/pdflib/libs/pdflib/p_text.c index 9bb2230285..7fbc576b6b 100644 --- a/src/libs/pdflib/libs/pdflib/p_text.c +++ b/src/libs/pdflib/libs/pdflib/p_text.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_text.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib text routines * diff --git a/src/libs/pdflib/libs/pdflib/p_tiff.c b/src/libs/pdflib/libs/pdflib/p_tiff.c index 25fa2286a9..ebc65f40f5 100644 --- a/src/libs/pdflib/libs/pdflib/p_tiff.c +++ b/src/libs/pdflib/libs/pdflib/p_tiff.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_tiff.c 14574 2005-10-29 16:27:43Z bonefish $ * * TIFF processing for PDFlib * diff --git a/src/libs/pdflib/libs/pdflib/p_truetype.c b/src/libs/pdflib/libs/pdflib/p_truetype.c index 85c6eb4d47..b315c9a0e6 100644 --- a/src/libs/pdflib/libs/pdflib/p_truetype.c +++ b/src/libs/pdflib/libs/pdflib/p_truetype.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_truetype.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib TrueType handling routines * diff --git a/src/libs/pdflib/libs/pdflib/p_truetype.h b/src/libs/pdflib/libs/pdflib/p_truetype.h index 0a3c73145d..eb83597fa5 100644 --- a/src/libs/pdflib/libs/pdflib/p_truetype.h +++ b/src/libs/pdflib/libs/pdflib/p_truetype.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_truetype.h 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib TrueType typedefs, structures, and enums * diff --git a/src/libs/pdflib/libs/pdflib/p_type1.c b/src/libs/pdflib/libs/pdflib/p_type1.c index 4b2cec7f13..e2b5f1327e 100644 --- a/src/libs/pdflib/libs/pdflib/p_type1.c +++ b/src/libs/pdflib/libs/pdflib/p_type1.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_type1.c 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib Type1 font handling routines * diff --git a/src/libs/pdflib/libs/pdflib/p_type3.c b/src/libs/pdflib/libs/pdflib/p_type3.c index 7b1eda56a5..7d00c16efb 100644 --- a/src/libs/pdflib/libs/pdflib/p_type3.c +++ b/src/libs/pdflib/libs/pdflib/p_type3.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_type3.c 14574 2005-10-29 16:27:43Z bonefish $ * * Routines for Type 3 (user-defined) fonts * diff --git a/src/libs/pdflib/libs/pdflib/p_xgstate.c b/src/libs/pdflib/libs/pdflib/p_xgstate.c index 31484f62df..508a4696d3 100644 --- a/src/libs/pdflib/libs/pdflib/p_xgstate.c +++ b/src/libs/pdflib/libs/pdflib/p_xgstate.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: p_xgstate.c 14574 2005-10-29 16:27:43Z bonefish $ * * Extended graphics state handling * diff --git a/src/libs/pdflib/libs/pdflib/pdflib.h b/src/libs/pdflib/libs/pdflib/pdflib.h index ccf52cdd4d..563035f711 100644 --- a/src/libs/pdflib/libs/pdflib/pdflib.h +++ b/src/libs/pdflib/libs/pdflib/pdflib.h @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pdflib.h 14574 2005-10-29 16:27:43Z bonefish $ * * PDFlib public function and constant declarations * diff --git a/src/libs/pdflib/libs/pdflib/resource.h b/src/libs/pdflib/libs/pdflib/resource.h index 06e4012bf5..82733d8246 100644 --- a/src/libs/pdflib/libs/pdflib/resource.h +++ b/src/libs/pdflib/libs/pdflib/resource.h @@ -5,7 +5,7 @@ // Next default values for new objects // -/* $Id$ */ +/* $Id: resource.h 14574 2005-10-29 16:27:43Z bonefish $ */ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS diff --git a/src/libs/pdflib/libs/png/Makefile b/src/libs/pdflib/libs/png/Makefile index 94eeede182..9e7937acdb 100644 --- a/src/libs/pdflib/libs/png/Makefile +++ b/src/libs/pdflib/libs/png/Makefile @@ -1,6 +1,6 @@ # Makefile for libpng 1.2.5 # This generates a libtool convenience library -# $Id$ +# $Id: Makefile 14574 2005-10-29 16:27:43Z bonefish $ top_builddir = ../.. diff --git a/src/libs/pdflib/libs/png/png.c b/src/libs/pdflib/libs/png/png.c index ab811fc4e2..1ada0a8960 100644 --- a/src/libs/pdflib/libs/png/png.c +++ b/src/libs/pdflib/libs/png/png.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: png.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* png.c - location for general purpose libpng functions * diff --git a/src/libs/pdflib/libs/png/png.h b/src/libs/pdflib/libs/png/png.h index 62518695b5..32bb0c2c3c 100644 --- a/src/libs/pdflib/libs/png/png.h +++ b/src/libs/pdflib/libs/png/png.h @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: png.h 14574 2005-10-29 16:27:43Z bonefish $ */ /* png.h - header file for PNG reference library * diff --git a/src/libs/pdflib/libs/png/pngasmrd.h b/src/libs/pdflib/libs/png/pngasmrd.h index b6b068ce66..36407b6080 100644 --- a/src/libs/pdflib/libs/png/pngasmrd.h +++ b/src/libs/pdflib/libs/png/pngasmrd.h @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: pngasmrd.h 14574 2005-10-29 16:27:43Z bonefish $ */ /* pngasmrd.h - assembler version of utilities to read a PNG file * diff --git a/src/libs/pdflib/libs/png/pngconf.h b/src/libs/pdflib/libs/png/pngconf.h index c7bf85b466..64a43bd109 100644 --- a/src/libs/pdflib/libs/png/pngconf.h +++ b/src/libs/pdflib/libs/png/pngconf.h @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: pngconf.h 14574 2005-10-29 16:27:43Z bonefish $ */ /* pngconf.h - machine configurable file for libpng * diff --git a/src/libs/pdflib/libs/png/pngerror.c b/src/libs/pdflib/libs/png/pngerror.c index 367ef2e22d..2732f1cbd7 100644 --- a/src/libs/pdflib/libs/png/pngerror.c +++ b/src/libs/pdflib/libs/png/pngerror.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: pngerror.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* pngerror.c - stub functions for i/o and memory allocation * diff --git a/src/libs/pdflib/libs/png/pngget.c b/src/libs/pdflib/libs/png/pngget.c index 2ffcd1b688..a9bd66343a 100644 --- a/src/libs/pdflib/libs/png/pngget.c +++ b/src/libs/pdflib/libs/png/pngget.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: pngget.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* pngget.c - retrieval of values from info struct * diff --git a/src/libs/pdflib/libs/png/pngmem.c b/src/libs/pdflib/libs/png/pngmem.c index 147e870e47..c0ce52133f 100644 --- a/src/libs/pdflib/libs/png/pngmem.c +++ b/src/libs/pdflib/libs/png/pngmem.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: pngmem.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* pngmem.c - stub functions for memory allocation * diff --git a/src/libs/pdflib/libs/png/pngread.c b/src/libs/pdflib/libs/png/pngread.c index 0ff86084a4..1d5cd2b981 100644 --- a/src/libs/pdflib/libs/png/pngread.c +++ b/src/libs/pdflib/libs/png/pngread.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: pngread.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* pngread.c - read a PNG file * diff --git a/src/libs/pdflib/libs/png/pngrio.c b/src/libs/pdflib/libs/png/pngrio.c index 0f2635b2ee..4341b73aa8 100644 --- a/src/libs/pdflib/libs/png/pngrio.c +++ b/src/libs/pdflib/libs/png/pngrio.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: pngrio.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* pngrio.c - functions for data input * diff --git a/src/libs/pdflib/libs/png/pngrtran.c b/src/libs/pdflib/libs/png/pngrtran.c index 3590349783..f48c4fcf36 100644 --- a/src/libs/pdflib/libs/png/pngrtran.c +++ b/src/libs/pdflib/libs/png/pngrtran.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: pngrtran.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* pngrtran.c - transforms the data in a row for PNG readers * diff --git a/src/libs/pdflib/libs/png/pngrutil.c b/src/libs/pdflib/libs/png/pngrutil.c index fe3d88f73d..77d50e44fa 100644 --- a/src/libs/pdflib/libs/png/pngrutil.c +++ b/src/libs/pdflib/libs/png/pngrutil.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: pngrutil.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* pngrutil.c - utilities to read a PNG file * diff --git a/src/libs/pdflib/libs/png/pngset.c b/src/libs/pdflib/libs/png/pngset.c index a32da32c10..48e44454f8 100644 --- a/src/libs/pdflib/libs/png/pngset.c +++ b/src/libs/pdflib/libs/png/pngset.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: pngset.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* pngset.c - storage of image information into info struct * diff --git a/src/libs/pdflib/libs/png/pngtrans.c b/src/libs/pdflib/libs/png/pngtrans.c index f0c1261665..b07c632a95 100644 --- a/src/libs/pdflib/libs/png/pngtrans.c +++ b/src/libs/pdflib/libs/png/pngtrans.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: pngtrans.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * diff --git a/src/libs/pdflib/libs/png/pngvcrd.c b/src/libs/pdflib/libs/png/pngvcrd.c index fd84f385b1..5fc37de551 100644 --- a/src/libs/pdflib/libs/png/pngvcrd.c +++ b/src/libs/pdflib/libs/png/pngvcrd.c @@ -12,7 +12,7 @@ * */ -/* $Id$ */ +/* $Id: pngvcrd.c 14574 2005-10-29 16:27:43Z bonefish $ */ #define PNG_INTERNAL #include "png.h" diff --git a/src/libs/pdflib/libs/tiff/Makefile b/src/libs/pdflib/libs/tiff/Makefile index 0bf6718b42..f88cd3bf40 100644 --- a/src/libs/pdflib/libs/tiff/Makefile +++ b/src/libs/pdflib/libs/tiff/Makefile @@ -1,6 +1,6 @@ # Makefile for tifflib # This generates a libtool convenience library -# $Id$ +# $Id: Makefile 14574 2005-10-29 16:27:43Z bonefish $ top_builddir = ../.. diff --git a/src/libs/pdflib/libs/tiff/port.h b/src/libs/pdflib/libs/tiff/port.h index fb4add8025..eec458fe98 100644 --- a/src/libs/pdflib/libs/tiff/port.h +++ b/src/libs/pdflib/libs/tiff/port.h @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: port.h 28305 2008-10-23 21:46:26Z bonefish $ */ #ifndef TIFF_PORT_H #define TIFF_PORT_H 1 diff --git a/src/libs/pdflib/libs/tiff/t4.h b/src/libs/pdflib/libs/tiff/t4.h index aaecd08ea8..8edd843095 100644 --- a/src/libs/pdflib/libs/tiff/t4.h +++ b/src/libs/pdflib/libs/tiff/t4.h @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: t4.h 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_auxx.c b/src/libs/pdflib/libs/tiff/tif_auxx.c index 529ddf19b6..1e2f723173 100644 --- a/src/libs/pdflib/libs/tiff/tif_auxx.c +++ b/src/libs/pdflib/libs/tiff/tif_auxx.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_auxx.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1991-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_close.c b/src/libs/pdflib/libs/tiff/tif_close.c index be8b0d1551..33c2a92572 100644 --- a/src/libs/pdflib/libs/tiff/tif_close.c +++ b/src/libs/pdflib/libs/tiff/tif_close.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_close.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_codec.c b/src/libs/pdflib/libs/tiff/tif_codec.c index b332e35935..dd62dfc18a 100644 --- a/src/libs/pdflib/libs/tiff/tif_codec.c +++ b/src/libs/pdflib/libs/tiff/tif_codec.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_codec.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_compress.c b/src/libs/pdflib/libs/tiff/tif_compress.c index ec899fe9b8..eaf90975e6 100644 --- a/src/libs/pdflib/libs/tiff/tif_compress.c +++ b/src/libs/pdflib/libs/tiff/tif_compress.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_compress.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_dir.c b/src/libs/pdflib/libs/tiff/tif_dir.c index 0decced3e9..1be7e0b40d 100644 --- a/src/libs/pdflib/libs/tiff/tif_dir.c +++ b/src/libs/pdflib/libs/tiff/tif_dir.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_dir.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_dir.h b/src/libs/pdflib/libs/tiff/tif_dir.h index b1e921797c..6285e3234c 100644 --- a/src/libs/pdflib/libs/tiff/tif_dir.h +++ b/src/libs/pdflib/libs/tiff/tif_dir.h @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_dir.h 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_dirinfo.c b/src/libs/pdflib/libs/tiff/tif_dirinfo.c index 4138ccc67a..f92889b373 100644 --- a/src/libs/pdflib/libs/tiff/tif_dirinfo.c +++ b/src/libs/pdflib/libs/tiff/tif_dirinfo.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_dirinfo.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_dirread.c b/src/libs/pdflib/libs/tiff/tif_dirread.c index 4692f7d900..1b35dd4c24 100644 --- a/src/libs/pdflib/libs/tiff/tif_dirread.c +++ b/src/libs/pdflib/libs/tiff/tif_dirread.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_dirread.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_dumpmode.c b/src/libs/pdflib/libs/tiff/tif_dumpmode.c index 303658cd14..a91989a336 100644 --- a/src/libs/pdflib/libs/tiff/tif_dumpmode.c +++ b/src/libs/pdflib/libs/tiff/tif_dumpmode.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_dumpmode.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_error.c b/src/libs/pdflib/libs/tiff/tif_error.c index d7bf1b644c..f505db3e4a 100644 --- a/src/libs/pdflib/libs/tiff/tif_error.c +++ b/src/libs/pdflib/libs/tiff/tif_error.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_error.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_fax3.c b/src/libs/pdflib/libs/tiff/tif_fax3.c index 428af56bd3..4d1f69e790 100644 --- a/src/libs/pdflib/libs/tiff/tif_fax3.c +++ b/src/libs/pdflib/libs/tiff/tif_fax3.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_fax3.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1990-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_fax3.h b/src/libs/pdflib/libs/tiff/tif_fax3.h index 8df7e625a7..79db35d26e 100644 --- a/src/libs/pdflib/libs/tiff/tif_fax3.h +++ b/src/libs/pdflib/libs/tiff/tif_fax3.h @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_fax3.h 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1990-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_fax3sm.c b/src/libs/pdflib/libs/tiff/tif_fax3sm.c index ebd79b00a5..fd51b4d1f4 100644 --- a/src/libs/pdflib/libs/tiff/tif_fax3sm.c +++ b/src/libs/pdflib/libs/tiff/tif_fax3sm.c @@ -1,7 +1,7 @@ /* WARNING, this file was automatically generated by the mkg3states program */ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_fax3sm.c 14574 2005-10-29 16:27:43Z bonefish $ */ #include "tiff.h" #include "port.h" diff --git a/src/libs/pdflib/libs/tiff/tif_getimage.c b/src/libs/pdflib/libs/tiff/tif_getimage.c index 87cad4f294..03b94884e3 100644 --- a/src/libs/pdflib/libs/tiff/tif_getimage.c +++ b/src/libs/pdflib/libs/tiff/tif_getimage.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_getimage.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1991-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_luv.c b/src/libs/pdflib/libs/tiff/tif_luv.c index 8ccdb6568d..7e95a3d95b 100644 --- a/src/libs/pdflib/libs/tiff/tif_luv.c +++ b/src/libs/pdflib/libs/tiff/tif_luv.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_luv.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1997 Greg Ward Larson * Copyright (c) 1997 Silicon Graphics, Inc. diff --git a/src/libs/pdflib/libs/tiff/tif_lzw.c b/src/libs/pdflib/libs/tiff/tif_lzw.c index 53582a7bbe..4430ee2ef1 100644 --- a/src/libs/pdflib/libs/tiff/tif_lzw.c +++ b/src/libs/pdflib/libs/tiff/tif_lzw.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_lzw.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_next.c b/src/libs/pdflib/libs/tiff/tif_next.c index f4be95e63e..fa92a503cc 100644 --- a/src/libs/pdflib/libs/tiff/tif_next.c +++ b/src/libs/pdflib/libs/tiff/tif_next.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_next.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_open.c b/src/libs/pdflib/libs/tiff/tif_open.c index fd7e974ee5..7a3592da6f 100644 --- a/src/libs/pdflib/libs/tiff/tif_open.c +++ b/src/libs/pdflib/libs/tiff/tif_open.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_open.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_packbits.c b/src/libs/pdflib/libs/tiff/tif_packbits.c index b9d0386cd4..8bea6026e3 100644 --- a/src/libs/pdflib/libs/tiff/tif_packbits.c +++ b/src/libs/pdflib/libs/tiff/tif_packbits.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_packbits.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_predict.c b/src/libs/pdflib/libs/tiff/tif_predict.c index 9722a4c519..23729f5477 100644 --- a/src/libs/pdflib/libs/tiff/tif_predict.c +++ b/src/libs/pdflib/libs/tiff/tif_predict.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_predict.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_predict.h b/src/libs/pdflib/libs/tiff/tif_predict.h index 13271e8dde..48c84e0cef 100644 --- a/src/libs/pdflib/libs/tiff/tif_predict.h +++ b/src/libs/pdflib/libs/tiff/tif_predict.h @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_predict.h 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1995-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_read.c b/src/libs/pdflib/libs/tiff/tif_read.c index ec80fc0cb6..602b9d6725 100644 --- a/src/libs/pdflib/libs/tiff/tif_read.c +++ b/src/libs/pdflib/libs/tiff/tif_read.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_read.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_strip.c b/src/libs/pdflib/libs/tiff/tif_strip.c index 75d80a575c..dc3eb6c21b 100644 --- a/src/libs/pdflib/libs/tiff/tif_strip.c +++ b/src/libs/pdflib/libs/tiff/tif_strip.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_strip.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1991-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_swab.c b/src/libs/pdflib/libs/tiff/tif_swab.c index 768f9241f2..824e5d3ded 100644 --- a/src/libs/pdflib/libs/tiff/tif_swab.c +++ b/src/libs/pdflib/libs/tiff/tif_swab.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_swab.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_thunder.c b/src/libs/pdflib/libs/tiff/tif_thunder.c index 10390aa357..70f9968696 100644 --- a/src/libs/pdflib/libs/tiff/tif_thunder.c +++ b/src/libs/pdflib/libs/tiff/tif_thunder.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_thunder.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_tile.c b/src/libs/pdflib/libs/tiff/tif_tile.c index 0990f5a28c..8aa105b3a8 100644 --- a/src/libs/pdflib/libs/tiff/tif_tile.c +++ b/src/libs/pdflib/libs/tiff/tif_tile.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_tile.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1991-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_unix.c b/src/libs/pdflib/libs/tiff/tif_unix.c index 8529c65518..00c82e316a 100644 --- a/src/libs/pdflib/libs/tiff/tif_unix.c +++ b/src/libs/pdflib/libs/tiff/tif_unix.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_unix.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_version.c b/src/libs/pdflib/libs/tiff/tif_version.c index 3e770b87c0..a2f8109244 100644 --- a/src/libs/pdflib/libs/tiff/tif_version.c +++ b/src/libs/pdflib/libs/tiff/tif_version.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_version.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1992-1997 Sam Leffler * Copyright (c) 1992-1997 Silicon Graphics, Inc. diff --git a/src/libs/pdflib/libs/tiff/tif_warning.c b/src/libs/pdflib/libs/tiff/tif_warning.c index 8051d37837..7f204de7dc 100644 --- a/src/libs/pdflib/libs/tiff/tif_warning.c +++ b/src/libs/pdflib/libs/tiff/tif_warning.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_warning.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tif_zip.c b/src/libs/pdflib/libs/tiff/tif_zip.c index c534f41131..522ba3087f 100644 --- a/src/libs/pdflib/libs/tiff/tif_zip.c +++ b/src/libs/pdflib/libs/tiff/tif_zip.c @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tif_zip.c 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1995-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tiff.h b/src/libs/pdflib/libs/tiff/tiff.h index 79a9a5e05f..fa2066b1d1 100644 --- a/src/libs/pdflib/libs/tiff/tiff.h +++ b/src/libs/pdflib/libs/tiff/tiff.h @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tiff.h 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tiffconf.h b/src/libs/pdflib/libs/tiff/tiffconf.h index 9a12a2b081..790a5fca1f 100644 --- a/src/libs/pdflib/libs/tiff/tiffconf.h +++ b/src/libs/pdflib/libs/tiff/tiffconf.h @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tiffconf.h 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1991-1997 Silicon Graphics, Inc. diff --git a/src/libs/pdflib/libs/tiff/tiffio.h b/src/libs/pdflib/libs/tiff/tiffio.h index 9cb81c7ce5..c2264269fc 100644 --- a/src/libs/pdflib/libs/tiff/tiffio.h +++ b/src/libs/pdflib/libs/tiff/tiffio.h @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tiffio.h 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tiffiop.h b/src/libs/pdflib/libs/tiff/tiffiop.h index 2565021bce..a573a2cde5 100644 --- a/src/libs/pdflib/libs/tiff/tiffiop.h +++ b/src/libs/pdflib/libs/tiff/tiffiop.h @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tiffiop.h 14574 2005-10-29 16:27:43Z bonefish $ */ /* * Copyright (c) 1988-1997 Sam Leffler diff --git a/src/libs/pdflib/libs/tiff/tiffvers.h b/src/libs/pdflib/libs/tiff/tiffvers.h index 2dcb3c1071..61610c2816 100644 --- a/src/libs/pdflib/libs/tiff/tiffvers.h +++ b/src/libs/pdflib/libs/tiff/tiffvers.h @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: tiffvers.h 14574 2005-10-29 16:27:43Z bonefish $ */ #define TIFFLIB_VERSION_STR "LIBTIFF, Version 3.5.7\n\ Copyright (c) 1988-1996 Sam Leffler\n\ diff --git a/src/libs/pdflib/libs/tiff/uvcode.h b/src/libs/pdflib/libs/tiff/uvcode.h index 389c5056d5..4f4b66eb58 100644 --- a/src/libs/pdflib/libs/tiff/uvcode.h +++ b/src/libs/pdflib/libs/tiff/uvcode.h @@ -1,4 +1,4 @@ -/* PDFlib GmbH cvsid: $Id$ */ +/* PDFlib GmbH cvsid: $Id: uvcode.h 14574 2005-10-29 16:27:43Z bonefish $ */ /* Version 1.0 generated April 7, 1997 by Greg Ward Larson, SGI */ #define UV_SQSIZ (float)0.003500 diff --git a/src/libs/pdflib/pdflib-config.in b/src/libs/pdflib/pdflib-config.in index 7f34821cd0..23d497d0a9 100644 --- a/src/libs/pdflib/pdflib-config.in +++ b/src/libs/pdflib/pdflib-config.in @@ -2,7 +2,7 @@ # # Return information about the local PDFlib installation # -# $Id$ +# $Id: pdflib-config.in 14574 2005-10-29 16:27:43Z bonefish $ # installation directories prefix=@prefix@ diff --git a/src/libs/pdflib/progs/Makefile b/src/libs/pdflib/progs/Makefile index 956ff8da2d..5f6c2a2d7c 100644 --- a/src/libs/pdflib/progs/Makefile +++ b/src/libs/pdflib/progs/Makefile @@ -1,5 +1,5 @@ # Main libs Makefile -# $Id$ +# $Id: Makefile 14574 2005-10-29 16:27:43Z bonefish $ include ../config/mkcommon.inc diff --git a/src/libs/pdflib/progs/pdflib/Makefile b/src/libs/pdflib/progs/pdflib/Makefile index 706f054b1b..b2e196d6ab 100644 --- a/src/libs/pdflib/progs/pdflib/Makefile +++ b/src/libs/pdflib/progs/pdflib/Makefile @@ -1,5 +1,5 @@ # Makefile for PDFlib clients -# $Id$ +# $Id: Makefile 14574 2005-10-29 16:27:43Z bonefish $ top_builddir = ../.. diff --git a/src/libs/pdflib/progs/pdflib/pdfimage.c b/src/libs/pdflib/progs/pdflib/pdfimage.c index a54681ce3f..deedacb2eb 100644 --- a/src/libs/pdflib/progs/pdflib/pdfimage.c +++ b/src/libs/pdflib/progs/pdflib/pdfimage.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pdfimage.c 14574 2005-10-29 16:27:43Z bonefish $ * * Convert BMP/PNG/TIFF/GIF/JPEG images to PDF * diff --git a/src/libs/pdflib/progs/pdflib/pdfimpose.c b/src/libs/pdflib/progs/pdflib/pdfimpose.c index 8c2c271439..1841366817 100644 --- a/src/libs/pdflib/progs/pdflib/pdfimpose.c +++ b/src/libs/pdflib/progs/pdflib/pdfimpose.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: pdfimpose.c 14574 2005-10-29 16:27:43Z bonefish $ * * Impose multiple PDF documents on a single sheet, * or concatenate multiple PDFs (if no -g option is supplied) diff --git a/src/libs/pdflib/progs/pdflib/text2pdf.c b/src/libs/pdflib/progs/pdflib/text2pdf.c index 0dafd1dc83..e88cc45831 100644 --- a/src/libs/pdflib/progs/pdflib/text2pdf.c +++ b/src/libs/pdflib/progs/pdflib/text2pdf.c @@ -10,7 +10,7 @@ | | *---------------------------------------------------------------------------*/ -/* $Id$ +/* $Id: text2pdf.c 14574 2005-10-29 16:27:43Z bonefish $ * * Convert text files to PDF * diff --git a/src/libs/termcap/termcap.src b/src/libs/termcap/termcap.src index 8d3e197db3..d09491f56c 100644 --- a/src/libs/termcap/termcap.src +++ b/src/libs/termcap/termcap.src @@ -1,7 +1,7 @@ ######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE # # Version 11.0.1 -# $Date$ +# $Date: 2009-04-17 11:15:46 +0200 (Fr, 17. Apr 2009) $ # termcap syntax # # Eric S. Raymond (current maintainer) diff --git a/src/libs/zlib/adler32.c b/src/libs/zlib/adler32.c index 007ba26277..a6acca37d5 100644 --- a/src/libs/zlib/adler32.c +++ b/src/libs/zlib/adler32.c @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id$ */ +/* @(#) $Id: adler32.c 14421 2005-10-19 08:31:31Z korli $ */ #define ZLIB_INTERNAL #include "zlib.h" diff --git a/src/libs/zlib/compress.c b/src/libs/zlib/compress.c index df04f0148e..864567824d 100644 --- a/src/libs/zlib/compress.c +++ b/src/libs/zlib/compress.c @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id$ */ +/* @(#) $Id: compress.c 14421 2005-10-19 08:31:31Z korli $ */ #define ZLIB_INTERNAL #include "zlib.h" diff --git a/src/libs/zlib/crc32.c b/src/libs/zlib/crc32.c index f658a9ef55..eb59dc89ce 100644 --- a/src/libs/zlib/crc32.c +++ b/src/libs/zlib/crc32.c @@ -9,7 +9,7 @@ * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3. */ -/* @(#) $Id$ */ +/* @(#) $Id: crc32.c 14421 2005-10-19 08:31:31Z korli $ */ /* Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore diff --git a/src/libs/zlib/deflate.c b/src/libs/zlib/deflate.c index 29ce1f64a5..1cd07e3b50 100644 --- a/src/libs/zlib/deflate.c +++ b/src/libs/zlib/deflate.c @@ -47,7 +47,7 @@ * */ -/* @(#) $Id$ */ +/* @(#) $Id: deflate.c 14421 2005-10-19 08:31:31Z korli $ */ #include "deflate.h" diff --git a/src/libs/zlib/deflate.h b/src/libs/zlib/deflate.h index 05a5ab3a2c..55cfd4f7cb 100644 --- a/src/libs/zlib/deflate.h +++ b/src/libs/zlib/deflate.h @@ -8,7 +8,7 @@ subject to change. Applications should only use zlib.h. */ -/* @(#) $Id$ */ +/* @(#) $Id: deflate.h 14421 2005-10-19 08:31:31Z korli $ */ #ifndef DEFLATE_H #define DEFLATE_H diff --git a/src/libs/zlib/example.c b/src/libs/zlib/example.c index 6c8a0ee763..9aa2b94905 100644 --- a/src/libs/zlib/example.c +++ b/src/libs/zlib/example.c @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id$ */ +/* @(#) $Id: example.c 14421 2005-10-19 08:31:31Z korli $ */ #include #include "zlib.h" diff --git a/src/libs/zlib/gzio.c b/src/libs/zlib/gzio.c index 7e90f4928f..de17730d15 100644 --- a/src/libs/zlib/gzio.c +++ b/src/libs/zlib/gzio.c @@ -5,7 +5,7 @@ * Compile this file with -DNO_GZCOMPRESS to avoid the compression code. */ -/* @(#) $Id$ */ +/* @(#) $Id: gzio.c 14421 2005-10-19 08:31:31Z korli $ */ #include diff --git a/src/libs/zlib/minigzip.c b/src/libs/zlib/minigzip.c index 6de35dde97..ff690858aa 100644 --- a/src/libs/zlib/minigzip.c +++ b/src/libs/zlib/minigzip.c @@ -13,7 +13,7 @@ * or in pipe mode. */ -/* @(#) $Id$ */ +/* @(#) $Id: minigzip.c 14574 2005-10-29 16:27:43Z bonefish $ */ #include #include "zlib.h" diff --git a/src/libs/zlib/trees.c b/src/libs/zlib/trees.c index 395e4e1681..869eda309a 100644 --- a/src/libs/zlib/trees.c +++ b/src/libs/zlib/trees.c @@ -29,7 +29,7 @@ * Addison-Wesley, 1983. ISBN 0-201-06672-6. */ -/* @(#) $Id$ */ +/* @(#) $Id: trees.c 14421 2005-10-19 08:31:31Z korli $ */ /* #define GEN_TREES_H */ diff --git a/src/libs/zlib/uncompr.c b/src/libs/zlib/uncompr.c index b59e3d0def..ce1463854f 100644 --- a/src/libs/zlib/uncompr.c +++ b/src/libs/zlib/uncompr.c @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id$ */ +/* @(#) $Id: uncompr.c 14421 2005-10-19 08:31:31Z korli $ */ #define ZLIB_INTERNAL #include "zlib.h" diff --git a/src/libs/zlib/zconf.h b/src/libs/zlib/zconf.h index 5ae265e66e..ba6b9ff600 100644 --- a/src/libs/zlib/zconf.h +++ b/src/libs/zlib/zconf.h @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id$ */ +/* @(#) $Id: zconf.h 28305 2008-10-23 21:46:26Z bonefish $ */ #ifndef ZCONF_H #define ZCONF_H diff --git a/src/libs/zlib/zutil.c b/src/libs/zlib/zutil.c index d55f5948a3..69572462f2 100644 --- a/src/libs/zlib/zutil.c +++ b/src/libs/zlib/zutil.c @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id$ */ +/* @(#) $Id: zutil.c 14421 2005-10-19 08:31:31Z korli $ */ #include "zutil.h" diff --git a/src/libs/zlib/zutil.h b/src/libs/zlib/zutil.h index b7d5eff81b..705c36975a 100644 --- a/src/libs/zlib/zutil.h +++ b/src/libs/zlib/zutil.h @@ -8,7 +8,7 @@ subject to change. Applications should only use zlib.h. */ -/* @(#) $Id$ */ +/* @(#) $Id: zutil.h 14421 2005-10-19 08:31:31Z korli $ */ #ifndef ZUTIL_H #define ZUTIL_H diff --git a/src/system/libroot/posix/glibc/math/math_private.h b/src/system/libroot/posix/glibc/math/math_private.h index 9508a69d0e..943463a45b 100644 --- a/src/system/libroot/posix/glibc/math/math_private.h +++ b/src/system/libroot/posix/glibc/math/math_private.h @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $Id$ + * $Id: math_private.h 14968 2005-11-16 18:33:51Z korli $ */ #ifndef _MATH_PRIVATE_H_ diff --git a/src/tests/kits/app/bmessagequeue/AddMessageTest1.cpp b/src/tests/kits/app/bmessagequeue/AddMessageTest1.cpp index 41022a6417..bead0a32a0 100644 --- a/src/tests/kits/app/bmessagequeue/AddMessageTest1.cpp +++ b/src/tests/kits/app/bmessagequeue/AddMessageTest1.cpp @@ -1,5 +1,5 @@ /* - $Id: AddMessageTest1.cpp,v 1.2 2002/07/22 09:28:00 tylerdauwalder Exp $ + $Id: AddMessageTest1.cpp 383 2002-07-22 09:28:00Z tylerdauwalder $ This file implements the first test for the OpenBeOS BMessageQueue code. It tests the Construction, Destruction, Add Message 1, Count Messages, diff --git a/src/tests/kits/app/bmessagequeue/AddMessageTest1.h b/src/tests/kits/app/bmessagequeue/AddMessageTest1.h index 4d4be821ce..c4baacc8b5 100644 --- a/src/tests/kits/app/bmessagequeue/AddMessageTest1.h +++ b/src/tests/kits/app/bmessagequeue/AddMessageTest1.h @@ -1,5 +1,5 @@ /* - $Id: AddMessageTest1.h,v 1.2 2002/07/22 09:28:00 tylerdauwalder Exp $ + $Id: AddMessageTest1.h 383 2002-07-22 09:28:00Z tylerdauwalder $ This file defines a class for performing one test of BMessageQueue functionality. diff --git a/src/tests/kits/app/bmessagequeue/AddMessageTest2.cpp b/src/tests/kits/app/bmessagequeue/AddMessageTest2.cpp index ac3e20dab6..1c18466b8a 100644 --- a/src/tests/kits/app/bmessagequeue/AddMessageTest2.cpp +++ b/src/tests/kits/app/bmessagequeue/AddMessageTest2.cpp @@ -1,5 +1,5 @@ /* - $Id: AddMessageTest2.cpp,v 1.2 2002/07/22 09:28:00 tylerdauwalder Exp $ + $Id: AddMessageTest2.cpp 383 2002-07-22 09:28:00Z tylerdauwalder $ This file implements the second test for the OpenBeOS BMessageQueue code. It tests the Add Message 2 use case. It does so by doing the following: diff --git a/src/tests/kits/app/bmessagequeue/AddMessageTest2.h b/src/tests/kits/app/bmessagequeue/AddMessageTest2.h index 2b9cc4ed57..c4f908f81c 100644 --- a/src/tests/kits/app/bmessagequeue/AddMessageTest2.h +++ b/src/tests/kits/app/bmessagequeue/AddMessageTest2.h @@ -1,5 +1,5 @@ /* - $Id: AddMessageTest2.h,v 1.2 2002/07/22 09:28:00 tylerdauwalder Exp $ + $Id: AddMessageTest2.h 383 2002-07-22 09:28:00Z tylerdauwalder $ This file defines a class for performing one test of BMessageQueue functionality. diff --git a/src/tests/kits/app/bmessagequeue/ConcurrencyTest1.cpp b/src/tests/kits/app/bmessagequeue/ConcurrencyTest1.cpp index 18116611c1..89166f1081 100644 --- a/src/tests/kits/app/bmessagequeue/ConcurrencyTest1.cpp +++ b/src/tests/kits/app/bmessagequeue/ConcurrencyTest1.cpp @@ -1,5 +1,5 @@ /* - $Id: ConcurrencyTest1.cpp,v 1.2 2002/07/22 09:28:00 tylerdauwalder Exp $ + $Id: ConcurrencyTest1.cpp 383 2002-07-22 09:28:00Z tylerdauwalder $ This file implements a test class for testing BMessageQueue functionality. It tests use cases Destruction, Add Message 1, Add Message 3, Remove Message 1, diff --git a/src/tests/kits/app/bmessagequeue/ConcurrencyTest1.h b/src/tests/kits/app/bmessagequeue/ConcurrencyTest1.h index 0e52a13ecc..7b939068fc 100644 --- a/src/tests/kits/app/bmessagequeue/ConcurrencyTest1.h +++ b/src/tests/kits/app/bmessagequeue/ConcurrencyTest1.h @@ -1,5 +1,5 @@ /* - $Id: ConcurrencyTest1.h,v 1.2 2002/07/22 09:28:00 tylerdauwalder Exp $ + $Id: ConcurrencyTest1.h 383 2002-07-22 09:28:00Z tylerdauwalder $ This file defines a classes for performing one test of BMessageQueue functionality. diff --git a/src/tests/kits/app/bmessagequeue/ConcurrencyTest2.cpp b/src/tests/kits/app/bmessagequeue/ConcurrencyTest2.cpp index 885521fc74..7d3990c37b 100644 --- a/src/tests/kits/app/bmessagequeue/ConcurrencyTest2.cpp +++ b/src/tests/kits/app/bmessagequeue/ConcurrencyTest2.cpp @@ -1,5 +1,5 @@ /* - $Id: ConcurrencyTest2.cpp,v 1.2 2002/07/22 09:28:00 tylerdauwalder Exp $ + $Id: ConcurrencyTest2.cpp 383 2002-07-22 09:28:00Z tylerdauwalder $ This file implements a test class for testing BMessageQueue functionality. It tests use cases Destruction, Add Message 3, Remove Message 2, diff --git a/src/tests/kits/app/bmessagequeue/ConcurrencyTest2.h b/src/tests/kits/app/bmessagequeue/ConcurrencyTest2.h index 8312fd16c0..48d20e6110 100644 --- a/src/tests/kits/app/bmessagequeue/ConcurrencyTest2.h +++ b/src/tests/kits/app/bmessagequeue/ConcurrencyTest2.h @@ -1,5 +1,5 @@ /* - $Id: ConcurrencyTest2.h,v 1.2 2002/07/22 09:28:00 tylerdauwalder Exp $ + $Id: ConcurrencyTest2.h 383 2002-07-22 09:28:00Z tylerdauwalder $ This file defines a classes for performing one test of BMessageQueue functionality. diff --git a/src/tests/kits/app/bmessagequeue/FindMessageTest1.cpp b/src/tests/kits/app/bmessagequeue/FindMessageTest1.cpp index 5baf92a583..7716f8291c 100644 --- a/src/tests/kits/app/bmessagequeue/FindMessageTest1.cpp +++ b/src/tests/kits/app/bmessagequeue/FindMessageTest1.cpp @@ -1,5 +1,5 @@ /* - $Id: FindMessageTest1.cpp,v 1.2 2002/07/22 09:28:00 tylerdauwalder Exp $ + $Id: FindMessageTest1.cpp 383 2002-07-22 09:28:00Z tylerdauwalder $ This file implements the second test for the OpenBeOS BMessageQueue code. It tests the Add Message 1 and Find Message 2 use cases. It does so by diff --git a/src/tests/kits/app/bmessagequeue/FindMessageTest1.h b/src/tests/kits/app/bmessagequeue/FindMessageTest1.h index da8b74658a..0c24b709cc 100644 --- a/src/tests/kits/app/bmessagequeue/FindMessageTest1.h +++ b/src/tests/kits/app/bmessagequeue/FindMessageTest1.h @@ -1,5 +1,5 @@ /* - $Id: FindMessageTest1.h,v 1.2 2002/07/22 09:28:00 tylerdauwalder Exp $ + $Id: FindMessageTest1.h 383 2002-07-22 09:28:00Z tylerdauwalder $ This file defines a classes for performing one test of BMessageQueue functionality. diff --git a/src/tests/kits/app/bmessagequeue/MessageQueueTestAddon.cpp b/src/tests/kits/app/bmessagequeue/MessageQueueTestAddon.cpp index a043f27b71..65e396f06c 100644 --- a/src/tests/kits/app/bmessagequeue/MessageQueueTestAddon.cpp +++ b/src/tests/kits/app/bmessagequeue/MessageQueueTestAddon.cpp @@ -1,5 +1,5 @@ /* - $Id: MessageQueueTestAddon.cpp,v 1.1 2002/07/09 12:24:56 ejakowatz Exp $ + $Id: MessageQueueTestAddon.cpp 10 2002-07-09 12:24:59Z ejakowatz $ This file declares the addonTestName string and addonTestFunc function for the BMessageQueue tests. These symbols will be used diff --git a/src/tests/kits/app/bmessagequeue/MessageQueueTestCase.cpp b/src/tests/kits/app/bmessagequeue/MessageQueueTestCase.cpp index e85e49ff3f..834e60b9dd 100644 --- a/src/tests/kits/app/bmessagequeue/MessageQueueTestCase.cpp +++ b/src/tests/kits/app/bmessagequeue/MessageQueueTestCase.cpp @@ -1,5 +1,5 @@ /* - $Id: MessageQueueTestCase.cpp,v 1.2 2002/07/22 09:28:00 tylerdauwalder Exp $ + $Id: MessageQueueTestCase.cpp 383 2002-07-22 09:28:00Z tylerdauwalder $ This file implements a base class for testing BMessageQueue functionality. diff --git a/src/tests/kits/app/bmessagequeue/MessageQueueTestCase.h b/src/tests/kits/app/bmessagequeue/MessageQueueTestCase.h index f75f263cf0..8f33306217 100644 --- a/src/tests/kits/app/bmessagequeue/MessageQueueTestCase.h +++ b/src/tests/kits/app/bmessagequeue/MessageQueueTestCase.h @@ -1,5 +1,5 @@ /* - $Id: MessageQueueTestCase.h,v 1.2 2002/07/22 09:28:00 tylerdauwalder Exp $ + $Id: MessageQueueTestCase.h 383 2002-07-22 09:28:00Z tylerdauwalder $ This file defines a set of classes for testing BMessageQueue functionality. diff --git a/src/tests/kits/app/bpropertyinfo/PropertyConstructionTest.cpp b/src/tests/kits/app/bpropertyinfo/PropertyConstructionTest.cpp index 8030c87932..eace6d9e23 100644 --- a/src/tests/kits/app/bpropertyinfo/PropertyConstructionTest.cpp +++ b/src/tests/kits/app/bpropertyinfo/PropertyConstructionTest.cpp @@ -1,5 +1,5 @@ /* - $Id: PropertyConstructionTest.cpp,v 1.3 2002/08/22 03:15:35 jrand Exp $ + $Id: PropertyConstructionTest.cpp 851 2002-08-22 03:15:35Z jrand $ This file implements the construction test for the OpenBeOS BPropertyInfo code. This class tests the following usecases: diff --git a/src/tests/kits/app/bpropertyinfo/PropertyConstructionTest.h b/src/tests/kits/app/bpropertyinfo/PropertyConstructionTest.h index 4a433d25a6..953450209a 100644 --- a/src/tests/kits/app/bpropertyinfo/PropertyConstructionTest.h +++ b/src/tests/kits/app/bpropertyinfo/PropertyConstructionTest.h @@ -1,5 +1,5 @@ /* - $Id: PropertyConstructionTest.h,v 1.3 2002/09/28 00:19:49 shatty Exp $ + $Id: PropertyConstructionTest.h 1218 2002-09-28 00:19:49Z shatty $ This file defines a class for performing one test of BPropertyInfo functionality. diff --git a/src/tests/kits/app/bpropertyinfo/PropertyFindMatchTest.cpp b/src/tests/kits/app/bpropertyinfo/PropertyFindMatchTest.cpp index 9341149d1d..1665fe6e2b 100644 --- a/src/tests/kits/app/bpropertyinfo/PropertyFindMatchTest.cpp +++ b/src/tests/kits/app/bpropertyinfo/PropertyFindMatchTest.cpp @@ -1,5 +1,5 @@ /* - $Id: PropertyFindMatchTest.cpp,v 1.3 2002/08/22 03:15:35 jrand Exp $ + $Id: PropertyFindMatchTest.cpp 851 2002-08-22 03:15:35Z jrand $ This file implements the FindMatch test for the OpenBeOS BPropertyInfo code. This class tests the following usecases: diff --git a/src/tests/kits/app/bpropertyinfo/PropertyFindMatchTest.h b/src/tests/kits/app/bpropertyinfo/PropertyFindMatchTest.h index cb9682eeb4..78b72ea13c 100644 --- a/src/tests/kits/app/bpropertyinfo/PropertyFindMatchTest.h +++ b/src/tests/kits/app/bpropertyinfo/PropertyFindMatchTest.h @@ -1,5 +1,5 @@ /* - $Id: PropertyFindMatchTest.h,v 1.3 2002/09/28 00:19:49 shatty Exp $ + $Id: PropertyFindMatchTest.h 1218 2002-09-28 00:19:49Z shatty $ This file defines a class for performing one test of BPropertyInfo functionality. diff --git a/src/tests/kits/app/bpropertyinfo/PropertyFlattenTest.cpp b/src/tests/kits/app/bpropertyinfo/PropertyFlattenTest.cpp index 96e1077180..4c0b4bc83c 100644 --- a/src/tests/kits/app/bpropertyinfo/PropertyFlattenTest.cpp +++ b/src/tests/kits/app/bpropertyinfo/PropertyFlattenTest.cpp @@ -1,5 +1,5 @@ /* - $Id: PropertyFlattenTest.cpp,v 1.4 2002/09/28 00:19:49 shatty Exp $ + $Id: PropertyFlattenTest.cpp 1218 2002-09-28 00:19:49Z shatty $ This file implements the flatten test for the OpenBeOS BPropertyInfo code. This class tests the following usecases: diff --git a/src/tests/kits/app/bpropertyinfo/PropertyFlattenTest.h b/src/tests/kits/app/bpropertyinfo/PropertyFlattenTest.h index e0db8c8ce6..c208c09f47 100644 --- a/src/tests/kits/app/bpropertyinfo/PropertyFlattenTest.h +++ b/src/tests/kits/app/bpropertyinfo/PropertyFlattenTest.h @@ -1,5 +1,5 @@ /* - $Id: PropertyFlattenTest.h,v 1.3 2002/09/28 00:19:49 shatty Exp $ + $Id: PropertyFlattenTest.h 1218 2002-09-28 00:19:49Z shatty $ This file defines a class for performing one test of BPropertyInfo functionality. diff --git a/src/tests/kits/app/bpropertyinfo/PropertyTestcase.cpp b/src/tests/kits/app/bpropertyinfo/PropertyTestcase.cpp index 1834bf23f0..ca9fe9a710 100644 --- a/src/tests/kits/app/bpropertyinfo/PropertyTestcase.cpp +++ b/src/tests/kits/app/bpropertyinfo/PropertyTestcase.cpp @@ -1,5 +1,5 @@ /* - $Id: PropertyTestcase.cpp,v 1.4 2004/11/21 20:59:09 shatty Exp $ + $Id: PropertyTestcase.cpp 10130 2004-11-21 21:03:29Z shatty $ This file implements the first test for the OpenBeOS BPropertyInfo code. It tests the Construction use cases. It does so by doing the following: diff --git a/src/tests/kits/app/bpropertyinfo/PropertyTestcase.h b/src/tests/kits/app/bpropertyinfo/PropertyTestcase.h index 145365359f..b80af18f91 100644 --- a/src/tests/kits/app/bpropertyinfo/PropertyTestcase.h +++ b/src/tests/kits/app/bpropertyinfo/PropertyTestcase.h @@ -1,5 +1,5 @@ /* - $Id: PropertyTestcase.h,v 1.3 2002/09/28 00:19:49 shatty Exp $ + $Id: PropertyTestcase.h 1218 2002-09-28 00:19:49Z shatty $ This file defines a base class for performing all tests of BPropertyInfo functionality. diff --git a/src/tests/kits/interface/bdeskbar/DeskbarAddItemTest.cpp b/src/tests/kits/interface/bdeskbar/DeskbarAddItemTest.cpp index 656ff76e2a..bd0891f585 100644 --- a/src/tests/kits/interface/bdeskbar/DeskbarAddItemTest.cpp +++ b/src/tests/kits/interface/bdeskbar/DeskbarAddItemTest.cpp @@ -1,5 +1,5 @@ /* - $Id: DeskbarAddItemTest.cpp,v 1.2 2002/09/28 07:27:00 shatty Exp $ + $Id: DeskbarAddItemTest.cpp 1236 2002-09-28 07:27:00Z shatty $ This file implements tests for the following use cases of BDeskbar: - Add Item 1 diff --git a/src/tests/kits/interface/bdeskbar/DeskbarAddItemTest.h b/src/tests/kits/interface/bdeskbar/DeskbarAddItemTest.h index 0dc31e765b..de6b9628b1 100644 --- a/src/tests/kits/interface/bdeskbar/DeskbarAddItemTest.h +++ b/src/tests/kits/interface/bdeskbar/DeskbarAddItemTest.h @@ -1,5 +1,5 @@ /* - $Id: DeskbarAddItemTest.h,v 1.2 2002/09/28 07:27:00 shatty Exp $ + $Id: DeskbarAddItemTest.h 1236 2002-09-28 07:27:00Z shatty $ This file defines a class for performing a test of BDeskbar functionality. diff --git a/src/tests/kits/interface/bdeskbar/DeskbarGetItemTest.cpp b/src/tests/kits/interface/bdeskbar/DeskbarGetItemTest.cpp index 1f2b0eed59..2c27f96751 100644 --- a/src/tests/kits/interface/bdeskbar/DeskbarGetItemTest.cpp +++ b/src/tests/kits/interface/bdeskbar/DeskbarGetItemTest.cpp @@ -1,5 +1,5 @@ /* - $Id: DeskbarGetItemTest.cpp,v 1.4 2002/09/28 07:27:00 shatty Exp $ + $Id: DeskbarGetItemTest.cpp 1236 2002-09-28 07:27:00Z shatty $ This file implements tests for the following use cases of BDeskbar: - Count Items diff --git a/src/tests/kits/interface/bdeskbar/DeskbarGetItemTest.h b/src/tests/kits/interface/bdeskbar/DeskbarGetItemTest.h index 54ec63fbc3..f0c0df14b3 100644 --- a/src/tests/kits/interface/bdeskbar/DeskbarGetItemTest.h +++ b/src/tests/kits/interface/bdeskbar/DeskbarGetItemTest.h @@ -1,5 +1,5 @@ /* - $Id: DeskbarGetItemTest.h,v 1.3 2002/09/28 07:27:00 shatty Exp $ + $Id: DeskbarGetItemTest.h 1236 2002-09-28 07:27:00Z shatty $ This file defines a class for performing a test of BDeskbar functionality. diff --git a/src/tests/kits/interface/bdeskbar/DeskbarLocationTest.cpp b/src/tests/kits/interface/bdeskbar/DeskbarLocationTest.cpp index 7b0cbdefb3..f0b74ebaf7 100644 --- a/src/tests/kits/interface/bdeskbar/DeskbarLocationTest.cpp +++ b/src/tests/kits/interface/bdeskbar/DeskbarLocationTest.cpp @@ -1,5 +1,5 @@ /* - $Id: DeskbarLocationTest.cpp,v 1.3 2002/09/28 07:27:00 shatty Exp $ + $Id: DeskbarLocationTest.cpp 1236 2002-09-28 07:27:00Z shatty $ This file implements tests for the following use cases of BDeskbar: - Frame diff --git a/src/tests/kits/interface/bdeskbar/DeskbarLocationTest.h b/src/tests/kits/interface/bdeskbar/DeskbarLocationTest.h index dcc980cba7..96e2216c9c 100644 --- a/src/tests/kits/interface/bdeskbar/DeskbarLocationTest.h +++ b/src/tests/kits/interface/bdeskbar/DeskbarLocationTest.h @@ -1,5 +1,5 @@ /* - $Id: DeskbarLocationTest.h,v 1.2 2002/09/28 07:27:00 shatty Exp $ + $Id: DeskbarLocationTest.h 1236 2002-09-28 07:27:00Z shatty $ This file defines a class for performing a test of BDeskbar functionality. diff --git a/src/tests/kits/interface/bpolygon/CreatePolygonTest.cpp b/src/tests/kits/interface/bpolygon/CreatePolygonTest.cpp index adacd2611e..874f62543f 100644 --- a/src/tests/kits/interface/bpolygon/CreatePolygonTest.cpp +++ b/src/tests/kits/interface/bpolygon/CreatePolygonTest.cpp @@ -1,5 +1,5 @@ /* - $Id: CreatePolygonTest.cpp,v 1.1 2002/11/23 04:42:57 jrand Exp $ + $Id: CreatePolygonTest.cpp 2067 2002-11-23 04:42:57Z jrand $ This file contains the implementation of the tests which show that BPolygons can be created successfully a number of diff --git a/src/tests/kits/interface/bpolygon/CreatePolygonTest.h b/src/tests/kits/interface/bpolygon/CreatePolygonTest.h index f23c282c38..a5f057f719 100644 --- a/src/tests/kits/interface/bpolygon/CreatePolygonTest.h +++ b/src/tests/kits/interface/bpolygon/CreatePolygonTest.h @@ -1,5 +1,5 @@ /* - $Id: CreatePolygonTest.h,v 1.1 2002/11/23 04:42:57 jrand Exp $ + $Id: CreatePolygonTest.h 2067 2002-11-23 04:42:57Z jrand $ This file contains the definition of a class for testing the creation of BPolygon objects through a few different methods. diff --git a/src/tests/kits/interface/bpolygon/DummyPolygon.cpp b/src/tests/kits/interface/bpolygon/DummyPolygon.cpp index a2515db8d7..adb7fd9067 100644 --- a/src/tests/kits/interface/bpolygon/DummyPolygon.cpp +++ b/src/tests/kits/interface/bpolygon/DummyPolygon.cpp @@ -1,5 +1,5 @@ /* - $Id: DummyPolygon.cpp,v 1.2 2004/02/19 07:40:06 axeld Exp $ + $Id: DummyPolygon.cpp 6651 2004-02-19 07:40:06Z axeld $ This file contains the implementation of the dummy BPolygon class which allows the tests to grab the set of points from diff --git a/src/tests/kits/interface/bpolygon/DummyPolygon.h b/src/tests/kits/interface/bpolygon/DummyPolygon.h index 127fb50a2e..93f4a63cb9 100644 --- a/src/tests/kits/interface/bpolygon/DummyPolygon.h +++ b/src/tests/kits/interface/bpolygon/DummyPolygon.h @@ -1,5 +1,5 @@ /* - $Id: DummyPolygon.h,v 1.1 2002/11/23 04:42:57 jrand Exp $ + $Id: DummyPolygon.h 2067 2002-11-23 04:42:57Z jrand $ This file contains the definition of a dummy BPolygon class. It is used in order to get access to the private points of the diff --git a/src/tests/kits/interface/bpolygon/MapPolygonTest.cpp b/src/tests/kits/interface/bpolygon/MapPolygonTest.cpp index 7a6d0191ef..67db3550e8 100644 --- a/src/tests/kits/interface/bpolygon/MapPolygonTest.cpp +++ b/src/tests/kits/interface/bpolygon/MapPolygonTest.cpp @@ -1,5 +1,5 @@ /* - $Id: MapPolygonTest.cpp,v 1.1 2002/12/03 04:07:20 jrand Exp $ + $Id: MapPolygonTest.cpp 2136 2002-12-03 04:07:21Z jrand $ This file contains the implementation of the tests which show that BPolygons can be created successfully a number of diff --git a/src/tests/kits/interface/bpolygon/MapPolygonTest.h b/src/tests/kits/interface/bpolygon/MapPolygonTest.h index 1c5bcbc797..312589decf 100644 --- a/src/tests/kits/interface/bpolygon/MapPolygonTest.h +++ b/src/tests/kits/interface/bpolygon/MapPolygonTest.h @@ -1,5 +1,5 @@ /* - $Id: MapPolygonTest.h,v 1.1 2002/12/03 04:07:21 jrand Exp $ + $Id: MapPolygonTest.h 2136 2002-12-03 04:07:21Z jrand $ This file contains the definition of a class for testing the mapping of BPolygon objects. diff --git a/src/tests/kits/interface/bregion/RegionConstruction.cpp b/src/tests/kits/interface/bregion/RegionConstruction.cpp index 414554df88..3f742da5b4 100644 --- a/src/tests/kits/interface/bregion/RegionConstruction.cpp +++ b/src/tests/kits/interface/bregion/RegionConstruction.cpp @@ -1,5 +1,5 @@ /* - $Id: RegionConstruction.cpp,v 1.1 2003/08/06 06:46:06 jackburton Exp $ + $Id: RegionConstruction.cpp 4235 2003-08-06 06:46:06Z jackburton $ This file implements the construction test for the OpenBeOS BRegion code. diff --git a/src/tests/kits/interface/bregion/RegionConstruction.h b/src/tests/kits/interface/bregion/RegionConstruction.h index ee1f715793..903a8272b1 100644 --- a/src/tests/kits/interface/bregion/RegionConstruction.h +++ b/src/tests/kits/interface/bregion/RegionConstruction.h @@ -1,5 +1,5 @@ /* - $Id: RegionConstruction.h,v 1.1 2003/08/06 06:46:06 jackburton Exp $ + $Id: RegionConstruction.h 4235 2003-08-06 06:46:06Z jackburton $ This file defines a class for performing one test of BRegion functionality. diff --git a/src/tests/kits/interface/bregion/RegionExclude.cpp b/src/tests/kits/interface/bregion/RegionExclude.cpp index a6a4c07c19..22075616ef 100644 --- a/src/tests/kits/interface/bregion/RegionExclude.cpp +++ b/src/tests/kits/interface/bregion/RegionExclude.cpp @@ -1,5 +1,5 @@ /* - $Id: RegionExclude.cpp,v 1.1 2003/08/06 06:46:06 jackburton Exp $ + $Id: RegionExclude.cpp 4235 2003-08-06 06:46:06Z jackburton $ This file implements the exclude test for the OpenBeOS BRegion code. diff --git a/src/tests/kits/interface/bregion/RegionExclude.h b/src/tests/kits/interface/bregion/RegionExclude.h index 2f8cbed531..71487fb131 100644 --- a/src/tests/kits/interface/bregion/RegionExclude.h +++ b/src/tests/kits/interface/bregion/RegionExclude.h @@ -1,5 +1,5 @@ /* - $Id: RegionExclude.h,v 1.1 2003/08/06 06:46:06 jackburton Exp $ + $Id: RegionExclude.h 4235 2003-08-06 06:46:06Z jackburton $ This file defines a class for performing one test of BRegion functionality. diff --git a/src/tests/kits/interface/bregion/RegionInclude.cpp b/src/tests/kits/interface/bregion/RegionInclude.cpp index 8788ee2640..e82eeb00c4 100644 --- a/src/tests/kits/interface/bregion/RegionInclude.cpp +++ b/src/tests/kits/interface/bregion/RegionInclude.cpp @@ -1,5 +1,5 @@ /* - $Id: RegionInclude.cpp,v 1.1 2003/08/06 06:46:06 jackburton Exp $ + $Id: RegionInclude.cpp 4235 2003-08-06 06:46:06Z jackburton $ This file implements the include test for the OpenBeOS BRegion code. diff --git a/src/tests/kits/interface/bregion/RegionInclude.h b/src/tests/kits/interface/bregion/RegionInclude.h index 2c0930ecc8..b6a4b35989 100644 --- a/src/tests/kits/interface/bregion/RegionInclude.h +++ b/src/tests/kits/interface/bregion/RegionInclude.h @@ -1,5 +1,5 @@ /* - $Id: RegionInclude.h,v 1.1 2003/08/06 06:46:06 jackburton Exp $ + $Id: RegionInclude.h 4235 2003-08-06 06:46:06Z jackburton $ This file defines a class for performing one test of BRegion functionality. diff --git a/src/tests/kits/interface/bregion/RegionIntersect.cpp b/src/tests/kits/interface/bregion/RegionIntersect.cpp index 4c796c98ec..a820111b43 100644 --- a/src/tests/kits/interface/bregion/RegionIntersect.cpp +++ b/src/tests/kits/interface/bregion/RegionIntersect.cpp @@ -1,5 +1,5 @@ /* - $Id: RegionIntersect.cpp,v 1.1 2003/08/06 06:46:06 jackburton Exp $ + $Id: RegionIntersect.cpp 4235 2003-08-06 06:46:06Z jackburton $ This file implements the intersect test for the OpenBeOS BRegion code. diff --git a/src/tests/kits/interface/bregion/RegionIntersect.h b/src/tests/kits/interface/bregion/RegionIntersect.h index 7e4473b787..f1d5870f3f 100644 --- a/src/tests/kits/interface/bregion/RegionIntersect.h +++ b/src/tests/kits/interface/bregion/RegionIntersect.h @@ -1,5 +1,5 @@ /* - $Id: RegionIntersect.h,v 1.1 2003/08/06 06:46:06 jackburton Exp $ + $Id: RegionIntersect.h 4235 2003-08-06 06:46:06Z jackburton $ This file defines a class for performing one test of BRegion functionality. diff --git a/src/tests/kits/interface/bregion/RegionOffsetBy.cpp b/src/tests/kits/interface/bregion/RegionOffsetBy.cpp index d3612f61b2..2c06792df5 100644 --- a/src/tests/kits/interface/bregion/RegionOffsetBy.cpp +++ b/src/tests/kits/interface/bregion/RegionOffsetBy.cpp @@ -1,5 +1,5 @@ /* - $Id: RegionOffsetBy.cpp,v 1.1 2003/08/06 06:46:06 jackburton Exp $ + $Id: RegionOffsetBy.cpp 4235 2003-08-06 06:46:06Z jackburton $ This file implements the OffsetBy test for the OpenBeOS BRegion code. diff --git a/src/tests/kits/interface/bregion/RegionOffsetBy.h b/src/tests/kits/interface/bregion/RegionOffsetBy.h index e5014aebe5..adce2721fa 100644 --- a/src/tests/kits/interface/bregion/RegionOffsetBy.h +++ b/src/tests/kits/interface/bregion/RegionOffsetBy.h @@ -1,5 +1,5 @@ /* - $Id: RegionOffsetBy.h,v 1.1 2003/08/06 06:46:06 jackburton Exp $ + $Id: RegionOffsetBy.h 4235 2003-08-06 06:46:06Z jackburton $ This file defines a class for performing one test of BRegion functionality. diff --git a/src/tests/kits/interface/bregion/RegionTestcase.cpp b/src/tests/kits/interface/bregion/RegionTestcase.cpp index ed54a8862a..fe869244f6 100644 --- a/src/tests/kits/interface/bregion/RegionTestcase.cpp +++ b/src/tests/kits/interface/bregion/RegionTestcase.cpp @@ -1,5 +1,5 @@ /* - $Id: RegionTestcase.cpp,v 1.3 2004/05/12 06:37:18 jackburton Exp $ + $Id: RegionTestcase.cpp 7533 2004-05-12 06:37:18Z jackburton $ This file implements a base class for all tests of the OpenBeOS BRegion code. diff --git a/src/tests/kits/interface/bregion/RegionTestcase.h b/src/tests/kits/interface/bregion/RegionTestcase.h index 26661917e3..fd10554785 100644 --- a/src/tests/kits/interface/bregion/RegionTestcase.h +++ b/src/tests/kits/interface/bregion/RegionTestcase.h @@ -1,5 +1,5 @@ /* - $Id: RegionTestcase.h,v 1.1 2003/08/06 06:46:06 jackburton Exp $ + $Id: RegionTestcase.h 4235 2003-08-06 06:46:06Z jackburton $ This file defines a base class for performing all tests of BRegion functionality. diff --git a/src/tests/kits/support/bautolock/AutolockLockerTest.cpp b/src/tests/kits/support/bautolock/AutolockLockerTest.cpp index 837c885439..eedfd8eb06 100644 --- a/src/tests/kits/support/bautolock/AutolockLockerTest.cpp +++ b/src/tests/kits/support/bautolock/AutolockLockerTest.cpp @@ -1,5 +1,5 @@ /* - $Id: AutolockLockerTest.cpp,v 1.2 2002/07/19 06:45:28 tylerdauwalder Exp $ + $Id: AutolockLockerTest.cpp 332 2002-07-19 06:45:28Z tylerdauwalder $ This file tests all use cases of the BAutolock when used with a BLocker. BLooper based tests are done seperately. diff --git a/src/tests/kits/support/bautolock/AutolockLockerTest.h b/src/tests/kits/support/bautolock/AutolockLockerTest.h index dcb28d8ff7..1122eafc2e 100644 --- a/src/tests/kits/support/bautolock/AutolockLockerTest.h +++ b/src/tests/kits/support/bautolock/AutolockLockerTest.h @@ -1,5 +1,5 @@ /* - $Id: AutolockLockerTest.h,v 1.2 2002/07/19 06:45:28 tylerdauwalder Exp $ + $Id: AutolockLockerTest.h 332 2002-07-19 06:45:28Z tylerdauwalder $ This file defines the class for performing all BAutolock tests on a BLocker. diff --git a/src/tests/kits/support/bautolock/AutolockLooperTest.cpp b/src/tests/kits/support/bautolock/AutolockLooperTest.cpp index 4d76072b56..0340730610 100644 --- a/src/tests/kits/support/bautolock/AutolockLooperTest.cpp +++ b/src/tests/kits/support/bautolock/AutolockLooperTest.cpp @@ -1,5 +1,5 @@ /* - $Id: AutolockLooperTest.cpp,v 1.2 2002/07/19 06:45:28 tylerdauwalder Exp $ + $Id: AutolockLooperTest.cpp 332 2002-07-19 06:45:28Z tylerdauwalder $ This file tests all use cases of the BAutolock when used with a BLooper. BLocker based tests are done seperately. diff --git a/src/tests/kits/support/bautolock/AutolockLooperTest.h b/src/tests/kits/support/bautolock/AutolockLooperTest.h index fddb60ba72..5071b58767 100644 --- a/src/tests/kits/support/bautolock/AutolockLooperTest.h +++ b/src/tests/kits/support/bautolock/AutolockLooperTest.h @@ -1,5 +1,5 @@ /* - $Id: AutolockLooperTest.h,v 1.2 2002/07/19 06:45:28 tylerdauwalder Exp $ + $Id: AutolockLooperTest.h 332 2002-07-19 06:45:28Z tylerdauwalder $ This file defines the class for performing all BAutolock tests on a BLooper. diff --git a/src/tests/kits/support/bautolock/AutolockTestAddon.cpp b/src/tests/kits/support/bautolock/AutolockTestAddon.cpp index ce49f5c0ec..ec92363165 100644 --- a/src/tests/kits/support/bautolock/AutolockTestAddon.cpp +++ b/src/tests/kits/support/bautolock/AutolockTestAddon.cpp @@ -1,5 +1,5 @@ /* - $Id: AutolockTestAddon.cpp,v 1.1 2002/07/09 12:24:57 ejakowatz Exp $ + $Id: AutolockTestAddon.cpp 10 2002-07-09 12:24:59Z ejakowatz $ This file declares the addonTestName string and addonTestFunc function for the BLocker tests. These symbols will be used diff --git a/src/tests/kits/support/bblockcache/BlockCacheConcurrencyTest.cpp b/src/tests/kits/support/bblockcache/BlockCacheConcurrencyTest.cpp index 1c02e9ced9..91d838370f 100644 --- a/src/tests/kits/support/bblockcache/BlockCacheConcurrencyTest.cpp +++ b/src/tests/kits/support/bblockcache/BlockCacheConcurrencyTest.cpp @@ -1,5 +1,5 @@ /* - $Id: BlockCacheConcurrencyTest.cpp,v 1.2 2004/11/21 18:37:49 shatty Exp $ + $Id: BlockCacheConcurrencyTest.cpp 10124 2004-11-21 18:37:49Z shatty $ This file tests BBlockCache from multiple threads to ensure there are no concurrency problems. diff --git a/src/tests/kits/support/bblockcache/BlockCacheConcurrencyTest.h b/src/tests/kits/support/bblockcache/BlockCacheConcurrencyTest.h index 8798f56700..25c824d913 100644 --- a/src/tests/kits/support/bblockcache/BlockCacheConcurrencyTest.h +++ b/src/tests/kits/support/bblockcache/BlockCacheConcurrencyTest.h @@ -1,5 +1,5 @@ /* - $Id: BlockCacheConcurrencyTest.h,v 1.1 2003/09/07 11:53:03 bonefish Exp $ + $Id: BlockCacheConcurrencyTest.h 4522 2003-09-07 11:53:03Z bonefish $ This file defines a class for testing BBlockCache diff --git a/src/tests/kits/support/bblockcache/BlockCacheExerciseTest.cpp b/src/tests/kits/support/bblockcache/BlockCacheExerciseTest.cpp index 89d91484f9..aaf2878e4e 100644 --- a/src/tests/kits/support/bblockcache/BlockCacheExerciseTest.cpp +++ b/src/tests/kits/support/bblockcache/BlockCacheExerciseTest.cpp @@ -1,5 +1,5 @@ /* - $Id: BlockCacheExerciseTest.cpp,v 1.2 2004/11/21 18:37:49 shatty Exp $ + $Id: BlockCacheExerciseTest.cpp 10124 2004-11-21 18:37:49Z shatty $ This file tests basic functionality of BBlockCache. diff --git a/src/tests/kits/support/bblockcache/BlockCacheExerciseTest.h b/src/tests/kits/support/bblockcache/BlockCacheExerciseTest.h index 245e80e988..e57f9a5ef8 100644 --- a/src/tests/kits/support/bblockcache/BlockCacheExerciseTest.h +++ b/src/tests/kits/support/bblockcache/BlockCacheExerciseTest.h @@ -1,5 +1,5 @@ /* - $Id: BlockCacheExerciseTest.h,v 1.1 2003/09/07 11:53:03 bonefish Exp $ + $Id: BlockCacheExerciseTest.h 4522 2003-09-07 11:53:03Z bonefish $ This file defines a class for performing tests on the BBlockCache class. diff --git a/src/tests/kits/support/bblockcache/BlockCacheTest.cpp b/src/tests/kits/support/bblockcache/BlockCacheTest.cpp index 7144fa0b8d..468a964aea 100644 --- a/src/tests/kits/support/bblockcache/BlockCacheTest.cpp +++ b/src/tests/kits/support/bblockcache/BlockCacheTest.cpp @@ -1,5 +1,5 @@ /* - $Id: BlockCacheTest.cpp,v 1.1 2003/09/07 11:53:03 bonefish Exp $ + $Id: BlockCacheTest.cpp 4522 2003-09-07 11:53:03Z bonefish $ */ diff --git a/src/tests/kits/support/blocker/BenaphoreLockCountTest1.cpp b/src/tests/kits/support/blocker/BenaphoreLockCountTest1.cpp index 7464f2e48f..5d3d01dd6f 100644 --- a/src/tests/kits/support/blocker/BenaphoreLockCountTest1.cpp +++ b/src/tests/kits/support/blocker/BenaphoreLockCountTest1.cpp @@ -1,5 +1,5 @@ /* - $Id: BenaphoreLockCountTest1.cpp,v 1.3 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: BenaphoreLockCountTest1.cpp 301 2002-07-18 05:32:00Z tylerdauwalder $ This file implements a test class for testing BLocker functionality. It tests use cases "Count Lock Requests" for a benaphore style BLocker. diff --git a/src/tests/kits/support/blocker/BenaphoreLockCountTest1.h b/src/tests/kits/support/blocker/BenaphoreLockCountTest1.h index b2dafd55cd..414451288e 100644 --- a/src/tests/kits/support/blocker/BenaphoreLockCountTest1.h +++ b/src/tests/kits/support/blocker/BenaphoreLockCountTest1.h @@ -1,5 +1,5 @@ /* - $Id: BenaphoreLockCountTest1.h,v 1.2 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: BenaphoreLockCountTest1.h 301 2002-07-18 05:32:00Z tylerdauwalder $ This file defines a classes for performing one test of BLocker functionality. diff --git a/src/tests/kits/support/blocker/ConcurrencyTest1.cpp b/src/tests/kits/support/blocker/ConcurrencyTest1.cpp index fa19c241db..c86d2016b8 100644 --- a/src/tests/kits/support/blocker/ConcurrencyTest1.cpp +++ b/src/tests/kits/support/blocker/ConcurrencyTest1.cpp @@ -1,5 +1,5 @@ /* - $Id: ConcurrencyTest1.cpp,v 1.2 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: ConcurrencyTest1.cpp 301 2002-07-18 05:32:00Z tylerdauwalder $ This file implements a test class for testing BLocker functionality. It tests use cases "Locking 1", "Locking 2", "Unlocking", "Is Locked", diff --git a/src/tests/kits/support/blocker/ConcurrencyTest1.h b/src/tests/kits/support/blocker/ConcurrencyTest1.h index 7610f4eb88..24ee7870d2 100644 --- a/src/tests/kits/support/blocker/ConcurrencyTest1.h +++ b/src/tests/kits/support/blocker/ConcurrencyTest1.h @@ -1,5 +1,5 @@ /* - $Id: ConcurrencyTest1.h,v 1.2 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: ConcurrencyTest1.h 301 2002-07-18 05:32:00Z tylerdauwalder $ This file defines a class for performing one test of BLocker functionality. diff --git a/src/tests/kits/support/blocker/ConcurrencyTest2.cpp b/src/tests/kits/support/blocker/ConcurrencyTest2.cpp index 8937ad2fc0..fabb601786 100644 --- a/src/tests/kits/support/blocker/ConcurrencyTest2.cpp +++ b/src/tests/kits/support/blocker/ConcurrencyTest2.cpp @@ -1,5 +1,5 @@ /* - $Id: ConcurrencyTest2.cpp,v 1.2 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: ConcurrencyTest2.cpp 301 2002-07-18 05:32:00Z tylerdauwalder $ This file implements a test class for testing BLocker functionality. It tests use cases "Locking 1", "Locking 2", "Unlocking", "Is Locked", diff --git a/src/tests/kits/support/blocker/ConcurrencyTest2.h b/src/tests/kits/support/blocker/ConcurrencyTest2.h index b9603db870..eda431eeae 100644 --- a/src/tests/kits/support/blocker/ConcurrencyTest2.h +++ b/src/tests/kits/support/blocker/ConcurrencyTest2.h @@ -1,5 +1,5 @@ /* - $Id: ConcurrencyTest2.h,v 1.2 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: ConcurrencyTest2.h 301 2002-07-18 05:32:00Z tylerdauwalder $ This file defines a classes for performing one test of BLocker functionality. diff --git a/src/tests/kits/support/blocker/ConstructionTest1.cpp b/src/tests/kits/support/blocker/ConstructionTest1.cpp index 37cce17855..2137391a00 100644 --- a/src/tests/kits/support/blocker/ConstructionTest1.cpp +++ b/src/tests/kits/support/blocker/ConstructionTest1.cpp @@ -1,5 +1,5 @@ /* - $Id: ConstructionTest1.cpp,v 1.2 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: ConstructionTest1.cpp 301 2002-07-18 05:32:00Z tylerdauwalder $ This file implements a test class for testing BLocker construction functionality. It checks the "Construction 1", "Construction 2" and diff --git a/src/tests/kits/support/blocker/ConstructionTest1.h b/src/tests/kits/support/blocker/ConstructionTest1.h index 9a31568e2c..a4d23637cc 100644 --- a/src/tests/kits/support/blocker/ConstructionTest1.h +++ b/src/tests/kits/support/blocker/ConstructionTest1.h @@ -1,5 +1,5 @@ /* - $Id: ConstructionTest1.h,v 1.2 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: ConstructionTest1.h 301 2002-07-18 05:32:00Z tylerdauwalder $ This file defines a class for performing one test of BLocker functionality. diff --git a/src/tests/kits/support/blocker/DestructionTest1.cpp b/src/tests/kits/support/blocker/DestructionTest1.cpp index d3c0d297d4..d08d757324 100644 --- a/src/tests/kits/support/blocker/DestructionTest1.cpp +++ b/src/tests/kits/support/blocker/DestructionTest1.cpp @@ -1,5 +1,5 @@ /* - $Id: DestructionTest1.cpp,v 1.2 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: DestructionTest1.cpp 301 2002-07-18 05:32:00Z tylerdauwalder $ This file implements a test class for testing BLocker functionality. It tests use cases "Destruction" and "Locking 3". diff --git a/src/tests/kits/support/blocker/DestructionTest1.h b/src/tests/kits/support/blocker/DestructionTest1.h index 21aa9c8f6c..1aa51e2d5a 100644 --- a/src/tests/kits/support/blocker/DestructionTest1.h +++ b/src/tests/kits/support/blocker/DestructionTest1.h @@ -1,5 +1,5 @@ /* - $Id: DestructionTest1.h,v 1.2 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: DestructionTest1.h 301 2002-07-18 05:32:00Z tylerdauwalder $ This file defines a class for performing one test of BLocker functionality. diff --git a/src/tests/kits/support/blocker/DestructionTest2.cpp b/src/tests/kits/support/blocker/DestructionTest2.cpp index 275e566ce5..50100e640c 100644 --- a/src/tests/kits/support/blocker/DestructionTest2.cpp +++ b/src/tests/kits/support/blocker/DestructionTest2.cpp @@ -1,5 +1,5 @@ /* - $Id: DestructionTest2.cpp,v 1.2 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: DestructionTest2.cpp 301 2002-07-18 05:32:00Z tylerdauwalder $ This file implements a test class for testing BLocker functionality. It tests use cases "Destruction" and "Locking 4". diff --git a/src/tests/kits/support/blocker/DestructionTest2.h b/src/tests/kits/support/blocker/DestructionTest2.h index 2f1ed60e12..dd3e710c36 100644 --- a/src/tests/kits/support/blocker/DestructionTest2.h +++ b/src/tests/kits/support/blocker/DestructionTest2.h @@ -1,5 +1,5 @@ /* - $Id: DestructionTest2.h,v 1.2 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: DestructionTest2.h 301 2002-07-18 05:32:00Z tylerdauwalder $ This file defines a class for performing one test of BLocker functionality. diff --git a/src/tests/kits/support/blocker/LockerTest.cpp b/src/tests/kits/support/blocker/LockerTest.cpp index 9a18162aba..7a2b0ff2a8 100644 --- a/src/tests/kits/support/blocker/LockerTest.cpp +++ b/src/tests/kits/support/blocker/LockerTest.cpp @@ -1,5 +1,5 @@ /* - $Id: LockerTest.cpp,v 1.1 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: LockerTest.cpp 301 2002-07-18 05:32:00Z tylerdauwalder $ This file declares the addonTestName string and addonTestFunc function for the BLocker tests. These symbols will be used diff --git a/src/tests/kits/support/blocker/LockerTestCase.cpp b/src/tests/kits/support/blocker/LockerTestCase.cpp index eb2a218131..a69a38b7e7 100644 --- a/src/tests/kits/support/blocker/LockerTestCase.cpp +++ b/src/tests/kits/support/blocker/LockerTestCase.cpp @@ -1,5 +1,5 @@ /* - $Id: LockerTestCase.cpp,v 1.2 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: LockerTestCase.cpp 301 2002-07-18 05:32:00Z tylerdauwalder $ This file implements a base class for testing BLocker functionality. diff --git a/src/tests/kits/support/blocker/LockerTestCase.h b/src/tests/kits/support/blocker/LockerTestCase.h index 76973b1fa9..72cd94aab4 100644 --- a/src/tests/kits/support/blocker/LockerTestCase.h +++ b/src/tests/kits/support/blocker/LockerTestCase.h @@ -1,5 +1,5 @@ /* - $Id: LockerTestCase.h,v 1.2 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: LockerTestCase.h 301 2002-07-18 05:32:00Z tylerdauwalder $ This file defines a couple of common classes for testing BLocker functionality. diff --git a/src/tests/kits/support/blocker/SemaphoreLockCountTest1.cpp b/src/tests/kits/support/blocker/SemaphoreLockCountTest1.cpp index 1271bc6a24..e161cf0306 100644 --- a/src/tests/kits/support/blocker/SemaphoreLockCountTest1.cpp +++ b/src/tests/kits/support/blocker/SemaphoreLockCountTest1.cpp @@ -1,5 +1,5 @@ /* - $Id: SemaphoreLockCountTest1.cpp,v 1.2 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: SemaphoreLockCountTest1.cpp 301 2002-07-18 05:32:00Z tylerdauwalder $ This file implements a test class for testing BLocker functionality. It tests use cases "Count Lock Requests" for a semaphore style BLocker. diff --git a/src/tests/kits/support/blocker/SemaphoreLockCountTest1.h b/src/tests/kits/support/blocker/SemaphoreLockCountTest1.h index df2d6da146..e847ac4490 100644 --- a/src/tests/kits/support/blocker/SemaphoreLockCountTest1.h +++ b/src/tests/kits/support/blocker/SemaphoreLockCountTest1.h @@ -1,5 +1,5 @@ /* - $Id: SemaphoreLockCountTest1.h,v 1.2 2002/07/18 05:32:00 tylerdauwalder Exp $ + $Id: SemaphoreLockCountTest1.h 301 2002-07-18 05:32:00Z tylerdauwalder $ This file defines a classes for performing one test of BLocker functionality. diff --git a/src/tools/stubgen/README b/src/tools/stubgen/README index 7854104cf0..0c37fe4958 100644 --- a/src/tools/stubgen/README +++ b/src/tools/stubgen/README @@ -1,6 +1,6 @@ stubgen README file Michael John Radwin -$Id: README,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $ +$Id: README 10 2002-07-09 12:24:59Z ejakowatz $ Description diff --git a/src/tools/stubgen/etc/Debug.C b/src/tools/stubgen/etc/Debug.C index 0f78991858..c02606530e 100644 --- a/src/tools/stubgen/etc/Debug.C +++ b/src/tools/stubgen/etc/Debug.C @@ -4,7 +4,7 @@ // DESCR: Debug log file utility functions // -static char rcsid[] = "$Id: Debug.C,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $"; +static char rcsid[] = "$Id: Debug.C 10 2002-07-09 12:24:59Z ejakowatz $"; #include "Debug.H" diff --git a/src/tools/stubgen/etc/Debug.H b/src/tools/stubgen/etc/Debug.H index b847c50cd1..193511ce26 100644 --- a/src/tools/stubgen/etc/Debug.H +++ b/src/tools/stubgen/etc/Debug.H @@ -3,7 +3,7 @@ // AUTHOR: bmc // DESCR: Debug header for FallOS // -// $Id: Debug.H,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $ +// $Id: Debug.H 10 2002-07-09 12:24:59Z ejakowatz $ // #ifdef _ASSERT_H diff --git a/src/tools/stubgen/lexer.l b/src/tools/stubgen/lexer.l index eb3a27971f..b24a95804c 100644 --- a/src/tools/stubgen/lexer.l +++ b/src/tools/stubgen/lexer.l @@ -9,7 +9,7 @@ * (ftp://ftp.uu.net/usenet/net.sources/ansi.c.grammar.Z) * * DATE: Thu Aug 15 13:10:06 EDT 1996 - * $Id: lexer.l,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $ + * $Id: lexer.l 10 2002-07-09 12:24:59Z ejakowatz $ * * Copyright (c) 1996-1998 Michael John Radwin * @@ -194,7 +194,7 @@ IS (u|U|l|L)* the value as a pointer */ #define RETURN_VAL(x) tokens_seen++; yylval.flag = 37; return(x) -static const char rcsid[] = "$Id: lexer.l,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $"; +static const char rcsid[] = "$Id: lexer.l 10 2002-07-09 12:24:59Z ejakowatz $"; static void count(); static void comment(); diff --git a/src/tools/stubgen/main.c b/src/tools/stubgen/main.c index 58a45ef0b0..ffe479251f 100644 --- a/src/tools/stubgen/main.c +++ b/src/tools/stubgen/main.c @@ -5,7 +5,7 @@ * DESC: stubgen code generation routines * * DATE: Thu Nov 13 13:28:23 PST 1997 - * $Id: main.c,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $ + * $Id: main.c 10 2002-07-09 12:24:59Z ejakowatz $ * * Copyright (c) 1996-1998 Michael John Radwin * @@ -73,7 +73,7 @@ char *currentFile = ""; static const char *lots_of_stars = "***********************************************************************"; static const char *progname = "stubgen"; -static const char rcsid[] = "$Id: main.c,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $"; +static const char rcsid[] = "$Id: main.c 10 2002-07-09 12:24:59Z ejakowatz $"; static const char *progver = "2.05"; static const char *copyright = diff --git a/src/tools/stubgen/parser.y b/src/tools/stubgen/parser.y index b77d634844..95f05aae22 100644 --- a/src/tools/stubgen/parser.y +++ b/src/tools/stubgen/parser.y @@ -10,7 +10,7 @@ * This grammar is only a subset of the real C++ language. * * DATE: Thu Aug 15 13:10:06 EDT 1996 - * $Id: parser.y,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $ + * $Id: parser.y 10 2002-07-09 12:24:59Z ejakowatz $ * * Copyright (c) 1996-1998 Michael John Radwin * @@ -357,7 +357,7 @@ extern int collectMemberInitList(); /* defined here in parser.y */ static int error_recovery(); static int yyerror(char *); -static const char rcsid[] = "$Id: parser.y,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $"; +static const char rcsid[] = "$Id: parser.y 10 2002-07-09 12:24:59Z ejakowatz $"; /* defined in main.c */ extern FILE *outfile; diff --git a/src/tools/stubgen/pathname.c b/src/tools/stubgen/pathname.c index 8802c022d8..3eed3ea8d5 100644 --- a/src/tools/stubgen/pathname.c +++ b/src/tools/stubgen/pathname.c @@ -6,7 +6,7 @@ * by the gnu dirutils. * * DATE: Tue Oct 1 20:48:28 EDT 1996 - * $Id: pathname.c,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $ + * $Id: pathname.c 10 2002-07-09 12:24:59Z ejakowatz $ * * Copyright (c) 1996-1998 Michael John Radwin * @@ -35,7 +35,7 @@ #define PATH_SEPARATOR_CHAR '/' #endif -static const char rcsid[] = "$Id: pathname.c,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $"; +static const char rcsid[] = "$Id: pathname.c 10 2002-07-09 12:24:59Z ejakowatz $"; static void strip_trailing_slashes(char *path) diff --git a/src/tools/stubgen/pathname.h b/src/tools/stubgen/pathname.h index 4db9cb029c..6ca8298272 100644 --- a/src/tools/stubgen/pathname.h +++ b/src/tools/stubgen/pathname.h @@ -5,7 +5,7 @@ * DESC: two important functions from libgen * * DATE: Tue Oct 1 20:47:55 EDT 1996 - * $Id: pathname.h,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $ + * $Id: pathname.h 10 2002-07-09 12:24:59Z ejakowatz $ * * Copyright (c) 1996-1998 Michael John Radwin * diff --git a/src/tools/stubgen/table.c b/src/tools/stubgen/table.c index 168c01da2c..52f305aca4 100644 --- a/src/tools/stubgen/table.c +++ b/src/tools/stubgen/table.c @@ -5,7 +5,7 @@ * DESC: stubgen symbol table goodies * * DATE: 1996/08/14 22:04:47 - * $Id: table.c,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $ + * $Id: table.c 10 2002-07-09 12:24:59Z ejakowatz $ * * Copyright (c) 1996-1998 Michael John Radwin * @@ -31,7 +31,7 @@ #include #include -static const char rcsid[] = "$Id: table.c,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $"; +static const char rcsid[] = "$Id: table.c 10 2002-07-09 12:24:59Z ejakowatz $"; /* global table */ static syntaxelem_t etable[NELEMS]; diff --git a/src/tools/stubgen/table.h b/src/tools/stubgen/table.h index 2b3d3dff2e..33501800eb 100644 --- a/src/tools/stubgen/table.h +++ b/src/tools/stubgen/table.h @@ -5,7 +5,7 @@ * DESC: stubgen symbol table goodies * * DATE: 1996/08/14 22:04:47 - * $Id: table.h,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $ + * $Id: table.h 10 2002-07-09 12:24:59Z ejakowatz $ * * Copyright (c) 1996-1998 Michael John Radwin * diff --git a/src/tools/stubgen/test/Rational.H b/src/tools/stubgen/test/Rational.H index 436807ccd5..4e721b2100 100644 --- a/src/tools/stubgen/test/Rational.H +++ b/src/tools/stubgen/test/Rational.H @@ -3,7 +3,7 @@ * ACCT: mradwin * FILE: Rational.H * DATE: Sat Mar 4 01:47:16 EST 1995 - * $Id: Rational.H,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $ + * $Id: Rational.H 10 2002-07-09 12:24:59Z ejakowatz $ ****************************************************************/ class Rational { diff --git a/src/tools/stubgen/util.c b/src/tools/stubgen/util.c index 0dd6b26850..0d58736f73 100644 --- a/src/tools/stubgen/util.c +++ b/src/tools/stubgen/util.c @@ -5,7 +5,7 @@ * DESC: stubgen utility macros and funcs * * DATE: Wed Sep 11 23:31:55 EDT 1996 - * $Id: util.c,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $ + * $Id: util.c 10 2002-07-09 12:24:59Z ejakowatz $ * * Copyright (c) 1996-1998 Michael John Radwin * @@ -30,7 +30,7 @@ #include #include "util.h" -static const char rcsid[] = "$Id: util.c,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $"; +static const char rcsid[] = "$Id: util.c 10 2002-07-09 12:24:59Z ejakowatz $"; #ifdef SGDEBUG static FILE *logfile; diff --git a/src/tools/stubgen/util.h b/src/tools/stubgen/util.h index b7f8d8162c..1158b93780 100644 --- a/src/tools/stubgen/util.h +++ b/src/tools/stubgen/util.h @@ -5,7 +5,7 @@ * DESC: stubgen utility macros and funcs * * DATE: Wed Sep 11 23:31:55 EDT 1996 - * $Id: util.h,v 1.1 2002/07/09 12:24:59 ejakowatz Exp $ + * $Id: util.h 10 2002-07-09 12:24:59Z ejakowatz $ * * Copyright (c) 1996-1998 Michael John Radwin *