From 911ede376f8c44ee76f86e3a368be852c69f2793 Mon Sep 17 00:00:00 2001
From: Bastien Dumont <bastien.dumont@posteo.net>
Date: Sat, 19 Aug 2023 15:27:29 +0200
Subject: [PATCH] Passage au format native pour la validation

---
 Utilitaires/Makefile | 48 ++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/Utilitaires/Makefile b/Utilitaires/Makefile
index 14217c1..8a1e4a7 100644
--- a/Utilitaires/Makefile
+++ b/Utilitaires/Makefile
@@ -1,16 +1,19 @@
 INPUT_DATA_DIR = ../Tests-Data
 CHANGELOG = ../CHANGELOG.md
 BIBLIO_FILE = $(INPUT_DATA_DIR)/BIBLIO_CSL-Tests.json
+CSL_FILE_SUFFIX = .csl
 INPUT_FILE = $(INPUT_DATA_DIR)/CSL-Tests.md
 STYLESHEETS_DIR = ..
-VALIDATION_FILE_SUFFIX = _CSL-Validation.html
-OUTPUT_FILE_SUFFIX =  _CSL-Tests.html
-CSL_FILE_SUFFIX = .csl
+VALIDATION_FILE_SUFFIX = _CSL-Validation.native
+OUTPUT_FILE_SUFFIX =  _CSL-Tests.native
+VISUALISATION_FILE_SUFFIX = .html
+VISUALISATION_PREFIX = PROV_
+HTML-VIEWER = palemoon
 ifdef JOURNAL
 	THIS_STYLE_DIR = $(STYLESHEETS_DIR)/$(JOURNAL)
 	DOC_DIR = $(THIS_STYLE_DIR)
 	DOC_FILE = $(DOC_DIR)/GUIDE_$(JOURNAL)
-	VALIDATION_PROV_FILE = $(PROV_PREFIX)$(JOURNAL)$(VALIDATION_FILE_SUFFIX)
+	VISUALISATION_FILE = $(VISUALISATION_PREFIX)$(JOURNAL)$(VISUALISATION_FILE_SUFFIX)
 	CSL_FILE = $(THIS_STYLE_DIR)/$(JOURNAL)$(CSL_FILE_SUFFIX)
 	VALIDATION_FILE = $(THIS_STYLE_DIR)/$(JOURNAL)$(VALIDATION_FILE_SUFFIX)
 	OUTPUT_FILE = $(THIS_STYLE_DIR)/$(JOURNAL)$(OUTPUT_FILE_SUFFIX)
@@ -22,7 +25,7 @@ else
 	DOC_DIR = ../Documentation
 	DOC_FILE = $(DOC_DIR)/GUIDE_CSL-Clio
 endif
-PANDOC_OPTIONS = -s \
+PANDOC_OPTIONS = \
 	$(FILTERS_LIST_FIRST) \
 	-C \
 	--bibliography=$(BIBLIO_FILE) \
@@ -30,22 +33,14 @@ PANDOC_OPTIONS = -s \
 	-M lang=fr \
 	--wrap=none \
 	$(FILTERS_LIST_LAST)
-PROV_PREFIX = PROV_
-HTML-VIEWER = palemoon
-COMMON_DOC_OPTIONS=-s \
+COMMON_DOC_OPTIONS= -s \
 	--filter pandoc-crossref \
 	-L license-dans-metadonnees.lua \
 	-L changelog-dans-annexes.lua \
 	$(DOC_FILE).md \
 	--resource-path=.:$(DOC_DIR)
 
-test : $(CSL_FILE) \
-	$(VALIDATION_FILE) \
-	$(BIBLIO_FILE) \
-	$(INPUT_FILE)
-	pandoc $(PANDOC_OPTIONS) \
-		$(INPUT_FILE) \
-		-o $(OUTPUT_FILE)
+test: $(VALIDATION_FILE) $(OUTPUT_FILE)
 	echo "Résultat de la comparaison"
 	echo "============="
 	diff -s -C 0 \
@@ -53,17 +48,22 @@ test : $(CSL_FILE) \
 		$(VALIDATION_FILE)
 	echo "============="
 
-test-compact: test
+test-compact: $(VALIDATION_FILE) $(OUTPUT_FILE)
 	dwdiff -3 $(OUTPUT_FILE) $(VALIDATION_FILE) | sort | uniq
 
-
-validation-prov: $(VALIDATION_PROV_FILE)
-	$(HTML-VIEWER) $(VALIDATION_PROV_FILE)
-
-$(VALIDATION_PROV_FILE): $(BIBLIO_FILE) $(CSL_FILE) $(INPUT_FILE)
+$(OUTPUT_FILE):  $(CSL_FILE) $(BIBLIO_FILE)
 	pandoc $(PANDOC_OPTIONS) \
 		$(INPUT_FILE) \
-		-o $(VALIDATION_PROV_FILE)
+		-t native \
+		-o $(OUTPUT_FILE)
+
+visualisation: $(VISUALISATION_FILE)
+	$(HTML-VIEWER) $(VISUALISATION_FILE)
+
+$(VISUALISATION_FILE): $(BIBLIO_FILE) $(CSL_FILE) $(INPUT_FILE)
+	pandoc -s $(PANDOC_OPTIONS) \
+		$(INPUT_FILE) \
+		-o $(VISUALISATION_FILE)
 
 validation-docx: $(VALIDATION_DOCX_FILE)
 
@@ -75,8 +75,8 @@ $(VALIDATION_DOCX_FILE): $(BIBLIO_FILE) $(CSL_FILE) $(INPUT_FILE)
 $(INPUT_FILE): $(BIBLIO_FILE)
 	./generer-md-pour-citeproc.sh $(BIBLIO_FILE) $(INPUT_FILE)
 
-install: $(VALIDATION_PROV_FILE)
-	mv $(VALIDATION_PROV_FILE) $(VALIDATION_FILE)
+install: $(OUTPUT_FILE)
+	mv $(OUTPUT_FILE) $(VALIDATION_FILE)
 
 clean:
 	rm $(STYLESHEETS_DIR)/*/*$(OUTPUT_FILE_SUFFIX)