feat: add calconnect version, clean up to latest standards, fix issues

CalConnect · Dec 8, 2024 · 427b69e · 427b69e
1 parent 2848e24
commit 427b69e
Show file tree

Hide file tree

Showing 12 changed files with 180 additions and 117 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml
@@ -0,0 +1,46 @@
+name: generate
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: metanorma/metanorma:latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Cache Metanorma assets
+        uses: actions-mn/cache@v1
+
+      - name: Metanorma generate site
+        uses: actions-mn/build-and-publish@main
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          agree-to-terms: true
+
+  deploy:
+    if: ${{ github.ref == 'refs/heads/main' }}
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,5 @@
 .DS_Store
 .swp
 .tmp.xml
-
-# Output files
-csd-*.html
-csd-*.doc
-csd-*.xml
-csd-*_files
-
-# Deploy key
-deploy_key
+*.err
+*.abort
diff --git a/metanorma.yml b/metanorma.yml
@@ -1,8 +1,10 @@
 ---
 metanorma:
-  deploy:
-    email: "[email protected]"
-relaton:
+  source:
+    files:
+      - sources/cc-51004.adoc
+      - sources/draft-ietf-calext-ical-relations.adoc
+
   collection:
-    name: TC-CALENDAR
+    name: Calendaring and scheduling -- Support for iCalendar Relationships
     organization: CalConnect
diff --git a/sources/cc-51004.adoc b/sources/cc-51004.adoc
@@ -13,36 +13,42 @@
 :published-date: 2018-11-30
 :script: Latn
 :technical-committee: CALENDAR
-:draft:
-:toc:
-:stem:
-:xrefstyle: short
 :imagesdir: images
-:docfile: cc-51004.adoc
-:mn-document-class: csd
+:mn-document-class: cc
 :mn-output-extensions: xml,html,pdf
 :local-cache-only:
 :data-uri-image:
 
-:sectnums!:
-
 include::sections/00-abstract.adoc[]
+
 include::sections/00-foreword.adoc[]
-include::sections/00-intro.adoc[]
 
-:sectnums:
+include::sections/00-intro.adoc[]
 
 include::sections/01-scope.adoc[]
+
 include::sections/02-normrefs.adoc[]
+
 include::sections/03-terms.adoc[]
+
 include::sections/04-referencetypes.adoc[]
+
 include::sections/05-linkrelationtypes.adoc[]
+
 include::sections/06-redefinedrelationtypevalue.adoc[]
+
 include::sections/07-newpropertyvalues.adoc[]
+
 include::sections/08-newvaluedatatypes.adoc[]
+
 include::sections/09-newproperties.adoc[]
+
 include::sections/10-redefinedrelatedto.adoc[]
+
 include::sections/11-security.adoc[]
+
 include::sections/12-iana.adoc[]
+
 include::sections/13-acknowledgements.adoc[]
+
 include::sections/99-bibliography.adoc[]
diff --git a/sources/draft-ietf-calext-ical-relations.adoc b/sources/draft-ietf-calext-ical-relations.adoc
@@ -0,0 +1,64 @@
+= CalConnect Standard: Calendaring and scheduling -- Support for iCalendar Relationships
+:doctype: internet-draft
+:docnumber: draft-ietf-calext-ical-relations-05
+:status: standard
+:ipr: trust200902
+:consensus: true
+:updates: RFC5545
+:submission-type: IETF
+:area: Internet
+:intended-series: full-standard
+:revdate: 2018-11-30
+:fullname: Michael Douglass
+:lastname: Douglass
+:forename_initials: M.
+:affiliation: Bedework Commercial Services
+:street: 226 3rd Street
+:city: Troy
+:state: NY
+:code: 12180
+:country: United States of America
+:contibutor-uri: https://bcs.com/
+:email: [email protected]
+:imagesdir: images
+:mn-document-class: ietf
+:mn-output-extensions: rfc,xml,txt,html
+:workgroup: calext
+:local-cache-only:
+:data-uri-image:
+
+include::sections/00-abstract.adoc[]
+
+include::sections/00-foreword.adoc[]
+
+include::sections/00-intro.adoc[]
+
+include::sections/01-scope.adoc[]
+
+include::sections-ietf/02-conventions.adoc[]
+
+// include::sections/02-normrefs.adoc[]
+
+include::sections/03-terms.adoc[]
+
+include::sections/04-referencetypes.adoc[]
+
+include::sections/05-linkrelationtypes.adoc[]
+
+include::sections/06-redefinedrelationtypevalue.adoc[]
+
+include::sections/07-newpropertyvalues.adoc[]
+
+include::sections/08-newvaluedatatypes.adoc[]
+
+include::sections/09-newproperties.adoc[]
+
+include::sections/10-redefinedrelatedto.adoc[]
+
+include::sections/11-security.adoc[]
+
+include::sections/12-iana.adoc[]
+
+include::sections/13-acknowledgements.adoc[]
+
+include::sections-ietf/98-references.adoc[]
diff --git a/sources/sections-ietf/02-conventions.adoc b/sources/sections-ietf/02-conventions.adoc
@@ -0,0 +1,8 @@
+[[conventions]]
+== Conventions Used in This Document
+
+The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+"SHOULD", "SHOULD NOT", "RECOMMENDED", "NOT RECOMMENDED", "MAY", and
+"OPTIONAL" in this document are to be interpreted as described in
+<<RFC2119>>.
+
diff --git a/sources/sections-ietf/98-references.adoc b/sources/sections-ietf/98-references.adoc
@@ -0,0 +1,28 @@
+
+[bibliography]
+== Normative References
+
+* [[[RFC5545,IETF RFC 5545]]]
+// Desruisseaux, B., Ed., "Internet Calendaring and Scheduling Core Object Specification (iCalendar)", RFC 5545, DOI 10.17487/RFC5545, September 2009, <http://www.rfc-editor.org/info/rfc5545>.
+
+* [[[RFC5988,IETF RFC 5988]]]
+//M. Nottingham. _Web Linking_. 2010. https://www.rfc-editor.org/info/rfc5988
+
+* [[[RFC6638,IETF RFC 6638]]]
+//Daboo, C. and B. Desruisseaux, "Scheduling Extensions to CalDAV", RFC 6638, DOI 10.17487/RFC6638, June 2012, <http://www.rfc-editor.org/info/rfc6638>.
+
+* [[[W3C.CR-skos-reference-20090317,W3C CR skos-reference]]], Sean Bechhofer, Alistair Miles. _SKOS Simple Knowledge Organization System Reference._ 2009. http://www.w3.org/TR/2009/CR-skos-reference-20090317
+
+* [[[W3C.WD-xptr-xpointer-20021219,W3C WD xptr-xpointer]]], Steven DeRose, Ron Daniel, Eve Maler. _XPointer xpointer() Scheme._ 2002. http://www.w3.org/TR/2002/WD-xptr-xpointer-20021219
+
+* [[[I-D.daboo-caldav-attachments,IETF I-D daboo-caldav-attachments]]]
+//Cyrus Daboo, Arnaud Quillaud. _CalDAV Managed Attachments._ 2014. http://www.ietf.org/internet-drafts/draft-daboo-caldav-attachments-03.txt
+
+
+[bibliography]
+== Informative References
+
+* [[[RFC2119,IETF RFC 2119]]]
+//M. Nottingham. _Web Linking_. 2010. https://www.rfc-editor.org/info/rfc2119
+
+* [[[RFC3986,IETF RFC 3986]]]
diff --git a/sources/sections/00-intro.adoc b/sources/sections/00-intro.adoc
@@ -118,12 +118,3 @@ pieces of data which should be downloaded in advance.
 
 In general, the calendar entity should be self explanatory without
 the need to download referenced meta-data such as a web page.
-
-[[conventions]]
-=== Conventions Used in This Document
-
-The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
-"SHOULD", "SHOULD NOT", "RECOMMENDED", "NOT RECOMMENDED", "MAY", and
-"OPTIONAL" in this document are to be interpreted as described in
-<<RFC2119>>.
-
diff --git a/sources/sections/02-normrefs.adoc b/sources/sections/02-normrefs.adoc
@@ -2,18 +2,18 @@
 [bibliography]
 == Normative references
 
-* [[[RFC5545,IETF RFC 5545]]], _AUTOFILL_
+* [[[RFC5545,IETF RFC 5545]]]
 // Desruisseaux, B., Ed., "Internet Calendaring and Scheduling Core Object Specification (iCalendar)", RFC 5545, DOI 10.17487/RFC5545, September 2009, <http://www.rfc-editor.org/info/rfc5545>.
 
-* [[[RFC5988,IETF RFC 5988]]], _AUTOFILL_
+* [[[RFC5988,IETF RFC 5988]]]
 //M. Nottingham. _Web Linking_. 2010. https://www.rfc-editor.org/info/rfc5988
 
-* [[[RFC6638,IETF RFC 6638]]], _AUTOFILL_
+* [[[RFC6638,IETF RFC 6638]]]
 //Daboo, C. and B. Desruisseaux, "Scheduling Extensions to CalDAV", RFC 6638, DOI 10.17487/RFC6638, June 2012, <http://www.rfc-editor.org/info/rfc6638>.
 
-* [[[W3C.CR-skos-reference-20090317,W3C CR skos-reference-20090317]]], Sean Bechhofer, Alistair Miles. _SKOS Simple Knowledge Organization System Reference._ 2009. http://www.w3.org/TR/2009/CR-skos-reference-20090317
+* [[[W3C.CR-skos-reference-20090317,W3C CR skos-reference]]], Sean Bechhofer, Alistair Miles. _SKOS Simple Knowledge Organization System Reference._ 2009. http://www.w3.org/TR/2009/CR-skos-reference-20090317
 
-* [[[W3C.WD-xptr-xpointer-20021219,W3C WD xptr-xpointer-20021219]]], Steven DeRose, Ron Daniel, Eve Maler. _XPointer xpointer() Scheme._ 2002. http://www.w3.org/TR/2002/WD-xptr-xpointer-20021219
+* [[[W3C.WD-xptr-xpointer-20021219,W3C WD xptr-xpointer]]], Steven DeRose, Ron Daniel, Eve Maler. _XPointer xpointer() Scheme._ 2002. http://www.w3.org/TR/2002/WD-xptr-xpointer-20021219
 
-* [[[I-D.daboo-caldav-attachments,IETF I-D daboo-caldav-attachments]]], _AUTOFILL_
+* [[[I-D.daboo-caldav-attachments,IETF I-D daboo-caldav-attachments]]]
 //Cyrus Daboo, Arnaud Quillaud. _CalDAV Managed Attachments._ 2014. http://www.ietf.org/internet-drafts/draft-daboo-caldav-attachments-03.txt
diff --git a/sources/sections/11-security.adoc b/sources/sections/11-security.adoc
@@ -1,7 +1,7 @@
 == Security Considerations
 
 Applications using the LINK property need to be aware of the risks
-entailed in using the URIs provided as values.  See <RFC3986>> for a
+entailed in using the URIs provided as values.  See <<RFC3986>> for a
 discussion of the security considerations relating to URIs.
 
 The CONCEPT and redefined RELATED-TO property have the same issues in

diff --git a/sources/sections/99-bibliography.adoc b/sources/sections/99-bibliography.adoc
@@ -2,5 +2,7 @@
 [bibliography]
 == Bibliography
 
-* [[[RFC2119,IETF RFC 2119]]], _AUTOFILL_
+* [[[RFC2119,IETF RFC 2119]]]
 //M. Nottingham. _Web Linking_. 2010. https://www.rfc-editor.org/info/rfc2119
+
+* [[[RFC3986,IETF RFC 3986]]]