From deaf11dbfe625a1fea11a9d1df12bd4aae288236 Mon Sep 17 00:00:00 2001 From: David Carlisle Date: Thu, 12 Oct 2017 20:03:14 +0100 Subject: [PATCH] sync with CDs repo, including white space cleanup cf issue #24 --- arith1.ocd | 34 ++++----- arith1.sts | 5 +- error.ocd | 12 ++-- mathml.cdg | 192 +++++++++++++++++++++++++++++-------------------- meta.ocd | 50 +++++++------ support/getcds | 4 ++ 6 files changed, 170 insertions(+), 127 deletions(-) create mode 100755 support/getcds diff --git a/arith1.ocd b/arith1.ocd index 5761692..80e71c0 100644 --- a/arith1.ocd +++ b/arith1.ocd @@ -33,14 +33,14 @@ society at http://www.openmath.org. - arith1 +arith1 http://www.openmath.org/cd - http://www.openmath.org/cd/arith1.ocd -2017-12-31 - official +http://www.openmath.org/cd/arith1.ocd +2006-03-30 +official 2004-03-30 3 -2 +1 Author: OpenMath Consortium SourceURL: https://github.com/OpenMath/CDs @@ -51,7 +51,7 @@ This CD defines symbols for common arithmetic functions. - lcm +lcm application The symbol to represent the n-ary function to return the least common @@ -157,7 +157,7 @@ Integer and lcm(a,b) > c. - gcd +gcd application The symbol to represent the n-ary function to return the gcd (greatest @@ -256,7 +256,7 @@ gcd(6,9) = 3 - plus +plus application The symbol representing an n-ary commutative function plus. @@ -289,7 +289,7 @@ The symbol representing an n-ary commutative function plus. - unary_minus +unary_minus application This symbol denotes unary minus, i.e. the additive inverse. @@ -320,7 +320,7 @@ This symbol denotes unary minus, i.e. the additive inverse. - minus +minus application The symbol representing a binary minus function. This is equivalent to @@ -357,7 +357,7 @@ adding the additive inverse. - times +times application The symbol representing an n-ary multiplication function. @@ -495,7 +495,7 @@ The symbol representing an n-ary multiplication function. - divide +divide application This symbol represents a (binary) division function denoting the first argument @@ -533,7 +533,7 @@ inverse of the multiplication function defined by the symbol times in this CD. - power +power application This symbol represents a power function. The first argument is raised @@ -689,7 +689,7 @@ x\in C implies x^a = exp(a ln x) - abs +abs application A unary operator which represents the absolute value of its @@ -733,7 +733,7 @@ In the complex case this is often referred to as the modulus. - root +root application A binary operator which represents its first argument "lowered" to its @@ -813,7 +813,7 @@ CMP is not valid in general. - sum +sum application An operator taking two arguments, the first being the range of summation, @@ -848,7 +848,7 @@ summed. Note that the sum may be over an infinite interval. - product +product application An operator taking two arguments, the first being the range of multiplication diff --git a/arith1.sts b/arith1.sts index eea6a42..a606dfc 100644 --- a/arith1.sts +++ b/arith1.sts @@ -1,5 +1,6 @@ - - official + +official Date: 1999-11-26 diff --git a/error.ocd b/error.ocd index 8f2e4ed..e203220 100644 --- a/error.ocd +++ b/error.ocd @@ -33,11 +33,11 @@ society at http://www.openmath.org. - error +error http://www.openmath.org/cd - http://www.openmath.org/cd/error.ocd +http://www.openmath.org/cd/error.ocd 2017-12-31 - official +official 2004-03-30 3 1 @@ -47,7 +47,7 @@ - unhandled_symbol +unhandled_symbol error This symbol represents the error which is raised when an application @@ -71,7 +71,7 @@ The application does not implement the Complex numbers: - unexpected_symbol +unexpected_symbol error This symbol represents the error which is raised when an application @@ -93,7 +93,7 @@ The application received a mistyped symbol - unsupported_CD +unsupported_CD error This symbol represents the error which is raised when an application diff --git a/mathml.cdg b/mathml.cdg index 5264c3a..ca8bba0 100644 --- a/mathml.cdg +++ b/mathml.cdg @@ -1,158 +1,192 @@ - + mathml - 2 - 1 + 2 + 1 http://www.openmath.org/cdgroups/mathml.cdg + MathML compatibility CD Group - Algebra + + Algebra alg1 http://www.openmath.org/cd/alg1.ocd - Arithmetic + + Arithmetic arith1 http://www.openmath.org/cd/arith1.ocd - - Constructor for Floating Point Numbers + + + Constructor for Floating Point Numbers bigfloat1 http://www.openmath.org/cd/bigfloat1.ocd - Calculus + + Calculus calculus1 http://www.openmath.org/cd/calculus1.ocd - - Operations on and constructors for complex numbers + + + Operations on and constructors for complex numbers complex1 http://www.openmath.org/cd/complex1.ocd - Functions on functions + + Functions on functions fns1 http://www.openmath.org/cd/fns1.ocd - Integer arithmetic + - integer1 - http://www.openmath.org/cd/integer1.ocd + Integer arithmetic + integer1 + http://www.openmath.org/cd/integer1.ocd - Intervals + - interval1 - http://www.openmath.org/cd/interval1.ocd + Intervals + interval1 + http://www.openmath.org/cd/interval1.ocd - Linear Algebra - vector & matrix constructors, those symbols which are independant of orientation, but in MathML + + Linear Algebra - vector & matrix constructors, those symbols which are independant of orientation, but in MathML linalg1 http://www.openmath.org/cd/linalg1.ocd - Linear Algebra - vector & matrix constructors, those symbols which are dependant of orientation, and in MathML + + Linear Algebra - vector & matrix constructors, those symbols which are dependant of orientation, and in MathML linalg2 http://www.openmath.org/cd/linalg2.ocd - Limits of unary functions + + Limits of unary functions limit1 http://www.openmath.org/cd/limit1.ocd - - List constructors - + + + + List constructors list1 http://www.openmath.org/cd/list1.ocd - - Basic logical operators - + + + + Basic logical operators logic1 http://www.openmath.org/cd/logic1.ocd - - MathML Numerical Types - + + + + MathML Numerical Types mathmltypes http://www.openmath.org/cd/mathmltypes.ocd - - MathML attributes - + + + + MathML attributes mathmlattr http://www.openmath.org/cd/mathmlattr.ocd - - MathML Keys - + + + + MathML Keys mathmlkeys http://www.openmath.org/cd/mathmlkeys.ocd - - Minima and maxima - + + + + Minima and maxima minmax1 http://www.openmath.org/cd/minmax1.ocd - - Multset-theoretic operators and constructors - + + + + Multset-theoretic operators and constructors multiset1 http://www.openmath.org/cd/multiset1.ocd - - Symbols for creating numbers, including some defined constants - (which can be seen as nullary constructors) - + + + + + Symbols for creating numbers, including some defined constants + (which can be seen as nullary constructors) + nums1 http://www.openmath.org/cd/nums1.ocd - - Symbols for creating piecewise definitions - + + + + Symbols for creating piecewise definitions piece1 http://www.openmath.org/cd/piece1.ocd - - The basic quantifiers forall and exists. - + + + + The basic quantifiers forall and exists. quant1 http://www.openmath.org/cd/quant1.ocd - - Common arithmetic relations - + + + + Common arithmetic relations relation1 http://www.openmath.org/cd/relation1.ocd - - Number sets - + + + + Number sets setname1 http://www.openmath.org/cd/setname1.ocd - - Rounding - + + + + Rounding rounding1 http://www.openmath.org/cd/rounding1.ocd - - Set-theoretic operators and constructors - + + + + Set-theoretic operators and constructors set1 http://www.openmath.org/cd/set1.ocd - - Basic data orientated statistical operators - + + + + Basic data orientated statistical operators s_data1 http://www.openmath.org/cd/s_data1.ocd - - Basic random variable orientated statistical operators - + + + + Basic random variable orientated statistical operators s_dist1 http://www.openmath.org/cd/s_dist1.ocd - - Basic transcendental functions - + + + + Basic transcendental functions transc1 http://www.openmath.org/cd/transc1.ocd - - Vector calculus functions - + + + + Vector calculus functions veccalc1 http://www.openmath.org/cd/veccalc1.ocd - - Alternative encoding symbols for compatibility with the MathML - Semantic mapping constructs. - + + + + + Alternative encoding symbols for compatibility with the MathML Semantic mapping constructs. + altenc http://www.openmath.org/cd/altenc.ocd diff --git a/meta.ocd b/meta.ocd index 1c0adf1..c462c23 100644 --- a/meta.ocd +++ b/meta.ocd @@ -34,13 +34,17 @@ - meta -2006-03-30 +meta +2017-12-31 2004-03-30 3 -0 - official - http://www.openmath.org/cd/meta.ocd +1 + + Author: OpenMath Consortium + SourceURL: https://github.com/OpenMath/CDs + +official +http://www.openmath.org/cd/meta.ocd http://www.openmath.org/cd @@ -53,7 +57,7 @@ draft of the "OpenMath Standard". - CD +CD application The top level element for the Content Dictionary. It just acts @@ -63,7 +67,7 @@ as a container for the elements described below. - CDDefinition +CDDefinition application This symbol is used to represent the element which contains the @@ -74,7 +78,7 @@ an arbitrary number of 'Example', 'FMP' or 'CMP' elements. - CDName +CDName application An element which contains the string corresponding to the name of the CD. @@ -85,7 +89,7 @@ end of the string will be ignored. - CDURL +CDURL application An optional element. @@ -95,7 +99,7 @@ canonical reference copy of this CD is stored. - CDBase +CDBase application An optional element. @@ -106,7 +110,7 @@ for symbols in the CD. - Example +Example application An element which contains an arbitrary number of children, @@ -118,7 +122,7 @@ enclosing symbol definition. - CDDate +CDDate application An element which contains a date as a string in the ISO-8601 @@ -128,7 +132,7 @@ was last edited. - CDVersion +CDVersion application An element which contains a version number for the CD. @@ -139,7 +143,7 @@ should result in an increase in the version number. - CDRevision +CDRevision application An element which contains a revision number (or minor version number) @@ -151,7 +155,7 @@ to a CD requiring a new revision number. - CDReviewDate +CDReviewDate application An element which contains a date as a string in the ISO-8601 @@ -162,7 +166,7 @@ until at least this date. - CDStatus +CDStatus application An element giving information on the status of the CD. @@ -179,7 +183,7 @@ obsolete (an obsolete CD kept only for archival purposes). - CDComment +CDComment application This symbol is used to represent the element of a content dictionary which @@ -191,7 +195,7 @@ argument which makes that explanation. - CDUses +CDUses application An element which contains zero or more CDNames which correspond @@ -201,7 +205,7 @@ the CD is dependent on any other CDs they may be present here. - Description +Description application An element which contains a string corresponding to the @@ -211,7 +215,7 @@ description of either the CD or the symbol - Name +Name application An element containing the string corresponding to the name of @@ -222,7 +226,7 @@ space occurring at the begining or end of the string will be ignored. - Role +Role application An element containing the string corresponding to the role of @@ -231,7 +235,7 @@ the symbol being defined. - CMP +CMP application An optional element (which may be repeated many times) which contains @@ -241,7 +245,7 @@ defined. - FMP +FMP application An optional element which contains an OpenMath Object. diff --git a/support/getcds b/support/getcds new file mode 100755 index 0000000..93e7e83 --- /dev/null +++ b/support/getcds @@ -0,0 +1,4 @@ +cp ../CDs/cd/Official/{arith1,error,meta}.ocd . +cp ../CDs/sts/arith1.sts . +cp ../CDs/cdgroups/mathml.cdg . +