Merge remote-tracking branch 'origin/update-doc-from-228' into 1.0.0-…

…beta5

.github/emmocheck_conf.yml

@@ -1,12 +1,7 @@
 # Configurations used when running emmocheck from the ci_emmocheck workflow
-test_class_label:
+test_namespace:
   exceptions:
-    - 3DPrinting
-
-test_number_of_labels:
-  exceptions:
-    - foaf.logo
-
+    - manufacturing.EngineeredMaterial
 test_quantity_dimension:
   exceptions:
     - emmo.ModelledQuantitativeProperty
@@ -45,9 +40,3 @@ test_unit_dimension:
     - emmo.SIBaseUnit
     - emmo.SIUnitSymbol
     - emmo.SIUnit
-
-enable:
-  - test_physical_quantity_dimension
-
-skip:
-  - test_quantity_dimension

.github/pages-index.html.in

@@ -18,28 +18,27 @@
 
 <div class="header">
   <img src="https://avatars1.githubusercontent.com/u/51194521?s=400&u=d9e0bbceb9a6e4901077e92b2426c8bca46b1009&v=4" class="logo" width="64" alt="EMMO">
-  <h1 class="logo">The Elementary Multiperspective Material Ontology (EMMO)</h1>
-  <img src="emmc.png" class="emmclogo" width="64" alt="EMMC">
+  <h1 class="logo">Elementary Multiperspective Material Ontology (EMMO)</h1>
+  <img src="https://raw.githubusercontent.com/emmo-repo/emmo-repo.github.io/master/emmc.png" class="emmclogo" width="64" alt="EMMC">
 </div>
 The Elementary Multiperspective Material Ontology (EMMO) is the result of a multidisciplinary effort within the EMMC, aimed at the development of a standard representational ontology framework based on current materials modelling and characterization knowledge. Instead of starting from general upper level concepts, as done by other ontologies, the EMMO development started from the very bottom level, using the actual picture of the physical world coming from applied sciences, and in particular from physics and material sciences.
 <p>
 The EMMO has grown from the bottom (i.e. scientific application field) to the top (i.e. conceptualization), staying focused on the original scope while at the same time maintaining an approach as general as possible. The ontological framework has been built around concepts like elementary particles, wave-particle dualism, finiteness of space and time intervals coming from the perspective for experimental physics. The development of the middle and upper layers of the ontology has been functional to the respect of these low level concepts, to facilitate the understanding of the high level concepts to users with limited or no philosophical background.
 
 <h2>Links</h2>
 <ul>
-  <li><a href="https://emmc.info/emmo-info/">EMMC site</a></li>
+  <li><a href="https://emmc.info/emmo-info/">EMMO on old EMMC site</a></li>
   <li><a href="https://github.com/emmo-repo/EMMO">GitHub repository</a></li>
-  <li><a href="https://github.com/emmo-repo/EMMO-python">Python API</a></li>
+  <li><a href="https://github.com/emmo-repo/EMMOntoPy">Python API</a></li>
 </ul>
 
 <h2>Releases</h2>
 <table class"reltable">
   <tr>
     <th></th>
     <th></th>
-    <th colspan="2">Compacted ontology<sup><a href="#fn1" id="ref1">1</a></sup></th>
-    <th colspan="2">Inferred ontology<sup><a href="#fn2" id="ref2">2</a></sup></th>
-    <th colspan="2">Renamed ontology<sup><a href="#fn3" id="ref3">3</a></sup></th>
+    <th colspan="2">Compacted<sup><a href="#fn1" id="ref1">1</a></sup> ontology</th>
+    <th colspan="2">Inferred ontology (compacted<sup><a href="#fn1">1</a></sup>)</th>
     <th colspan="2">Documentation</th>
   </tr>
   <tr>
@@ -49,31 +48,17 @@ The EMMO has grown from the bottom (i.e. scientific application field) to the to
     <th>turtle</th>
     <th>rdf/xml</th>
     <th>turtle</th>
-    <th>rdf/xml</th>
-    <th>turtle</th>
     <th>html</th>
     <th>pdf</th>
   </tr>
 ${versions}
 </table>
 
-
-<p><small>
-<br>
-  <sup id="fn1"><a href="#ref1" title="Jump back to footnote 1.">1.</a></sup>
-  In the <b>compacted ontology</b>, all modules has been squashed together into a single file
-  with no imports.  <code>rdfs:isDefinedBy</code> annotations referring to the original module IRI
-  have been added.
-<br>
-  <sup id="fn2"><a href="#ref2" title="Jump back to footnote 2.">2.</a></sup>
-  <b>Inferred ontologies</b> are reasoned and compacted.
-<br>
-  <sup id="fn3"><a href="#ref3" title="Jump back to footnote 3.">3.</a></sup>
-  In a <b>renamed ontology</b> has the numerical ID part of the IRIs been
-  replaced with human readable prefLabel's.
-  The original IRI is available via a <code>skos:exactMatch</code> annotation.
-  The renamed ontologies are also compacted and inferred.
-</small></p>
+<sup id="fn1"><a href="#ref1" title="Jump back to footnote 1.">1</a>.
+  With "compacted ontology", we here mean that all
+  the top and middle level modules are joint together into a single
+  file with no imports.
+</sup>
 
 </body>
 </html>

.github/workflows/ci_emmocheck.yml

@@ -25,4 +25,4 @@ jobs:
 
     - name: Check EMMO
       run: |
-        emmocheck --local --url-from-catalog --verbose --check-imported --configfile=.github/emmocheck_conf.yml emmo.ttl --skip test_namespace --skip test_quantity_dimension
+        emmocheck --local --url-from-catalog --verbose --check-imported --configfile=.github/emmocheck_conf.yml --skip=test_namespace --skip test_unit_dimension emmo.ttl