many typo fixes related to type conflicts and dashes in term names

ComputingBrands.kif

@@ -273,67 +273,67 @@ Kodiak")
 (termFormat JapaneseLanguage MacOSXPublicBeta "Kodiak")
 (subclass MacOSXPublicBeta AppleMacOSX)
 
-(documentation MacOSX10-0 EnglishLanguage "Mac OS X 10.0 – code name Cheetah")
-(documentation MacOSX10-0 ChineseTraditionalLanguage "Mac OS X 10.0 – 代號為 Cheetah")
-(documentation MacOSX10-0 ChineseLanguage "Mac OS X 10.0 – 代号为 Cheetah")
-(documentation MacOSX10-0 JapaneseLanguage "Mac OS X 10.0 – コードネーム Cheetah")
-(termFormat EnglishLanguage MacOSX10-0 "Mac OS 10.0")
-(termFormat ChineseTraditionalLanguage MacOSX10-0 "Mac OS 10.0")
-(termFormat ChineseLanguage MacOSX10-0 "Mac OS 10.0")
-(termFormat JapaneseLanguage MacOSX10-0 "Mac OS 10.0")
-
-(termFormat EnglishLanguage MacOSX10-0 "Mac OS Cheetah")
-(termFormat ChineseTraditionalLanguage MacOSX10-0 "Mac OS Cheetah")
-(termFormat ChineseLanguage MacOSX10-0 "Mac OS Cheetah")
-(termFormat JapaneseLanguage MacOSX10-0 "Mac OS Cheetah")
-
-(termFormat EnglishLanguage MacOSX10-0 "Cheetah")
-(termFormat ChineseTraditionalLanguage MacOSX10-0 "Cheetah")
-(termFormat ChineseLanguage MacOSX10-0 "Cheetah")
-(termFormat JapaneseLanguage MacOSX10-0 "Cheetah")
-(subclass MacOSX10-0 AppleMacOSX)
-
-(documentation MacOSX10-1 EnglishLanguage "Mac OS X 10.1 – code name Puma")
-(documentation MacOSX10-1 ChineseTraditionalLanguage "Mac OS X 10.1 – 代號為 Puma")
-(documentation MacOSX10-1 ChineseLanguage "Mac OS X 10.1 – 代号为 Puma")
-(documentation MacOSX10-1 JapaneseLanguage "Mac OS X 10.1 – コードネーム Puma")
-
-(termFormat EnglishLanguage MacOSX10-1 "Mac OS 10.1")
-(termFormat ChineseTraditionalLanguage MacOSX10-1 "Mac OS 10.1")
-(termFormat ChineseLanguage MacOSX10-1 "Mac OS 10.1")
-(termFormat JapaneseLanguage MacOSX10-1 "Mac OS 10.1")
-
-(termFormat EnglishLanguage MacOSX10-1 "Mac OS Puma")
-(termFormat ChineseTraditionalLanguage MacOSX10-1 "Mac OS Puma")
-(termFormat ChineseLanguage MacOSX10-1 "Mac OS Puma")
-(termFormat JapaneseLanguage MacOSX10-1 "Mac OS Puma")
-
-(termFormat EnglishLanguage MacOSX10-1 "Puma")
-(termFormat ChineseLanguage MacOSX10-1 "Puma")
-(termFormat JapaneseLanguage MacOSX10-1 "Puma")
-
-(subclass MacOSX10-1 AppleMacOSX)
-
-(documentation MacOSX10-2 EnglishLanguage "Mac OS X 10.2 – also marketed as Jaguar")
-(documentation MacOSX10-2 ChineseTraditionalLanguage "Mac OS X 10.2 – 亦推廣為 Jaguar")
-(documentation MacOSX10-2 ChineseLanguage "Mac OS X 10.2 – 亦推广为 Jaguar")
-(documentation MacOSX10-2 JapaneseLanguage "Mac OS X 10.2 – 別名Jaguar")
-
-(termFormat EnglishLanguage MacOSX10-2 "Mac OS 10.2")
-(termFormat ChineseTraditionalLanguage MacOSX10-2 "Mac OS 10.2")
-(termFormat ChineseLanguage MacOSX10-2 "Mac OS 10.2")
-(termFormat JapaneseLanguage MacOSX10-2 "Mac OS 10.2")
-
-(termFormat EnglishLanguage MacOSX10-2 "Mac OS Jaguar")
-(termFormat ChineseTraditionalLanguage MacOSX10-2 "Mac OS Jaguar")
-(termFormat ChineseLanguage MacOSX10-2 "Mac OS Jaguar")
-(termFormat JapaneseLanguage MacOSX10-2 "Mac OS Jaguar")
-
-(termFormat EnglishLanguage MacOSX10-2 "Jaguar")
-(termFormat ChineseTraditionalLanguage MacOSX10-2 "Jaguar")
-(termFormat ChineseLanguage MacOSX10-2 "Jaguar")
-(termFormat JapaneseLanguage MacOSX10-2 "Jaguar")
-(subclass MacOSX10-2 AppleMacOSX)
+(documentation MacOSX10_0 EnglishLanguage "Mac OS X 10.0 – code name Cheetah")
+(documentation MacOSX10_0 ChineseTraditionalLanguage "Mac OS X 10.0 – 代號為 Cheetah")
+(documentation MacOSX10_0 ChineseLanguage "Mac OS X 10.0 – 代号为 Cheetah")
+(documentation MacOSX10_0 JapaneseLanguage "Mac OS X 10.0 – コードネーム Cheetah")
+(termFormat EnglishLanguage MacOSX10_0 "Mac OS 10.0")
+(termFormat ChineseTraditionalLanguage MacOSX10_0 "Mac OS 10.0")
+(termFormat ChineseLanguage MacOSX10_0 "Mac OS 10.0")
+(termFormat JapaneseLanguage MacOSX10_0 "Mac OS 10.0")
+
+(termFormat EnglishLanguage MacOSX10_0 "Mac OS Cheetah")
+(termFormat ChineseTraditionalLanguage MacOSX10_0 "Mac OS Cheetah")
+(termFormat ChineseLanguage MacOSX10_0 "Mac OS Cheetah")
+(termFormat JapaneseLanguage MacOSX10_0 "Mac OS Cheetah")
+
+(termFormat EnglishLanguage MacOSX10_0 "Cheetah")
+(termFormat ChineseTraditionalLanguage MacOSX10_0 "Cheetah")
+(termFormat ChineseLanguage MacOSX10_0 "Cheetah")
+(termFormat JapaneseLanguage MacOSX10_0 "Cheetah")
+(subclass MacOSX10_0 AppleMacOSX)
+
+(documentation MacOSX10_1 EnglishLanguage "Mac OS X 10.1 – code name Puma")
+(documentation MacOSX10_1 ChineseTraditionalLanguage "Mac OS X 10.1 – 代號為 Puma")
+(documentation MacOSX10_1 ChineseLanguage "Mac OS X 10.1 – 代号为 Puma")
+(documentation MacOSX10_1 JapaneseLanguage "Mac OS X 10.1 – コードネーム Puma")
+
+(termFormat EnglishLanguage MacOSX10_1 "Mac OS 10.1")
+(termFormat ChineseTraditionalLanguage MacOSX10_1 "Mac OS 10.1")
+(termFormat ChineseLanguage MacOSX10_1 "Mac OS 10.1")
+(termFormat JapaneseLanguage MacOSX10_1 "Mac OS 10.1")
+
+(termFormat EnglishLanguage MacOSX10_1 "Mac OS Puma")
+(termFormat ChineseTraditionalLanguage MacOSX10_1 "Mac OS Puma")
+(termFormat ChineseLanguage MacOSX10_1 "Mac OS Puma")
+(termFormat JapaneseLanguage MacOSX10_1 "Mac OS Puma")
+
+(termFormat EnglishLanguage MacOSX10_1 "Puma")
+(termFormat ChineseLanguage MacOSX10_1 "Puma")
+(termFormat JapaneseLanguage MacOSX10_1 "Puma")
+
+(subclass MacOSX10_1 AppleMacOSX)
+
+(documentation MacOSX10_2 EnglishLanguage "Mac OS X 10.2 – also marketed as Jaguar")
+(documentation MacOSX10_2 ChineseTraditionalLanguage "Mac OS X 10.2 – 亦推廣為 Jaguar")
+(documentation MacOSX10_2 ChineseLanguage "Mac OS X 10.2 – 亦推广为 Jaguar")
+(documentation MacOSX10_2 JapaneseLanguage "Mac OS X 10.2 – 別名Jaguar")
+
+(termFormat EnglishLanguage MacOSX10_2 "Mac OS 10.2")
+(termFormat ChineseTraditionalLanguage MacOSX10_2 "Mac OS 10.2")
+(termFormat ChineseLanguage MacOSX10_2 "Mac OS 10.2")
+(termFormat JapaneseLanguage MacOSX10_2 "Mac OS 10.2")
+
+(termFormat EnglishLanguage MacOSX10_2 "Mac OS Jaguar")
+(termFormat ChineseTraditionalLanguage MacOSX10_2 "Mac OS Jaguar")
+(termFormat ChineseLanguage MacOSX10_2 "Mac OS Jaguar")
+(termFormat JapaneseLanguage MacOSX10_2 "Mac OS Jaguar")
+
+(termFormat EnglishLanguage MacOSX10_2 "Jaguar")
+(termFormat ChineseTraditionalLanguage MacOSX10_2 "Jaguar")
+(termFormat ChineseLanguage MacOSX10_2 "Jaguar")
+(termFormat JapaneseLanguage MacOSX10_2 "Jaguar")
+(subclass MacOSX10_2 AppleMacOSX)
 
 (documentation MacOSXPanther EnglishLanguage "Mac OS X Panther – 10.3")
 (documentation MacOSXPanther ChineseTraditionalLanguage "Mac OS X Panther – 10.3")
@@ -1105,16 +1105,16 @@ Storeから購入したそれぞれのファイルはFairPlayと同時にエン
 (termFormat JapaneseLanguage Windows8 "Windows 8")
 (subclass Windows8 WindowsOS)
 
-(documentation Windows8-1 EnglishLanguage "Microsoft Windows 8.1 (2013)")
-(documentation Windows8-1 ChineseTraditionalLanguage "微軟 Windows 8.1 (2013)")
-(documentation Windows8-1 ChineseLanguage "微软 Windows 8.1 (2013)")
-(documentation Windows8-1 JapaneseLanguage "Microsoft Windows 8.1 (2013)")
+(documentation Windows8_1 EnglishLanguage "Microsoft Windows 8.1 (2013)")
+(documentation Windows8_1 ChineseTraditionalLanguage "微軟 Windows 8.1 (2013)")
+(documentation Windows8_1 ChineseLanguage "微软 Windows 8.1 (2013)")
+(documentation Windows8_1 JapaneseLanguage "Microsoft Windows 8.1 (2013)")
 
-(termFormat EnglishLanguage Windows8-1 "Windows 8.1")
-(termFormat ChineseTraditionalLanguage Windows8-1 "Windows 8.1")
-(termFormat ChineseLanguage Windows8-1 "Windows 8.1")
-(termFormat JapaneseLanguage Windows8-1 "Windows 8.1")
-(subclass Windows8-1 WindowsOS)
+(termFormat EnglishLanguage Windows8_1 "Windows 8.1")
+(termFormat ChineseTraditionalLanguage Windows8_1 "Windows 8.1")
+(termFormat ChineseLanguage Windows8_1 "Windows 8.1")
+(termFormat JapaneseLanguage Windows8_1 "Windows 8.1")
+(subclass Windows8_1 WindowsOS)
 
 (documentation Windows10 EnglishLanguage "Microsoft Windows 10 (2015)")
 (documentation Windows10 ChineseTraditionalLanguage "微軟Windows 10 (2015)")
@@ -2381,12 +2381,12 @@ Showとして紹介しないように公式に記している。 ラスベガス
 (subclass TradeShow FormalMeeting)
 (subclass ConsumerElectronicsShow TradeShow)
 
-(instance Countries-USA-provinces-Nevada-cities-LasVegas City)
-(geographicSubregion Countries-USA-provinces-Nevada-cities-LasVegas Nevada)
+(instance Countries_USA_provinces_Nevada_cities_LasVegas City)
+(geographicSubregion Countries_USA_provinces_Nevada_cities_LasVegas Nevada)
 
 (=>
   (instance ?CES ConsumerElectronicsShow)
-  (located ?CES Countries-USA-provinces-Nevada-cities-LasVegas))  ;; term from mondial.kif
+  (located ?CES Countries_USA_provinces_Nevada_cities_LasVegas))  ;; term from mondial.kif
 
 (=>
   (instance ?CES ConsumerElectronicsShow)

FinancialOntology.kif

@@ -16,10 +16,10 @@
 
 (subclass FinancialOrganization Organization)
 (documentation FinancialOrganization EnglishLanguage "The class &%FinancialOrganization includes, 
-as subclasses, &%Bank-FinancialOrganization, &%CreditUnion and &%SavingsAnLoans.")
+as subclasses, &%BankFinancialOrganization, &%CreditUnion and &%SavingsAnLoans.")
 
-(subclass Bank-FinancialOrganization FinancialOrganization)
-(documentation Bank-FinancialOrganization EnglishLanguage "An organization, chartered by a state or 
+(subclass BankFinancialOrganization FinancialOrganization)
+(documentation BankFinancialOrganization EnglishLanguage "An organization, chartered by a state or
 federal government, which does most or all of the following: receives &%Deposits, 
 honors &%FinancialInstruments drawn on them, and pays &%Interest on them, discounts 
 &%Notes, makes &%Loans,  and invests in &%SecuredLoans, collects &%Checks, &%Drafts 
@@ -1492,7 +1492,7 @@ period of time.")
   (and
     (instance ?Loan BankTermLoan)
     (lender ?Loan ?Lender))
-  (instance ?Lender Bank-FinancialOrganization))
+  (instance ?Lender BankFinancialOrganization))
 
 (=>
   (and
@@ -1568,7 +1568,7 @@ through clearing later the same day.")
   (and
     (instance ?Loan DayLoan)
     (lender ?Loan ?Lender))
-  (instance ?Lender Bank-FinancialOrganization))
+  (instance ?Lender BankFinancialOrganization))
 
 (=>
   (and
@@ -3412,8 +3412,8 @@ year and interest accumulates tax-deferred until the funds are withdrawn.")
 can set aside after-tax income up to a specified amount each year. Earnings on the 
 account are tax-free, and tax-free withdrawals may be made at retirement age.")
 
-(subclass SavingsPlan-401K DefinedContributionPlan)
-(documentation SavingsPlan-401K EnglishLanguage "A defined contribution plan offered by a 
+(subclass SavingsPlan_401K DefinedContributionPlan)
+(documentation SavingsPlan_401K EnglishLanguage "A defined contribution plan offered by a
 corporation to its employees, which allows employees to set aside 
 tax-deferred income for retirement purposes.  The name 401(k) comes from 
 the IRS section describing the program.") 
@@ -3423,8 +3423,8 @@ the IRS section describing the program.")
 a 401(k) or 403(b), in which the employee elects to defer some amount of 
 his/her salary into the plan and bears the investment risk.") 
 
-(subclass SavingsPlan-403B DefinedContributionPlan)
-(documentation SavingsPlan-403B EnglishLanguage "A retirement plan similar to a 401(k) plan, but 
+(subclass SavingsPlan_403B DefinedContributionPlan)
+(documentation SavingsPlan_403B EnglishLanguage "A retirement plan similar to a 401(k) plan, but
 one which is offered by non-profit organizations, such as universities and 
 some charitable organizations, rather than corporations.") 
 
@@ -3442,8 +3442,8 @@ to another.")
 issuer of the receiving IRA and is reported to the IRS as a rollover. This can only 
 be done once per year, per account.") 
 
-(subclass SavingsPlan-408K PensionPlan)
-(documentation SavingsPlan-408K EnglishLanguage "A simpler alternative to a 401(k) plan available 
+(subclass SavingsPlan_408K PensionPlan)
+(documentation SavingsPlan_408K EnglishLanguage "A simpler alternative to a 401(k) plan available
 only to companies with 25 or fewer employees, which gives employees the 
 opportunity to make contributions to their SEP accounts with pre-tax 
 dollars and reduce their current year's net income.") 
@@ -3660,14 +3660,14 @@ of &%Organization ?ORG in a &%SocialInteraction involving ?PERSON2.")
 ;; KJN: Imported from Mid-level-ontology.kif to remove dependencies
 (instance Banker SkilledOccupation)
 (documentation Banker EnglishLanguage "Any &%SkilledOccupation which involves working in a 
-&%Bank-FinancialOrganization.")
+&%BankFinancialOrganization.")
 
 (=>
    (and
       (instance ?H Human)
       (occupiesPosition ?H ?B ?O)
       (attribute ?B Banker))
-   (instance ?O Bank-FinancialOrganization))
+   (instance ?O BankFinancialOrganization))
 
 (subclass ATMSlot HoleRegion)
 (documentation ATMSlot EnglishLanguage "A narrow opening in an ATM machine where cards are inserted.")
@@ -3949,7 +3949,7 @@ of a legal right of possession or control.")
 
 (instance bankAccount BinaryPredicate)
 (domainSubclass bankAccount 1 FinancialAccount)
-(domain bankAccount 2 Bank-FinancialOrganization)
+(domain bankAccount 2 BankFinancialOrganization)
 (documentation bankAccount EnglishLanguage "(&%bankAccount ?Type ?Bank) holds if ?Type is a 
 type of the financial accounts offered by the bank.") 
 

Food.kif

@@ -1234,7 +1234,7 @@ to mix with the milk while it is heated to 70C. MilkFoam is used for making &%Ca
   (instance ?M MilkFoam)
   (measure ?M (MeasureFn 70 CelsiusDegree)))
 
-(subclass mixtureRatio QuintaryRelation)
+(instance mixtureRatio QuintaryRelation)
 (documentation mixtureRatio EnglishLanguage "&%mixtureRatio is a &%QuintaryRelation 
 which specifies how many &%Liter of two &%Liquid &%Substances in a &%LiquidMixture.")
 (termFormat EnglishLanguage mixtureRatio "mixture ratio")
@@ -1329,7 +1329,7 @@ prepared by diluting an espresso with hot water (typically 1:5). [Wikipedia] ")
     (part ?W ?A)
     (instance ?E Espresso)
     (instance ?W DrinkingWater)
-    (measure ?W (MeasureFn 90 CelsiusDegree))
+    (measure ?W (MeasureFn 90.0 CelsiusDegree))
     (mixtureRatio ?E ?W ?V1 ?V2 Liter))
   (and
     (approximateValue ?V1 0.03)
@@ -3036,7 +3036,7 @@ of butter fat. [Wikipedia]")
               (equal ?BF ?F2))
             (part ?F2 ?M))))
       (measure ?BF (MeasureFn ?N2 ?U))
-      (greaterThanOrEqualTo ?N2 (MultiplicationFn 0 ?N))
+      (greaterThanOrEqualTo ?N2 (MultiplicationFn 0.0 ?N))
       (lessThanOrEqualTo ?N2 (MultiplicationFn 0.005 ?N)))))     
 
 (subclass GoatMilk Milk)

Geography.kif

@@ -6376,7 +6376,7 @@ their &%PlantLeaf(ves) annually.")
   (exists (?SHED ?S)
     (and
       (subclass ?SHED Removing)
-      (frequency ?SHED 1 YearDuration)
+      (frequency ?SHED YearDuration)
       (instance ?S ?SHED)
       (origin ?S ?T)
       (patient ?S ?L))))

HouseholdAppliances.kif

@@ -1604,7 +1604,7 @@ be an inhabited space, but rather used for storage, or just insulation.")
   (and
     (instance ?X ?CLASS)
     (clothesWasherModifiedEnergyFactor ?CLASS ?VALUE)
-    (greaterThanOrEqualTo ?VALUE 2)))
+    (greaterThanOrEqualTo ?VALUE 2.0)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

Law.kif

@@ -488,9 +488,9 @@ in advance.")
     (earlier ?T (WhenFn ?MURDER)))
   (attribute ?MURDER Premeditated))
 
-(instance recordForAgremeent BinaryPredicate)
-(termFormat EnglishLanguage recordForAgremeent "record for agreement")
-(format EnglishLanguage recordForAgremeent "%1 is the record for agreement %2")
+(instance recordForAgreement BinaryPredicate)
+(termFormat EnglishLanguage recordForAgreement "record for agreement")
+(format EnglishLanguage recordForAgreement "%1 is the record for agreement %2")
 
 (documentation recordForAgreement EnglishLanguage "This is a relation between a
 document or an action that records the propositional content of an Agreement.

Media.kif

@@ -1166,22 +1166,22 @@ laser is used to write and read bits of data.")
         (MeasureFn 780 Nanometer)))))
 
 
-(subclass CD-ROM CompactDisc)
-(subclass CD-ROM ReadOnlyMemoryDataStorage)
-(documentation CD-ROM EnglishLanguage "An &%instance of
+(subclass CDROM CompactDisc)
+(subclass CDROM ReadOnlyMemoryDataStorage)
+(documentation CDROM EnglishLanguage "An &%instance of
 &%CD-ROM is a &%CompactDisc in the CompactDisc-ReadOnlyMemory
 (CD-ROM) format, which allows no modification of data after
 it has been written.")
 
 
-(subclass CD-R CompactDisc)
-(subclass CD-R WriteOnceDataStorage)
-(documentation CD-R EnglishLanguage "A type of &%CompactDisc that can be written on once and read from multiple times.")
-(disjoint CD-R CD-ROM)
+(subclass CDR CompactDisc)
+(subclass CDR WriteOnceDataStorage)
+(documentation CDR EnglishLanguage "A type of &%CompactDisc that can be written on once and read from multiple times.")
+(disjoint CDR CDROM)
 
-(subclass CD-RW CompactDisc)
-(subclass CD-RW RewritableDataStorage)
-(documentation CD-RW EnglishLanguage "A type of &%CompactDisc that can be written on and read from multiple times.")
+(subclass CDRW CompactDisc)
+(subclass CDRW RewritableDataStorage)
+(documentation CDRW EnglishLanguage "A type of &%CompactDisc that can be written on and read from multiple times.")
 
 
 (subclass BluRayDisc OpticalDisc)