activefacts 0.8.10 → 0.8.12

data/Rakefile

@@ -1,6 +1,7 @@
 %w[rubygems hoe rake rake/clean fileutils newgem thread rubigen].each { |f|
   require f
 }
+Hoe.plugin :gemspec
 
 require 'rspec'
 require 'rspec/core/rake_task'
@@ -21,13 +22,13 @@ formal logic, producing a formal language that reads like plain
 English. ActiveFacts converts semantic models from CQL to relational
 and object models in SQL, Ruby and other languages.
 }
-  p.url = "http://dataconstellation.com/ActiveFacts/"
+  # p.url = "http://dataconstellation.com/ActiveFacts/"
   p.developer('Clifford Heath', 'cjh@dataconstellation.org')
   p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.post_install_message = 'For more information on ActiveFacts, see http://dataconstellation.com/ActiveFacts'
   p.rubyforge_name       = "cjheath@rubyforge.org"
   p.extra_deps         = [
-    ['activefacts-api','>= 0.8.10'],
+    ['activefacts-api','>= 0.8.12'],
     ['treetop','>= 1.4.1'],
     ['rake','>= 0.8.7'],
   ]

data/bin/afgen

@@ -8,20 +8,10 @@ $:.unshift File.dirname(File.expand_path(__FILE__))+"/../lib"
 
 require 'rubygems'
 
-# Load the ruby debugger before everything else, if requested
-if d = ENV['DEBUG'] and d.split(/,/).include?('debug')
-  begin
-    require 'ruby-debug'
-    Debugger.start(:post_mortem => true)        # Stop when an exception is thrown, but before it's rescued
-  rescue LoadError
-    # Ok, no debugger, tough luck.
-  end
-end
-
 require 'activefacts'
 require 'activefacts/vocabulary'
 
-arg = ARGV.shift
+arg = ARGV.shift || "--help"
 
 # Load the required generator, or the default "text" generator:
 generator = "text"
@@ -33,29 +23,41 @@ if arg =~ /^--([^=]*)(?:=(.*))?/
 end
 
 output_handler = "activefacts/generate/#{generator.downcase}"
-require output_handler
+begin
+  require output_handler
+rescue LoadError
+  $stderr.puts "Could not find output generator #{generator}. Try --help"
+  exit 1
+end
 output_class = generator.upcase.gsub(%r{[/\\]+},'::')
 output_klass = eval("ActiveFacts::Generate::#{output_class}")
 raise "Expected #{output_handler} to define #{output_class}" unless output_klass
 
 # Load the file type input method
-arg, *options = *arg.split(/=/)
-extension = arg.sub(/\A.*\./,'').downcase
-input_handler = "activefacts/input/#{extension}"
-require input_handler
-
-input_class = extension.upcase
-input_klass = ActiveFacts::Input.const_get(input_class.to_sym)
-raise "Expected #{input_handler} to define #{input_class}" unless input_klass
+if arg
+  arg, *options = *arg.split(/=/)
+  extension = arg.sub(/\A.*\./,'').downcase
+  input_handler = "activefacts/input/#{extension}"
+  require input_handler
+
+  input_class = extension.upcase
+  input_klass = ActiveFacts::Input.const_get(input_class.to_sym)
+  raise "Expected #{input_handler} to define #{input_class}" unless input_klass
+end
 
 # Read the input file:
 begin
-  vocabulary = input_klass.readfile(arg, *options)
+  if input_klass
+    vocabulary = input_klass.readfile(arg, *options)
+  else
+    vocabulary = true
+  end
 
   # Generate the output:
   output_klass.new(vocabulary, *generator_options).generate if vocabulary
 rescue => e
-  puts "#{e.message}"
+  $stderr.puts "#{e.message}"
   # puts "\t#{e.backtrace*"\n\t"}"
-  puts "\t#{e.backtrace*"\n\t"}" if debug :exception
+  $stderr.puts "\t#{e.backtrace*"\n\t"}" if debug :exception
+  exit 1
 end

data/bin/cql

@@ -1,4 +1,5 @@
 #! /usr/bin/env ruby
+# encoding: UTF-8
 #
 #       ActiveFacts: Interactive CQL command-line. Incomplete; only parses CQL and shows the parse trees
 #
@@ -7,14 +8,14 @@
 require 'readline'
 
 # Load the ruby debugger before everything else, if requested
-if d = ENV['DEBUG'] and d.split(/,/).include?('debug')
-  begin
-    require 'ruby-debug'
-    Debugger.start(:post_mortem => true)        # Stop when an exception is thrown, but before it's rescued
-  rescue LoadError
-    # Ok, no debugger, tough luck.
-  end
-end
+#if d = ENV['DEBUG'] and d.split(/,/).include?('debug')
+#  begin
+#    require 'ruby-debug'
+#    Debugger.start(:post_mortem => true)        # Stop when an exception is thrown, but before it's rescued
+#  rescue LoadError
+#    # Ok, no debugger, tough luck.
+#  end
+#end
 
 require 'activefacts'
 require 'activefacts/cql/compiler'

data/css/orm2.css

@@ -1,3 +1,11 @@
+ul {
+  margin: 0px 0px 0px 2em;
+  -webkit-margin-before: 0px;
+  -webkit-margin-after: 0px;
+  -webkit-padding-start: 0px;
+  padding: 0px;
+}
+
 pre {
   background-color: #000;
   padding: 5px;
@@ -7,18 +15,30 @@ pre {
   border-color: #BBB;
 }
 
+span {
+  font-family: "Frutiger", sans-serif;
+}
+
 .keyword {
   Xcolor: #00F;
   color: #66F;
 }
-.concept {
+.term, .concept {
   Xcolor: #808;
   color: #E0E;
 }
-.copula {
+.vocabulary, .object_type {
+  Xcolor: #808;
+  color: #E0E;
+}
+.linking, .copula {
   Xcolor: #060;
   color: #0C0;
 }
-.value {
+.literal, .value {
   color: #FF990E;
 }
+
+dd {
+  margin-bottom: 0.5em;
+}

data/examples/CQL/CompanyDirectorEmployee.cql

@@ -49,4 +49,4 @@ Manager is ceo;
 /*
  * Constraints:
  */
-either Employee is supervised by Manager(2) or Employee is a Manager(1) that is ceo but not both;
+either Employee is supervised by Manager(1) or Employee is a Manager(2) that is ceo but not both;

data/examples/CQL/Diplomacy.cql

@@ -38,10 +38,10 @@ Representation is where
 for each Diplomat, Country at most one of these holds:
 	Diplomat serves in Country,
 	Diplomat represents Country;
-Diplomat is an Ambassador that is from Country(2) to Country(1)
-	only if Diplomat represents Country(2);
 Diplomat is an Ambassador that is from Country(1) to Country(2)
-	only if Diplomat serves in Country(2);
+	only if Diplomat represents Country(1);
+Diplomat is an Ambassador that is from Country(2) to Country(1)
+	only if Diplomat serves in Country(1);
 Diplomat serves in Country
 	only if Diplomat speaks Language that is spoken in Country;
 each Ambassador occurs at least one time in

data/examples/CQL/Insurance.cql

@@ -18,10 +18,10 @@ Cover Type Code is written as Char;
 Cover Type Name is written as String;
 Date is written as Date;
 Date Time is written as Date Time;
-Demerit Kind Name is written as String;
 Description is written as String(1024);
 Email is written as String;
 Engine Number is written as String;
+Hospital Name is written as String;
 ITC Claimed is written as Decimal(18,2) restricted to {0.0..100.0};
 Intoxication is written as String;
 Liability Code is written as Char(1) restricted to {'D', 'L', 'R', 'U'};
@@ -41,7 +41,6 @@ Policy Serial is written as Unsigned Integer(32) restricted to {1..99999};
 Policy Wording Text is written as String;
 Postcode is written as String;
 Price is written as Decimal(18,2);
-Prod Description is written as String(80);
 Product Code is written as Unsigned Integer(8) restricted to {1..99};
 Reason is written as String;
 Registration Nr is written as Char(8);
@@ -50,8 +49,10 @@ State Code is written as Unsigned Integer(8) restricted to {0..9};
 State Name is written as String(256);
 Street is written as String(256);
 Test Result is written as String;
+Text is written as String;
 Time is written as Time;
 Title is written as String;
+Underwriting Question ID is written as Auto Counter;
 VIN is written as Unsigned Integer(32);
 Year Nr is written as Signed Integer(32);
 
@@ -70,7 +71,7 @@ Cover Type is identified by its Code;
 Cover Type has one Cover Type Name,
 	Cover Type Name is of at most one Cover Type;
 
-Demerit Kind is independent identified by its Name;
+Hospital is identified by its Name;
 
 Incident is identified by Claim where
 	Claim concerns at most one Incident,
@@ -123,8 +124,8 @@ Policy Wording is identified by its Text;
 Product is identified by its Code;
 Alias is of at most one Product,
 	Product has at most one Alias;
-Prod Description is of at most one Product,
-	Product has at most one Prod Description;
+Description is of at most one Product,
+	Product has at most one Description;
 
 Registration is identified by its Nr;
 
@@ -132,6 +133,10 @@ State is independent identified by its Code;
 State Name is of at most one State,
 	State has at most one State Name;
 
+Underwriting Question is identified by its ID;
+Text is of at most one Underwriting Question,
+	Underwriting Question has one Text;
+
 Vehicle is a kind of Asset identified by VIN where
 	Vehicle has one VIN,
 	VIN is of at most one Vehicle;
@@ -177,8 +182,6 @@ Witness lives at at most one Address;
 
 Authorised Rep is a kind of Party;
 
-Client is a kind of Party;
-
 Company is a kind of Party;
 Company has one contact-Person,
 	Person is contact for Company;
@@ -205,17 +208,14 @@ Cover Wording is where
 Dealer is a kind of Party;
 Vehicle was sold by at most one Dealer;
 
-Driver is a kind of Person;
-
 Driving is where
-	Vehicle Incident involves one Driver,
-	Driver drove covered vehicle in at least one Vehicle Incident;
+	Vehicle Incident occurred while being driven;
 Driving followed at most one Intoxication;
-Driving resulted in at most one blood-Test Result;
 Driving resulted in at most one breath-Test Result;
-Driving (as driver_hospitalised) resulted in driver taken to at most one hospital-Name;
 Driving was without owners consent for at most one nonconsent-Reason;
 Driving was unlicenced for at most one unlicensed-Reason;
+Person was Driving,
+	Driving was by one Person;
 
 Driving Charge is where
 	Driving resulted in one Charge;
@@ -224,13 +224,19 @@ Driving Charge is a warning;
 Finance Institution is a kind of Company;
 Vehicle is subject to finance with at most one Finance Institution;
 
+Hospitalization is where
+	Driving resulted in driver taken to one Hospital;
+Hospitalization resulted in at most one blood-Test Result;
+
+Insured is a kind of Party;
+
 Insurer is a kind of Company;
 
 Investigator is a kind of Contractor;
 
-License is identified by Driver where
-	Driver holds at most one License,
-	License is held by one Driver;
+License is identified by Person where
+	Person holds at most one License,
+	License is held by one Person;
 License has one License Number,
 	License Number is of at most one License;
 License is of one License Type,
@@ -255,8 +261,8 @@ ITC Claimed is for Policy,
 	Policy has at most one ITC Claimed;
 Policy was sold by at most one Authorised Rep,
 	Authorised Rep sold Policy;
-Policy belongs to one Client,
-	Client has Policy;
+Policy belongs to one Insured,
+	Insured has Policy;
 
 Property Damage is identified by Incident and Address where
 	Incident caused Property Damage,
@@ -277,11 +283,11 @@ Third Party vehicle is of at most one Vehicle Type;
 Third Party vehicle is of at most one model-Year;
 Third Party drove at most one vehicle-Registration;
 
-Underwriting Demerit is identified by Vehicle Incident and Demerit Kind where
+Underwriting Demerit is identified by Vehicle Incident and Underwriting Question where
 	Vehicle Incident occurred despite Underwriting Demerit,
 	Underwriting Demerit preceded one Vehicle Incident,
-	Underwriting Demerit has one Demerit Kind,
-	Demerit Kind is of Underwriting Demerit;
+	Underwriting Demerit has one Underwriting Question,
+	Underwriting Question is of Underwriting Demerit;
 Underwriting Demerit occurred at most one occurrence-Count times;
 
 Assessor is a kind of Contractor;

data/examples/CQL/Metamodel.cql

@@ -154,11 +154,12 @@ Subset Constraint covers one superset-Role Sequence;
 Unit is identified by its Id;
 Ephemera URL provides Unit coefficient,
 	Unit uses coefficient from at most one Ephemera URL;
-Name is of Unit,
+Name is of at most one Unit,
 	Unit is called one Name;
 Unit has at most one Coefficient;
 Unit has at most one Offset;
-Unit has at most one plural-Name;
+Unit has at most one plural-Name,
+	plural-Name id of at most one Unit;
 Unit is fundamental;
 
 Value is identified by Literal and Value is a string and Unit where
@@ -333,7 +334,7 @@ Value Type has at most one Scale,
 Value Type is of at most one Unit;
 Value Type has at most one Value Constraint,
 	Value Constraint constrains at most one Value Type;
-Value Type has at most one auto- assigned Transaction Timing;
+Value Type has at most one auto-- assigned Transaction Timing;
 Value Type is subtype of at most one super-Value Type (as Supertype) [acyclic],
 	Supertype is supertype of Value Type;
 
@@ -343,6 +344,7 @@ Allowed Range is where
 Entity Type is a kind of Object Type;
 Entity Type nests at most one Fact Type,
 	Fact Type is nested as at most one Entity Type;
+Entity Type is implied by objectification;
 
 Facet is where
 	Value Type has facet called Name,
@@ -376,8 +378,8 @@ either Object Type is an Entity Type or Object Type is a Value Type but not both
 for each Role Sequence exactly one of these holds:
 	Role Sequence is for Reading,
 	Presence Constraint covers Role Sequence,
-	Subset Constraint(1) covers subset-Role Sequence,
-	Subset Constraint(2) covers superset-Role Sequence,
+	Subset Constraint (1) covers subset-Role Sequence,
+	Subset Constraint (2) covers superset-Role Sequence,
 	Role Sequence is Ordinal in Set Comparison Constraint;
 either Set Comparison Constraint is a Set Exclusion Constraint or Set Comparison Constraint is a Set Equality Constraint but not both;
 either Set Constraint is a Set Comparison Constraint or Set Constraint is a Subset Constraint but not both;
@@ -389,10 +391,10 @@ for each Instance at most one of these holds:
 	Instance has Value,
 	Instance objectifies Fact;
 for each Join Role at most one of these holds:
-	Join Step(1) has input-Join Role,
+	Join Step (1) has input-Join Role,
 	Join Role is incidentally involved in Join Step;
 for each Join Role at most one of these holds:
-	Join Step(1) has output-Join Role,
+	Join Step (1) has output-Join Role,
 	Join Role is incidentally involved in Join Step;
 Join Node is for Object Type that plays Role
 	if and only if
@@ -402,7 +404,9 @@ Role Value is of Instance that is of Object Type
 	Role Value is of Role that is played by Object Type;
 Role Value fulfils Fact that is of Fact Type
 	if and only if
-	Role Value is of Role (where Fact Type has Ordinal role);
+	Role Value is of Role (in which Fact Type has Ordinal role);
+Entity Type is implied by objectification
+	only if Entity Type nests Fact Type;
 Presence Constraint is preferred identifier
 	only if Presence Constraint has max Frequency;
 Value Type has Scale

data/examples/CQL/MetamodelNext.cql

@@ -5,7 +5,7 @@ vocabulary Metamodel;
  */
 Adjective is written as String(64);
 Agent Name is written as String;
-Assimilation is written as String restricted to {'partitioned', 'separate'};
+Assimilation is written as String restricted to {'absorbed', 'partitioned', 'separate'};
 Context Note Kind is written as String restricted to {'as_opposed_to', 'because', 'so_that', 'to_avoid'};
 Date is written as Date;
 Denominator is written as Unsigned Integer(32);
@@ -22,10 +22,11 @@ Literal is written as String;
 Name is written as String(64);
 Numerator is written as Decimal;
 Offset is written as Decimal;
-Ordinal is written as Unsigned Integer(16);
+Position is written as Unsigned Integer(16);
 Pronoun is written as String(20) restricted to {'feminine', 'masculine', 'neuter', 'personal'};
 Ring Type is written as String;
 Rotation Setting is written as String restricted to {'left', 'right'};
+SID is written as GUID;
 Scale is written as Unsigned Integer(32);
 Subscript is written as Unsigned Integer(16);
 Text is written as String(256);
@@ -39,22 +40,28 @@ Y is written as Signed Integer(32);
  */
 Agent is identified by its Name;
 
+Alternatives is identified by GUID where
+	Alternatives has one GUID,
+	GUID is of at most one Alternatives;
+Alternatives are exclusive;
+
 Coefficient is identified by Numerator and Denominator and Coefficient is precise where
 	Coefficient has one Numerator,
 	Coefficient has one Denominator,
 	Coefficient is precise;
 
-Concept is identified by GUID where
-	Concept has one GUID,
-	GUID is of at most one Concept;
+Concept is identified by SID where
+	Concept has one SID,
+	SID is of at most one Concept;
+Concept has at most one model-Name;
 
-Constraint is a kind of Concept;
+Constraint is a kind of Concept [separate];
 Name is of Constraint,
 	Constraint is called at most one Name;
 
-Context Note is identified by GUID where
-	Context Note has one GUID,
-	GUID is of at most one Context Note;
+Context Note is identified by SID where
+	Context Note has one SID,
+	SID is of at most one Context Note;
 Concept has Context Note,
 	Context Note applies to at most one Concept;
 Context Note has one Context Note Kind,
@@ -69,69 +76,54 @@ Enforcement notifies at most one Agent;
 Enforcement has one Enforcement Code,
 	Enforcement Code is of Enforcement;
 
-Fact is identified by GUID where
-	Fact has one GUID,
-	GUID is of at most one Fact;
+Fact is a kind of Concept [separate];
 
-Fact Type is a kind of Concept;
+Fact Type is a kind of Concept [separate];
 Fact is of one Fact Type;
 
 Implicit Fact Type is a kind of Fact Type;
 
-Instance is identified by GUID where
-	Instance has one GUID,
-	GUID is of at most one Instance;
+Instance is a kind of Concept;
 Instance objectifies at most one Fact,
 	Fact is objectified as at most one Instance;
 
-Join is identified by GUID where
-	Join has one GUID,
-	GUID is of at most one Join;
-
-Join Node is identified by Join and Ordinal where
-	Join includes Join Node,
-	Join Node is in one Join,
-	Join Node has one Ordinal position;
-Join Node has at most one Subscript,
-	Subscript is of Join Node;
-Join Node has at most one role-Name,
-	Name is of Join Node;
-
 Language is identified by its Code;
 
-Object Type is a kind of Concept;
-Instance is of one Object Type;
-Join Node is for one Object Type,
-	Object Type is referenced in Join Node;
-Object Type uses at most one Pronoun;
-Object Type is independent;
+Location is identified by X and Y where
+	Location is at one X,
+	Location is at one Y;
 
-Position is identified by X and Y where
-	Position is at one X,
-	Position is at one Y;
+ObjectType is a kind of Concept;
+Instance is of one ObjectType;
+ObjectType is independent;
 
-Presence Constraint is a kind of Constraint;
+Presence Constraint is a kind of Constraint [partitioned];
 Presence Constraint has at most one max-Frequency restricted to {1..};
 Presence Constraint has at most one min-Frequency restricted to {2..};
 Presence Constraint is mandatory;
 Presence Constraint is preferred identifier;
 
-Reading is identified by Fact Type and Ordinal where
+Query is independent identified by GUID where
+	Query has one GUID,
+	GUID is of at most one Query;
+
+Reading is identified by Fact Type and Position where
 	Fact Type has Reading,
 	Reading is for one Fact Type,
-	Reading is in one Ordinal position,
-	Ordinal reading for fact type is Reading;
-Reading has one Text;
+	Reading is in one Position,
+	Position is of Reading;
+Reading has one leading-Text;
 
-Ring Constraint is a kind of Constraint;
+Ring Constraint is a kind of Constraint [partitioned];
 Ring Constraint is of one Ring Type;
 
-Role is a kind of Concept where
-	Fact Type has at least one Ordinal role;
+Role is a kind of Concept identified by Fact Type and Position [separate] where
+	Fact Type includes role of at least one ObjectType,
+	ObjectType plays role in Fact Type,
+	Role is in at most one Position,
+	Position is occupied by at least one Role;
 Implicit Fact Type is implied by one Role (as Implying Role),
 	Implying Role implies at most one Implicit Fact Type;
-Object Type plays Role,
-	Role is played by one Object Type;
 Ring Constraint has at most one other-Role,
 	other-Role is of Ring Constraint;
 Role is of Ring Constraint;  // Avoid ambiguity; this is a new fact type
@@ -142,23 +134,21 @@ Role Sequence is identified by GUID where
 	Role Sequence has one GUID,
 	GUID is of at most one Role Sequence;
 Presence Constraint covers one Role Sequence;
-Reading is in one Role Sequence,
-	Role Sequence is for Reading;
 Role Sequence has unused dependency to force table in norma;
 
 Role Value is identified by Instance and Fact where
 	Instance plays Role Value,
 	Role Value is of one Instance,
 	Role Value fulfils one Fact,
-	Fact includes at least one Role Value;
+	Fact includes Role Value;
 Role Value is of one Role;
 
-Set Constraint is a kind of Constraint;
+Set Constraint is a kind of Constraint [partitioned];
 
-Shape is identified by GUID where
-	Shape has one GUID,
-	GUID is of at most one Shape;
-Shape is at at most one Position;
+Shape is identified by SID where
+	Shape has one SID,
+	SID is of at most one Shape;
+Shape is at at most one Location;
 Shape is expanded;
 
 Subset Constraint is a kind of Set Constraint;
@@ -187,27 +177,30 @@ Value is identified by Literal and Value is a string and Unit where
 	Unit is of Value;
 Instance has at most one Value,
 	Value is of Instance;
-Join Node has at most one Value;
 
-Value Constraint is a kind of Constraint;
+Value Constraint is a kind of Constraint [partitioned];
 Role has at most one role-Value Constraint,
 	Value Constraint applies to at most one Role;
 
-Value Type is a kind of Object Type;
-Value Type has at most one Length,
-	Length is of Value Type;
-Value Type has at most one Scale,
-	Scale is of Value Type;
-Value Type is of at most one Unit;
-Value Type has at most one Value Constraint,
-	Value Constraint constrains at most one Value Type;
-Value Type has at most one auto- assigned Transaction Timing;
-Value Type is subtype of at most one super-Value Type (as Supertype) [acyclic],
-	Supertype is supertype of Value Type;
-
-Vocabulary is where
-	Topic is described in Language,
-	Language describes Topic;
+Variable is identified by Query and Position where
+	Query includes Variable,
+	Variable is in one Query,
+	Variable occupies one Position,
+	Position is occupied by Variable;
+Variable references one ObjectType,
+	ObjectType is referenced in Variable;
+Variable projects at most one Role;
+Variable has at most one Subscript,
+	Subscript is of Variable;
+Variable is bound to at most one Value;
+Variable has at most one role-Name,
+	Name is of Variable;
+
+Vocabulary is identified by Topic and Language where
+	Topic is described in Vocabulary,
+	Vocabulary describes one Topic,
+	Language provides Vocabulary,
+	Vocabulary uses at most one Language;
 Reading is for at most one Vocabulary,
 	Vocabulary contains Reading;
 Vocabulary contains Constraint,
@@ -238,6 +231,8 @@ Context Agreed By is where
 	Agreement was reached by Agent,
 	Agent agreed on Agreement;
 
+Data Type is a kind of ObjectType;
+
 Derivation is where
 	Unit (as Derived Unit) is derived from base-Unit (as Base Unit) [acyclic, intransitive];
 Derivation has at most one Exponent;
@@ -250,18 +245,13 @@ Diagram is identified by Vocabulary and Name where
 Shape is in one Diagram,
 	Diagram includes Shape;
 
-Entity Type is a kind of Object Type;
+Domain Object Type is a kind of ObjectType;
+Domain Object Type uses at most one Pronoun;
+
+Entity Type is a kind of Domain Object Type;
 Entity Type objectifies at most one Fact Type,
 	Fact Type is objectified as at most one Entity Type;
-
-Facet is where
-	Value Type has facet called Name,
-	Name is a facet of Value Type;
-Facet has values of at most one Value Type;
-
-Facet Value is where
-	Value Type defines Facet as having one Value,
-	Value for Facet applies to Value Type;
+Entity Type results from implicit objectification;
 
 Fact Type Shape is a kind of Shape;
 Fact Type Shape has at most one Display Role Names Setting;
@@ -269,28 +259,12 @@ Fact Type Shape is for one Fact Type,
 	Fact Type has Fact Type Shape;
 Fact Type Shape has at most one Rotation Setting;
 
-Implicit Boolean Value Type is a kind of Value Type;
-
-Join Role is independent where
-	Join Node includes at least one Role,
-	Role connects to Join Node;
-
-Join Step is identified by input-Join Role and output-Join Role where
-	Join Step has one input-Join Role,
-	Join Step has one output-Join Role;
-Join Step traverses one Fact Type,
-	Fact Type directs Join Step;
-Join Step involves incidental-Join Role,
-	Join Role is incidentally involved in at most one Join Step;
-is anti Join Step;
-Join Step is outer;
-
 Model Note Shape is a kind of Shape;
 Model Note Shape is for one Context Note;
 
 Object Type Shape is a kind of Shape;
-Object Type Shape is for one Object Type,
-	Object Type has Object Type Shape;
+Object Type Shape is for one Domain Object Type,
+	Domain Object Type has Object Type Shape;
 Object Type Shape has expanded reference mode;
 
 Objectified Fact Type Name Shape is a kind of Shape identified by Fact Type Shape where
@@ -309,6 +283,12 @@ Population includes Instance,
 Population includes Role Value,
 	Role Value belongs to one Population;
 
+ReadingRole is where
+	Role has Position in Reading;
+ReadingRole has at most one following-Text;
+ReadingRole has at most one leading-Adjective;
+ReadingRole has at most one trailing-Adjective;
+
 Reading Shape is a kind of Shape identified by Fact Type Shape where
 	Fact Type Shape has at most one Reading Shape,
 	Reading Shape is for one Fact Type Shape;
@@ -319,39 +299,52 @@ Ring Constraint Shape is a kind of Constraint Shape;
 Ring Constraint Shape is attached to one Fact Type;
 
 Role Display is where
-	Fact Type Shape displays Role in Ordinal position,
-	Fact Type Shape displays in Ordinal position one Role;
+	Fact Type Shape displays Role in Position,
+	Fact Type Shape fills Position with one Role;
 
 Role Name Shape is a kind of Shape;
 Role Name Shape is for one Role Display,
 	Role Display has at most one Role Name Shape;
 
 Role Ref is where
-	Role Sequence in Ordinal position includes one Role,
-	Role is in Role Sequence in one Ordinal place,
-	Role Sequence includes Role in Ordinal place,
-	Role has Ordinal place in Role Sequence;
-Join Role projects at most one Role Ref;
-Role Ref has at most one leading-Adjective;
-Role Ref has at most one trailing-Adjective;
+	Role Sequence fills Position with one Role,
+	Role Sequence places Role in one Position,
+	Role occupies Position in Role Sequence;
 
 Set Comparison Constraint is a kind of Set Constraint;
 
 Set Comparison Roles is where
-	Set Comparison Constraint has in Ordinal position one Role Sequence,
-	Role Sequence is Ordinal in Set Comparison Constraint,
-	in Ordinal position Set Comparison Constraint has Role Sequence,
-	Set Comparison Constraint has Role Sequence in one Ordinal position;
+	Set Comparison Constraint fills Position with one Role Sequence,
+	Role Sequence occupies Position in Set Comparison Constraint,
+	Position in Set Comparison Constraint is occupied by Role Sequence,
+	Set Comparison Constraint places Role Sequence in one Position;
 
 Set Equality Constraint is a kind of Set Comparison Constraint;
 
 Set Exclusion Constraint is a kind of Set Comparison Constraint;
 Set Exclusion Constraint is mandatory;
 
+Span is independent where
+	Variable allows players of at least one Role,
+	Role populates Variable;
+
+Step is identified by input-Span and output-Span where
+	Step has one input-Span,
+	Step has one output-Span;
+Alternatives include at least one Step,
+	Step has at most one Alternatives;
+Step traverses one Fact Type,
+	Fact Type directs Step;
+Step involves incidental-Span,
+	Span is incidentally involved in at most one Step;
+Step is disallowed;
+Step is optional;
+
 Term is where
-	Vocabulary uses Name for one Object Type,
-	Vocabulary refers to Object Type as Name,
-	Name applies to Object Type in Vocabulary;
+	Vocabulary uses Name,
+	Name applies in Vocabulary;
+Term applies to at most one Domain Object Type;
+Term applies to at most one Instance;
 Term (as Role Name) is name of Role,
 	Role has at most one Role Name;
 Term is preferred;
@@ -375,28 +368,54 @@ Value Range is identified by minimum-Bound and maximum-Bound where
 	Value Range has at most one minimum-Bound,
 	Value Range has at most one maximum-Bound;
 
+Value Type is a kind of Domain Object Type;
+Value Type maps to at most one Data Type;
+Value Type has at most one Length,
+	Length is of Value Type;
+Value Type has at most one Scale,
+	Scale is of Value Type;
+Value Type is of at most one Unit;
+Value Type has at most one Value Constraint,
+	Value Constraint constrains at most one Value Type;
+Value Type is at most one auto-- assigned at Transaction Timing;
+Value Type is subtype of at most one super-Value Type (as Supertype) [acyclic, intransitive],
+	Supertype is supertype of Value Type;
+
 Allowed Range is where
 	Value Constraint allows at least one Value Range;
 
+Facet is where
+	Value Type has facet called Name,
+	Name is a facet of Value Type;
+Facet has values of at most one facet-Value Type;
+
+Facet Value is where
+	Value Type defines Facet as having one Value,
+	Value for Facet applies to Value Type;
+
+Implicit Boolean Value Type is a kind of Value Type;
+
 /*
  * Constraints:
  */
 for each Concept exactly one of these holds:
-	Concept is an Object Type,
 	Concept is a Fact Type,
 	Concept is a Constraint,
-	Concept is a Role;
+	Concept is a Role,
+	Concept is a Fact,
+	Concept is an Instance,
+	Concept is an ObjectType;
 for each Constraint exactly one of these holds:
 	Constraint is a Presence Constraint,
 	Constraint is a Set Constraint,
-	Constraint is a Ring Constraint;
-either Object Type is an Entity Type or Object Type is a Value Type but not both;
+	Constraint is a Ring Constraint,
+	Constraint is a Value Constraint;
+either Domain Object Type is an Entity Type or Domain Object Type is a Value Type but not both;
 for each Role Sequence exactly one of these holds:
-	Role Sequence is for Reading,
 	Presence Constraint covers Role Sequence,
-	Subset Constraint(1) covers subset-Role Sequence,
-	Subset Constraint(2) covers superset-Role Sequence,
-	Role Sequence is Ordinal in Set Comparison Constraint;
+	Subset Constraint (1) covers subset-Role Sequence,
+	Subset Constraint (2) covers superset-Role Sequence,
+	Role Sequence occupies Position in Set Comparison Constraint;
 either Set Comparison Constraint is a Set Exclusion Constraint or Set Comparison Constraint is a Set Equality Constraint but not both;
 either Set Constraint is a Set Comparison Constraint or Set Constraint is a Subset Constraint but not both;
 either Unit uses coefficient from Ephemera URL or Unit has Coefficient but not both;
@@ -406,29 +425,25 @@ either Value Constraint constrains Value Type or Value Constraint applies to Rol
 for each Instance at most one of these holds:
 	Instance has Value,
 	Instance objectifies Fact;
-for each Join Role at most one of these holds:
-	Join Step(1) has input-Join Role,
-	Join Role is incidentally involved in Join Step;
-for each Join Role at most one of these holds:
-	Join Step(1) has output-Join Role,
-	Join Role is incidentally involved in Join Step;
-Join Node is for Object Type that plays Role
-	if and only if
-	Join Node includes Role;
-Role Value is of Instance that is of Object Type
-	if and only if
-	Role Value is of Role that is played by Object Type;
-Role Value fulfils Fact that is of Fact Type
-	if and only if
-	Role Value is of Role (where Fact Type has Ordinal role);
+for each Span at most one of these holds:
+	Step (1) has input-Span,
+	Span is incidentally involved in Step;
+for each Span at most one of these holds:
+	Step (1) has output-Span,
+	Span is incidentally involved in Step;
+for each Term at most one of these holds:
+	Term applies to Domain Object Type,
+	Term is name of Role;
+Entity Type results from implicit objectification
+	only if Entity Type objectifies Fact Type;
 Presence Constraint is preferred identifier
 	only if Presence Constraint has max Frequency;
 Value Type has Scale
 	only if Value Type has Length;
 either Agreement was reached by Agent or Agreement was on Date;
-each combination Diagram, Position occurs at most one time in
+each combination Diagram, Location occurs at most one time in
 	Shape is in Diagram,
-	Shape is at Position;
+	Shape is at Location;
 each combination Entity Type(1), Type Inheritance occurs at most one time in
 	Entity Type(1) is subtype of super Entity Type(2),
 	Type Inheritance provides identification;
@@ -436,19 +451,27 @@ each Presence Constraint occurs at least one time in
 	Presence Constraint has min Frequency(2),
 	Presence Constraint has max Frequency(1),
 	Presence Constraint is mandatory;
-each Role Ref occurs at most one time in
-	Join Role projects Role Ref;
+each combination Reading, Position occurs one time in
+	Role has Position in Reading;
+each combination Reading, Role occurs one time in
+	Role has Position in Reading;
 each Role Sequence occurs at least one time in
-	Role Sequence in Ordinal position includes Role;
+	Role Sequence fills Position with Role;
+each Role occurs at most one time in
+	Variable projects Role;
 each Set Comparison Constraint occurs at least 2 times in
-	Set Comparison Constraint has in Ordinal position Role Sequence;
+	Set Comparison Constraint fills Position with Role Sequence;
 either Value Range has minimum Bound(2) or Value Range has maximum Bound(1);
+either Value Type(1) maps to Data Type or Value Type(1) is subtype of super Value Type(2);
 each combination Vocabulary, Name occurs at most one time in
 	Constraint belongs to Vocabulary,
 	Constraint is called Name;
 each combination Vocabulary, Name occurs at most one time in
 	Unit is in Vocabulary,
 	Unit is called Name;
-each combination Vocabulary, Object Type, Term occurs at most one time in
-	Vocabulary uses Name for Object Type,
-	Term is preferred;
+/*
+each combination Vocabulary, Term, Domain Object Type occurs at most one time in
+	Vocabulary uses Name,
+	Term is preferred,
+	Term applies to Domain Object Type;
+*/