metanorma-cli 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6092865e37d131f42abe58d2fc076c71927c694e1f2d3cfecde7071411c4d763
-  data.tar.gz: 774379371a7961d4d8538cf2d96c3d7067357f5ad7a09da29ea7cb06c6dc6925
+  metadata.gz: 971ab5a31bcdca149e9d2db05468b0783b11069381f8e8d1f476370471938d92
+  data.tar.gz: 4434ee76f7ab6e0b52f3cbe42f4fb3691501db4e69b8f73286c62665ffdeb5c0
 SHA512:
-  metadata.gz: afcdd26a3afb650405cbf87aa4f1a1b1cc97f07fa4a5567aeb11b88df15b8c150cb9d2ba3af0b23f27bfe1671961e672844508dc8c6277ba02b20e4d0f764baa
-  data.tar.gz: 88db9042c32795683eb56b03818acf6fc9d14336c6ed0e8811e53443c0a890f57790e8ffe1c8566572586034583e45d42f072e25d11032bfcd72a33b589ad6c5
+  metadata.gz: b9432b69906459719bde150fef7f66a6081db913d65ec3b8dc708f2e379207f4c4607a99a4388229e9bfb5d6ba7e81120503f88d8a771d11e350b331dabffe78
+  data.tar.gz: e9d339f903d42161861b2ad07d1953bc367560eaf81817aecec07388681dff060f2473fd7115f77313ae892ef011a1c3ff99de3eb73045a7230d421c497074a7

data/lib/metanorma/cli/command.rb

@@ -86,8 +86,14 @@ module Metanorma
               font: font,
               term_agreement: options[:agree_to_terms],
             )
+          rescue Fontist::Errors::LicensingError
+            UI.error(
+              "[error]: License acceptance required to install a necessary font." \
+              "Accept required licenses with: `metanorma setup --agree-to-terms`."
+            )
+            return
           rescue Fontist::Errors::NonSupportedFontError
-            UI.say("[info]: Font `#{font}` is not supported yet!")
+            UI.say("[info]: The font `#{font}` is not yet supported.")
           end
         end
       end

data/lib/metanorma/cli/setup.rb

@@ -43,7 +43,7 @@ module Metanorma
         begin
           Fontist::Font.find(font_name)
         rescue Fontist::Errors::MissingFontError
-          ask_user_and_download_font(font_name)
+          process_font_installation(font_name)
         end
       end
 
@@ -54,39 +54,18 @@ module Metanorma
         end
       end
 
-      def ask_user_and_download_font(font_name)
-        response = term_agreement ? "yes" : "no"
-        formula = Fontist::Formula.find(font_name)
+      def process_font_installation(font_name)
+        accepted_agreement = term_agreement == true ? "yes" : "no"
 
-        if !term_agreement
-          response = UI.ask(message(formula.license).strip)
-        end
-
-        if response.downcase === "yes"
-          Fontist::Font.install(font_name, confirmation: response)
-        end
+        UI.say(missing_font_message) if !term_agreement
+        Fontist::Font.install(font_name, confirmation: accepted_agreement)
       end
 
-      def message(license)
+      def missing_font_message
         <<~MSG
-          FONT LICENSE ACCEPTANCE REQUIRED:
-
-          Metanorma has detected that you do not have the necessary fonts installed
-          for PDF generation. Without those fonts, the generated PDF will use
-          generic fonts that may not resemble the desired styling.
-
-          Metanorma can download these files for you if you accept the font
-          licensing conditions for the font "#{font_name}".
-
-          FONT LICENSE BEGIN ("#{font_name}")
-          -----------------------------------------------------------------------
-          #{license}
-          -----------------------------------------------------------------------
-          FONT LICENSE END ("#{font_name}")
-
-          Do you accept all presented font licenses, and want Metanorma to
-          download these fonts for you?
-          => TYPE "Yes" or "No":
+          Your system does not have the necessary fonts installed for
+          PDF generation. Without these fonts, the generated PDF will use
+          generic fonts that may not resemble the desired styling.\n
         MSG
       end
     end

data/lib/metanorma/cli/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cli
-    VERSION = "1.3.5"
+    VERSION = "1.3.6"
   end
 end

data/metanorma-cli.gemspec

@@ -59,5 +59,5 @@ Gem::Specification.new do |spec|
   #spec.add_runtime_dependency 'nokogiri', ">= 1"
   spec.add_runtime_dependency "git", "~> 1.5"
   spec.add_runtime_dependency "relaton-cli", ">= 0.8.2"
-  spec.add_runtime_dependency "fontist", "~> 1.2"
+  spec.add_runtime_dependency "fontist", "~> 1.3.0"
 end

data/templates/base/.github/workflows/docker.yml

@@ -0,0 +1,74 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: docker
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    paths-ignore:
+      - .github/workflows/test.yml
+      - .github/workflows/macos.yml
+      - .github/workflows/ubuntu.yml
+      - .github/workflows/windows.yml
+      - Makefile.win
+  repository_dispatch:
+    types: [ metanorma/metanorma-docker ]
+
+jobs:
+  test-docker:
+    runs-on: ubuntu-latest
+    container: docker://metanorma/mn
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || github.token }}
+          submodules: true
+      - name: Setup fonts
+        run: |
+          metanorma setup --agree-to-terms
+      - uses: actions/setup-go@v2-beta
+        with:
+          go-version: '^1.13.1'
+      - name: Install yq
+        run: |
+          GO111MODULE=on go get github.com/mikefarah/yq/v3
+          ln -s $GOPATH/bin/yq /usr/local/bin/yq
+      - name: Instal gems from local Gemfile
+        run: |
+          curl -L --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/gemfile-to-bundle-add.sh | bash
+      - name: Build document in the Metanorma container
+        env:
+          LC_ALL: C.UTF-8
+          LANG: C.UTF-8
+          LANGUAGE: C.UTF-8
+        run: |
+          make clean all publish
+      - uses: actions/upload-artifact@master
+        with:
+          name: published
+          path: published
+
+  deploy-gh-pages:
+    if: github.ref == 'refs/heads/master'
+    runs-on: ubuntu-latest
+    needs: test-docker
+    steps:
+    - uses: actions/checkout@master
+    - uses: actions/download-artifact@v1
+      with:
+        name: published
+    - name: Deploy to GH Pages
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        deploy_key: ${{ secrets.GH_DEPLOY_KEY }}
+        publish_dir: ./published
+        force_orphan: true
+        user_name: ${{ github.actor }}
+        user_email: ${{ format('{0}@users.noreply.github.com', github.actor) }}
+        commit_message: "${{ format('Deploy to GitHub Pages: {0}', github.sha) }}"
+    - uses: kolpav/purge-artifacts-action@v1
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        expire-in: 0

data/templates/base/.github/workflows/macos.yml

@@ -0,0 +1,50 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: macos
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    paths-ignore:
+      - .github/workflows/test.yml
+      - .github/workflows/docker.yml
+      - .github/workflows/ubuntu.yml
+      - .github/workflows/windows.yml
+      - Makefile.win
+
+jobs:
+  test-macos:
+    name: Test on macOS
+    runs-on: macos-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || github.token }}
+          submodules: true
+      - name: Cache xml2rfc
+        id: cache-xml2rfc
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/xml2rfc
+          key: xml2rfc
+          restore-key: xml2rfc
+      - name: Use Metanorma
+        run: |
+          brew update
+          brew install yq
+          brew install https://raw.githubusercontent.com/metanorma/homebrew-metanorma/master/Formula/metanorma.rb
+          metanorma version
+      - name: Setup Fonts
+        run: |
+          metanorma setup --agree-to-terms
+      - name: Install bundler
+        run: |
+          sudo gem install bundler
+      - name: Metanorma compile
+        env:
+          JAVA_OPTS: "java.awt.headless=true"
+        run: |
+          source $(brew --prefix metanorma)/libexec/venv/bin/activate
+          make clean all

data/templates/base/.github/workflows/ubuntu.yml

@@ -0,0 +1,55 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: ubuntu
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    paths-ignore:
+      - .github/workflows/test.yml
+      - .github/workflows/macos.yml
+      - .github/workflows/docker.yml
+      - .github/workflows/windows.yml
+      - Makefile.win
+
+jobs:
+  test-linux:
+    name: Test on Ubuntu
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || github.token }}
+          submodules: true
+      - name: Cache xml2rfc
+        id: cache-xml2rfc
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/xml2rfc
+          key: xml2rfc
+          restore-key: xml2rfc
+      - name: Use Metanorma
+        run: |
+          sudo apt-get update
+          curl -L https://raw.githubusercontent.com/metanorma/metanorma-linux-setup/master/ubuntu.sh | sudo bash
+          sudo chown -R $USER:$(id -gn $USER) $HOME/.config
+      - name: Setup Fonts
+        run: |
+          sudo gem install rake metanorma-cli
+          sudo metanorma setup --agree-to-terms
+      - name: Install yq
+        run: |
+          sudo snap install yq
+          echo "::add-path::/snap/bin"
+      - name: Install bundler
+        run: |
+          sudo gem install bundler
+      - name: Metanorma compile
+        env:
+          JAVA_OPTS: "java.awt.headless=true"
+        run: |
+          source $HOME/.nvm/nvm.sh
+          nvm use mn-node
+          make clean all publish

data/templates/base/.github/workflows/windows.yml

@@ -0,0 +1,42 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: windows
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    paths-ignore:
+      - .github/workflows/test.yml
+      - .github/workflows/macos.yml
+      - .github/workflows/ubuntu.yml
+      - .github/workflows/docker.yml
+      - Makefile
+
+jobs:
+  test-windows:
+    name: Test on Windows
+    runs-on: windows-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || github.token }}
+          submodules: true
+      - name: Cache xml2rfc
+        id: cache-xml2rfc
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/xml2rfc
+          key: xml2rfc
+          restore-key: xml2rfc
+      - name: Install Metanorma & yq
+        shell: pwsh
+        run: |
+          cinst --no-progress -y metanorma yq
+      - name: Install bundler
+        run: |
+          gem install bundler
+      - name: Metanorma compile
+        run: |
+          make -f Makefile.win clean all SHELL=cmd

data/templates/base/.gitlab-ci.yml

@@ -1,15 +1,45 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 image:
-  name: ribose/metanorma
+  name: metanorma/mn
   entrypoint: [""]
 
 cache:
   paths:
 
+stages:
+  - build
+  - deploy
+
+
 build:
   stage: build
   script:
-    - bundle
-    - make clean all publish
+    # We need to do this to install mscorefonts
+    - curl -Ls -o yq https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64
+    - chmod +x yq && mv yq /usr/bin
+    - yq
+    - apt-add-repository -y contrib && apt-get update
+    - echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections
+    - apt-get install -y ttf-mscorefonts-installer
+    - curl -Ls https://raw.githubusercontent.com/metanorma/vista-fonts-installer/master/vista-fonts-installer.sh | bash
+    - curl -L --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/gemfile-to-bundle-add.sh | bash
+    - bundle install
+    - make clean all
+    - make published
+    - mv published public
+  artifacts:
+    paths:
+      - public
+
+pages:
+  dependencies:
+    - build
+  stage: deploy
+  script:
+    - 'curl --location --output artifacts.zip --header "JOB-TOKEN: $CI_JOB_TOKEN" "https://gitlab.com/api/v4/projects/$CI_PROJECT_ID/jobs/artifacts/master/download?job=build"'
   artifacts:
     paths:
-      - published
+      - public
+  only:
+    - master

data/templates/base/Makefile

@@ -1,65 +1,104 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 #!make
 SHELL := /bin/bash
 # Ensure the xml2rfc cache directory exists locally
 IGNORE := $(shell mkdir -p $(HOME)/.cache/xml2rfc)
 
-SRC := $(shell yq r metanorma.yml metanorma.source.files | cut -c 3-999)
+SRC := $(shell yq r metanorma.yml metanorma.source.files | cut -c 3-)
+
+ifeq ($(SRC),null)
+SRC :=
+endif
 ifeq ($(SRC),ll)
-SRC := $(filter-out README.adoc, $(wildcard *.adoc))
+SRC :=
+endif
+
+ifeq ($(SRC),)
+BUILT := $(shell yq r metanorma.yml metanorma.source.built_targets | cut -d ':' -f 1 | tr -s '\n' ' ')
+
+ifeq ($(BUILT),null)
+SRC :=
+endif
+ifeq ($(BUILT),ll)
+SRC :=
+endif
+
+ifeq ($(BUILT),)
+SRC := $(filter-out README.adoc, $(wildcard sources/*.adoc))
+else
+XML := $(patsubst sources/%,documents/%,$(BUILT))
+endif
 endif
 
+FORMATS := $(shell yq r metanorma.yml metanorma.formats | tr -d '[:space:]' | tr -s '-' ' ')
+ifeq ($(FORMATS),)
 FORMAT_MARKER := mn-output-
-FORMATS := $(shell grep "$(FORMAT_MARKER)" $(SRC) | cut -f 2 -d ' ' | tr ',' '\n' | sort | uniq | tr '\n' ' ')
-
-XML  := $(patsubst %.adoc,%.xml,$(SRC))
-XMLRFC3  := $(patsubst %.adoc,%.v3.xml,$(SRC))
-HTML := $(patsubst %.adoc,%.html,$(SRC))
-DOC  := $(patsubst %.adoc,%.doc,$(SRC))
-PDF  := $(patsubst %.adoc,%.pdf,$(SRC))
-TXT  := $(patsubst %.adoc,%.txt,$(SRC))
-NITS := $(patsubst %.adoc,%.nits,$(wildcard draft-*.adoc))
-WSD  := $(wildcard models/*.wsd)
-XMI	 := $(patsubst models/%,xmi/%,$(patsubst %.wsd,%.xmi,$(WSD)))
-PNG	 := $(patsubst models/%,images/%,$(patsubst %.wsd,%.png,$(WSD)))
-
-COMPILE_CMD_LOCAL := bundle exec metanorma $$FILENAME
-COMPILE_CMD_DOCKER := docker run -v "$$(pwd)":/metanorma/ ribose/metanorma "metanorma $$FILENAME"
+FORMATS := $(shell grep "$(FORMAT_MARKER)" $(SRC) | cut -f 2 -d " " | tr "," "\\n" | sort | uniq | tr "\\n" " ")
+endif
+
+XML  ?= $(patsubst sources/%,documents/%,$(patsubst %.adoc,%.xml,$(SRC)))
+HTML := $(patsubst %.xml,%.html,$(XML))
 
 ifdef METANORMA_DOCKER
-  COMPILE_CMD := echo "Compiling via docker..."; $(COMPILE_CMD_DOCKER)
+  PREFIX_CMD := echo "Running via docker..."; docker run -v "$$(pwd)":/metanorma/ $(METANORMA_DOCKER)
 else
-  COMPILE_CMD := echo "Compiling locally..."; $(COMPILE_CMD_LOCAL)
+  ifdef SKIP_BUNDLE
+    PREFIX_CMD := echo "Running locally...";
+  else
+    PREFIX_CMD := echo "Running locally via bundle ..."; bundle exec
+  endif
 endif
 
 _OUT_FILES := $(foreach FORMAT,$(FORMATS),$(shell echo $(FORMAT) | tr '[:lower:]' '[:upper:]'))
 OUT_FILES  := $(foreach F,$(_OUT_FILES),$($F))
 
-all: images $(OUT_FILES)
-
-%.v3.xml %.xml %.html %.doc %.pdf %.txt:	%.adoc | bundle
-	FILENAME=$^; \
-	${COMPILE_CMD}
-
-draft-%.nits:	draft-%.txt
-	VERSIONED_NAME=`grep :name: draft-$*.adoc | cut -f 2 -d ' '`; \
-	cp $^ $${VERSIONED_NAME}.txt && \
-	idnits --verbose $${VERSIONED_NAME}.txt > $@ && \
-	cp $@ $${VERSIONED_NAME}.nits && \
-	cat $${VERSIONED_NAME}.nits
-
-%.nits:
-
-nits: $(NITS)
-
-images: $(PNG)
-
-images/%.png: models/%.wsd
-	plantuml -tpng -o ../images/ $<
-
-xmi: $(XMI)
+define print_vars
+	$(info "src $(SRC)")
+	$(info "xml $(XML)")
+	$(info "formats $(FORMATS)")
+endef
 
-xmi/%.xmi: models/%.wsd
-	plantuml -xmi:star -o ../xmi/ $<
+all: documents.html
+	$(call print_vars)
+
+documents:
+	mkdir -p $@
+
+documents/%.html: documents/%.xml | documents
+	${PREFIX_CMD} metanorma $<
+
+documents/%.xml: sources/%.xml | documents
+	mkdir -p $(dir $@)
+	mv $< $@
+
+# Build canonical XML output
+# If XML file is provided, copy it over
+# Otherwise, build the xml using adoc
+sources/%.xml: | bundle
+	BUILT_TARGET="$(shell yq r metanorma.yml metanorma.source.built_targets[$@])"; \
+	if [ "$$BUILT_TARGET" = "" ] || [ "$$BUILT_TARGET" = "null" ]; then \
+		BUILT_TARGET=$@; \
+		$(PREFIX_CMD) metanorma -x xml "$${BUILT_TARGET//xml/adoc}"; \
+	else \
+		if [ -f "$$BUILT_TARGET" ] && [ "$${BUILT_TARGET##*.}" == "xml" ]; then \
+			cp "$$BUILT_TARGET" $@; \
+		else \
+			$(PREFIX_CMD) metanorma -x xml $$BUILT_TARGET; \
+			cp "$${BUILT_TARGET//adoc/xml}" $@; \
+		fi \
+	fi
+
+documents.rxl: $(XML) $(HTML)
+	${PREFIX_CMD} relaton concatenate \
+	  -t "$(shell yq r metanorma.yml relaton.collection.name)" \
+		-g "$(shell yq r metanorma.yml relaton.collection.organization)" \
+		documents $@
+
+documents.html: documents.rxl
+	$(PREFIX_CMD) relaton xml2html documents.rxl
+
+%.adoc:
 
 define FORMAT_TASKS
 OUT_FILES-$(FORMAT) := $($(shell echo $(FORMAT) | tr '[:lower:]' '[:upper:]'))
@@ -81,10 +120,15 @@ $(foreach FORMAT,$(FORMATS),$(eval $(FORMAT_TASKS)))
 open: open-html
 
 clean:
-	rm -f $(OUT_FILES) && rm -rf published
+	rm -rf documents documents.{html,rxl} published *_images $(OUT_FILES)
 
 bundle:
-	if [ "x" == "${METANORMA_DOCKER}x" ]; then bundle; fi
+ifndef METANORMA_DOCKER
+ifndef SKIP_BUNDLE
+	bundle install --jobs 4 --retry 3
+endif
+endif
+	$(call print_vars)
 
 .PHONY: bundle all open clean
 
@@ -102,20 +146,20 @@ $(NODE_PACKAGE_PATHS): package.json
 	npm i
 
 watch: $(NODE_BIN_DIR)/onchange
-	$(MAKE) all
-	$< $(ALL_SRC) -- $(MAKE) all
+	make all
+	$< $(ALL_SRC) -- make all
 
 define WATCH_TASKS
 watch-$(FORMAT): $(NODE_BIN_DIR)/onchange
-	$(MAKE) $(FORMAT)
-	$$< $$(SRC_$(FORMAT)) -- $(MAKE) $(FORMAT)
+	make $(FORMAT)
+	$$< $$(SRC_$(FORMAT)) -- make $(FORMAT)
 
 .PHONY: watch-$(FORMAT)
 endef
 
 $(foreach FORMAT,$(FORMATS),$(eval $(WATCH_TASKS)))
 
-serve: $(NODE_BIN_DIR)/live-server revealjs-css reveal.js images
+serve: $(NODE_BIN_DIR)/live-server revealjs-css reveal.js
 	export PORT=$${PORT:-8123} ; \
 	port=$${PORT} ; \
 	for html in $(HTML); do \
@@ -130,15 +174,23 @@ watch-serve: $(NODE_BIN_DIR)/run-p
 # Deploy jobs
 #
 
-publish:
-	$(MAKE) published
+publish: published
 
-published:
+published: documents.html
 	mkdir -p $@ && \
-	export GLOBIGNORE=$(SRC); \
-	cp -a $(addsuffix .*,$(basename $(SRC))) $@/; \
-	unset GLOBIGNORE; \
-	cp $(firstword $(HTML)) $@/index.html
+	cp -a documents $@/ && \
+	cp $< $@/index.html;
+
+#
+# PDF
+#
+
+PDFTEXT := $(patsubst %.pdf,%.txt,$(subst /pdfs,/text,$(wildcard reference-docs/pdfs/*.pdf)))
+
+pdf2text: $(PDFTEXT)
 
-.PHONY: publish
+reference-docs/text:
+	mkdir -p $@
 
+reference-docs/text/%.txt: reference-docs/pdfs/%.pdf | reference-docs/text
+	ps2ascii "$<" "$@"

data/templates/base/Makefile.win

@@ -1,53 +1,126 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 #!make
+SHELL := cmd
+# Ensure the xml2rfc cache directory exists locally
+IGNORE := $(shell md $(USERPROFILE)\.cache\xml2rfc)
 
-FORMAT_MARKER := mn-output-
-FORMATS := $(shell grep "$(FORMAT_MARKER)" *.adoc | cut -f 2 -d ' ' | tr ',' '\n' | sort | uniq | tr '\n' ' ')
+SRC := $(shell yq r metanorma.yml metanorma.source.files | cut -c 3-)
+
+ifeq ($(SRC),null)
+SRC :=
+endif
+ifeq ($(SRC),ll)
+SRC :=
+endif
+
+ifeq ($(SRC),)
+BUILT := $(subst ${ },${\n},$(shell yq r metanorma.yml metanorma.source.built_targets | cut -d ":" -f 1))
+
+ifeq ($(BUILT),null)
+BUILT :=
+SRC :=
+endif
+ifeq ($(BUILT),ll)
+BUILT :=
+SRC :=
+endif
+ifeq ($(BUILT),)
+SRC :=
+endif
+
+ifeq ($(BUILT),)
+SRC := $(filter-out README.adoc, $(wildcard sources/*.adoc))
+else
+XML := $(patsubst sources/%,documents/%,$(BUILT))
+endif
+endif
 
-SRC  := $(filter-out README.adoc, $(wildcard *.adoc))
-XML  := $(patsubst %.adoc,%.xml,$(SRC))
-HTML := $(patsubst %.adoc,%.html,$(SRC))
-DOC  := $(patsubst %.adoc,%.doc,$(SRC))
-PDF  := $(patsubst %.adoc,%.pdf,$(SRC))
-WSD  := $(wildcard models/*.wsd)
-XMI	 := $(patsubst models/%,xmi/%,$(patsubst %.wsd,%.xmi,$(WSD)))
-PNG	 := $(patsubst models/%,images/%,$(patsubst %.wsd,%.png,$(WSD)))
+FORMATS := $(subst -,${ },$(strip $(shell yq r metanorma.yml metanorma.formats)))
+ifeq ($(FORMATS),null)
+FORMATS :=
+endif
+ifeq ($(FORMATS),)
+FORMAT_MARKER := mn-output-
+FORMATS := $(subst ${\n},${ },$(shell grep "$(FORMAT_MARKER)" $(SRC) | cut -f 2 -d " " | tr "," "\n" | sort | uniq))
+endif
 
-HOST_SHARE_DIR=$(USERPROFILE)\$(shell for %%I in (.) do echo %%~nxI)
-COMPILE_CMD_LOCAL := bundle exec metanorma $(SRC)
-COMPILE_CMD_DOCKER := docker run --rm -it -v $(CURDIR):/metanorma/ ribose/metanorma "metanorma $(SRC)"
+XML  ?= $(patsubst sources/%,documents/%,$(patsubst %.adoc,%.xml,$(SRC)))
+HTML := $(patsubst %.xml,%.html,$(XML))
 
 ifdef METANORMA_DOCKER
-  COMPILE_CMD := echo "Compiling via docker..." & $(COMPILE_CMD_DOCKER)
+  PREFIX_CMD := echo "Running via docker..." & docker run -v "$$(pwd)":/metanorma/ $(METANORMA_DOCKER)
 else
-  COMPILE_CMD := echo "Compiling locally..." & $(COMPILE_CMD_LOCAL)
+  ifdef SKIP_BUNDLE
+    PREFIX_CMD := echo "Running locally..." &
+  else
+    PREFIX_CMD := echo "Running locally via bundle ..." & bundle exec
+  endif
 endif
 
 _OUT_FILES := $(foreach FORMAT,$(FORMATS),$(shell echo $(FORMAT) | tr '[:lower:]' '[:upper:]'))
 OUT_FILES  := $(foreach F,$(_OUT_FILES),$($F))
 
-all: $(OUT_FILES)
-
-%.xml %.html %.doc %.pdf:	%.adoc | bundle
-	${COMPILE_CMD}
+define print_vars
+	$(info "src $(SRC)")
+	$(info "xml $(XML)")
+	$(info "formats $(FORMATS)")
+endef
 
-images: $(PNG)
+all: documents.html
+	$(call print_vars)
+
+documents:
+	setlocal enableextensions & md $@ & endlocal
+
+documents/%.html: documents/%.xml | documents
+	${PREFIX_CMD} metanorma $<
+
+documents/%.xml: sources/%.xml | documents
+	if not exist "$(subst /,\,$(dir $@))" md "$(subst /,\,$(dir $@))"
+	move "$(subst /,\,$<)" "$(subst /,\,$@)"
+
+# Build canonical XML output
+# If XML file is provided, copy it over
+# Otherwise, build the xml using adoc
+sources/%.xml: | bundle
+	$(eval BUILT_TARGET := $(subst /,\,$(shell yq r metanorma.yml metanorma.source.built_targets[$@])))
+	$(eval BUILT_TARGET_EMPTY := $(if $(filter $(or $(BUILT_TARGET),null),null ll),true,false))
+	if "$(BUILT_TARGET_EMPTY)" == "true" ( \
+		$(PREFIX_CMD) metanorma -x xml "$(subst xml,adoc,$@)" \
+	) else ( \
+		if exist "$(BUILT_TARGET)" ( \
+			if "$(suffix $(BUILT_TARGET))" == ".xml" ( \
+				copy "$(BUILT_TARGET)" "$(subst /,\,$@)" \
+			) else ( \
+				$(PREFIX_CMD) metanorma $(BUILT_TARGET) & \
+				copy "$(subst adoc,xml,$(BUILT_TARGET))" "$(subst /,\,$@)" \
+			) \
+		) else ( \
+			$(PREFIX_CMD) metanorma $(BUILT_TARGET) & \
+			copy "$(subst adoc,xml,$(BUILT_TARGET))" "$(subst /,\,$@)" \
+		) \
+	)
 
-images/%.png: models/%.wsd
-	plantuml -tpng -o ../images/ $<
+documents.rxl: $(XML) $(HTML)
+	${PREFIX_CMD} relaton concatenate \
+		-t "$(shell yq r metanorma.yml relaton.collection.name)" \
+		-g "$(shell yq r metanorma.yml relaton.collection.organization)" \
+		documents $@
 
-xmi: $(XMI)
+documents.html: documents.rxl
+	$(PREFIX_CMD) relaton xml2html documents.rxl
 
-xmi/%.xmi: models/%.wsd
-	plantuml -xmi:star -o ../xmi/ $<
+%.adoc:
 
 define FORMAT_TASKS
 OUT_FILES-$(FORMAT) := $($(shell echo $(FORMAT) | tr '[:lower:]' '[:upper:]'))
 
 open-$(FORMAT):
-	$$(OUT_FILES-$(FORMAT))
+	"$$(OUT_FILES-$(FORMAT))"
 
 clean-$(FORMAT):
-	rm $$(OUT_FILES-$(FORMAT))
+	del /q $$(OUT_FILES-$(FORMAT))
 
 $(FORMAT): clean-$(FORMAT) $$(OUT_FILES-$(FORMAT))
 
@@ -61,9 +134,17 @@ open: open-html
 
 clean:
 	rm -rf $(OUT_FILES)
+	del /q documents published
+	del /q *_images
+	del /q documents.*
 
 bundle:
-	IF "" == "${METANORMA_DOCKER}" bundle
+ifndef METANORMA_DOCKER
+ifndef SKIP_BUNDLE
+	bundle install --jobs 4 --retry 3
+endif
+endif
+	$(call print_vars)
 
 .PHONY: bundle all open clean
 
@@ -94,9 +175,12 @@ endef
 
 $(foreach FORMAT,$(FORMATS),$(eval $(WATCH_TASKS)))
 
-serve: $(NODE_BIN_DIR)/live-server revealjs-css reveal.js images
-	set PORT=$${PORT:-8123} & \
-	set port=$${PORT} & \
+ifndef PORT
+override PORT = 8123
+endif
+
+serve: $(NODE_BIN_DIR)/live-server revealjs-css reveal.js
+	set port=$(PORT) & \
 	for /r %%html in $(HTML) do ( \
 		$< --entry-file=%%html --port=%port% --ignore="*.html,*.xml,Makefile,Gemfile.*,package.*.json" --wait=1000 & \
 		set /A port=%port%+1 \
@@ -109,8 +193,24 @@ watch-serve: $(NODE_BIN_DIR)/run-p
 # Deploy jobs
 #
 
-publish:
-	mkdir -p published
-	xcopy $(basename $(SRC)).* published
-	copy $(firstword $(HTML)) published\index.html
-	IF EXIST "images" xcopy /E images published
+publish: published
+
+published: documents.html
+	setlocal enableextensions & md $@ & endlocal
+	copy documents $@/
+	copy $< $@/index.html
+	if exist "source\images" xcopy /E source\images $@
+
+#
+# PDF
+#
+
+PDFTEXT := $(patsubst %.pdf,%.txt,$(subst /pdfs,/text,$(wildcard reference-docs/pdfs/*.pdf)))
+
+pdf2text: $(PDFTEXT)
+
+reference-docs/text:
+	md $@
+
+reference-docs/text/%.txt: reference-docs/pdfs/%.pdf | reference-docs/text
+	ps2ascii "$<" "$@"

data/templates/base/metanorma.yml

@@ -1,4 +1,4 @@
 ---
 metanorma:
   deploy:
-    email: "travis-ci@metanorma.org"
+    email: "ci@metanorma.org"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2020-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -380,14 +380,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.0
 description: Executable to process any Metanorma standard.
 email:
 - open.source@ribose.com
@@ -434,13 +434,15 @@ files:
 - lib/metanorma/cli/ui.rb
 - lib/metanorma/cli/version.rb
 - metanorma-cli.gemspec
+- templates/base/.github/workflows/docker.yml
+- templates/base/.github/workflows/macos.yml
+- templates/base/.github/workflows/ubuntu.yml
+- templates/base/.github/workflows/windows.yml
 - templates/base/.gitignore
 - templates/base/.gitlab-ci.yml
-- templates/base/.travis.yml
 - templates/base/Gemfile
 - templates/base/Makefile
 - templates/base/Makefile.win
-- templates/base/appveyor.yml
 - templates/base/metanorma.yml
 homepage: https://www.metanorma.com
 licenses:

data/templates/base/.travis.yml

@@ -1,30 +0,0 @@
-language: ruby
-dist: xenial
-env:
-  global:
-    - COMMIT_AUTHOR_EMAIL="$(yq r metanorma.yml metanorma.deploy.email)"
-addons:
-  apt:
-    update: true
-  snaps:
-    - jq
-    - yq
-    - name: node
-      confinement: classic # or devmode
-      channel: 10/stable
-rvm:
-  - 2.6
-cache: bundler
-before_install:
-  - gem update --system
-  - gem install bundler
-  - npm install -g puppeteer
-  - sudo bash -c "curl -L https://raw.githubusercontent.com/metanorma/metanorma-linux-setup/master/ubuntu.sh | bash"
-script:
-  - make clean all publish
-deploy:
-  skip_cleanup: true
-  provider: script
-  script: bash -c "curl -L https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/deploy-to-gh-pages.sh | bash"
-  on:
-    branch: master

data/templates/base/appveyor.yml

@@ -1,29 +0,0 @@
-version: '{build}'
-
-environment:
-  matrix:
-    - RUBY_VERSION: 25
-    - RUBY_VERSION: 24
-    - RUBY_VERSION: _trunk
-
-matrix:
-  allow_failures:
-    - RUBY_VERSION: _trunk
-
-install:
-  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
-  - refreshenv
-
-build_script:
-  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - bundle update
-  - bundle install
-
-before_test:
-  - ruby -v
-  - gem -v
-  - bundle -v
-
-test_script:
-  - plantuml -testdot
-  - make -f Makefile.win clean all publish SHELL=cmd