ci: ⬆️ Fix XT30.E36 XSLT error, remove fix-saxon.xslt

#170

.vscode/cSpell.json

@@ -19,6 +19,7 @@
         "расширения",
         "рефакторинг",
         "Штрихкод",
+        "abempty",
         "Amadevus",
         "apos",
         "bday",
@@ -39,6 +40,7 @@
         "compat",
         "concat",
         "datastyle",
+        "delims",
         "dependabot",
         "deps",
         "dirstate",
@@ -54,6 +56,8 @@
         "gittools",
         "gitversion",
         "grddl",
+        "HEXDIG",
+        "hier",
         "idiv",
         "imagelist",
         "impp",
@@ -70,6 +74,7 @@
         "mkdocs",
         "MSXML",
         "NMTOKEN",
+        "noscheme",
         "Nuget",
         "officedocument",
         "officeooo",
@@ -80,6 +85,7 @@
         "openoffice",
         "Paren",
         "passwordprotected",
+        "pchar",
         "pobox",
         "popupmenu",
         "precommit",
@@ -107,6 +113,7 @@
         "Tahoma",
         "toolbaritem",
         "unexisting",
+        "userinfo",
         "VCARD",
         "vcards",
         "Veyor",

.vscode/settings.json

@@ -45,11 +45,6 @@
 	"xml.validation.disallowDocTypeDecl": true,
 	"xml.validation.noGrammar": "ignore",
 	"XSLT.resources.xsltPackages": [
-		{
-			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/system/fix-saxon.xslt",
-			"version": "2.3.0",
-			"path": "tools/docs/xslt/system/fix-saxon.xslt"
-		},
 		{
 			"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/system/uri.xslt",
 			"version": "2.3.0",

CHANGELOG.md

@@ -12,6 +12,7 @@
 
 - версия Saxon HE обновлена до 10.6.0
   [#170](https://github.com/test-st-petersburg/DocTemplates/pull/170)
+- убран fix-saxon.xslt
 
 ## [2.9.3]
 

DocTemplates.code-workspace

@@ -10,11 +10,6 @@
 		"licenser.projectName": "Шаблоны документов ФБУ \"Тест-С.-Петербург\"",
 		"licenser.useSingleLineStyle": true,
 		"XSLT.resources.xsltPackages": [
-			{
-				"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/system/fix-saxon.xslt",
-				"version": "2.3.0",
-				"path": "tools/docs/xslt/system/fix-saxon.xslt"
-			},
 			{
 				"name": "http://github.com/test-st-petersburg/DocTemplates/tools/xslt/system/uri.xslt",
 				"version": "2.3.0",

tools/docs/Build-OODocument.ps1

@@ -61,7 +61,6 @@ begin
 	$saxExecutable = & $PSScriptRoot/../xslt/Get-XSLTExecutable.ps1 `
 		-PackagePath ( `
 			'xslt/system/uri.xslt', `
-			'xslt/system/fix-saxon.xslt', `
 			'xslt/formatter/basic.xslt', 'xslt/formatter/OO.xslt', `
 			'xslt/optimizer/OOOptimizer.xslt', `
 			'xslt/OODocumentProcessor/oo-writer.xslt', `

tools/docs/Build-OOMacroLib.ps1

@@ -42,7 +42,6 @@ begin
 	$saxExecutable = & $PSScriptRoot/../xslt/Get-XSLTExecutable.ps1 `
 		-PackagePath ( `
 			'xslt/system/uri.xslt', `
-			'xslt/system/fix-saxon.xslt', `
 			'xslt/formatter/basic.xslt', 'xslt/formatter/OO.xslt', `
 			'xslt/OODocumentProcessor/oo-writer.xslt', `
 			'xslt/OODocumentProcessor/oo-macrolib.xslt' ) `

tools/docs/Build-OOMacroLibContainer.ps1

@@ -43,7 +43,6 @@ begin
 	$saxExecutable = & $PSScriptRoot/../xslt/Get-XSLTExecutable.ps1 `
 		-PackagePath ( `
 			'xslt/system/uri.xslt', `
-			'xslt/system/fix-saxon.xslt', `
 			'xslt/formatter/basic.xslt', 'xslt/formatter/OO.xslt', `
 			'xslt/OODocumentProcessor/oo-writer.xslt', `
 			'xslt/OODocumentProcessor/oo-macrolib.xslt' ) `

tools/docs/ConvertTo-PlainXML.ps1

@@ -38,7 +38,6 @@ begin
 	$saxExecutable = & $PSScriptRoot/../xslt/Get-XSLTExecutable.ps1 `
 		-PackagePath ( `
 			'xslt/system/uri.xslt', `
-			'xslt/system/fix-saxon.xslt', `
 			'xslt/formatter/basic.xslt', 'xslt/formatter/OO.xslt', `
 			'xslt/optimizer/OOOptimizer.xslt', `
 			'xslt/OODocumentProcessor/oo-writer.xslt', `

tools/docs/Optimize-PlainXML.ps1

@@ -22,7 +22,6 @@ begin
 	$saxExecutable = & $PSScriptRoot/../xslt/Get-XSLTExecutable.ps1 `
 		-PackagePath ( `
 			'xslt/system/uri.xslt', `
-			'xslt/system/fix-saxon.xslt', `
 			'xslt/formatter/basic.xslt', 'xslt/formatter/OO.xslt', `
 			'xslt/optimizer/OOOptimizer.xslt', `
 			'xslt/OODocumentProcessor/oo-writer.xslt', `

tools/docs/xslt/OODocumentProcessor/oo-macrolib.xslt

@@ -37,7 +37,7 @@ REM  *****  BASIC  *****
 	</xsl:param>
 
 	<xsl:use-package name="http://github.com/test-st-petersburg/DocTemplates/tools/xslt/system/uri.xslt" package-version="2.3">
-		<xsl:accept component="function" names="u:get-parent-directory-name u:get-file-name-without-extension u:make-relative-uri" visibility="private"/>
+		<xsl:accept component="function" names="u:get-parent-directory-name#1 u:get-file-name-without-extension#1 u:make-relative-uri#2" visibility="private"/>
 	</xsl:use-package>
 
 	<xsl:use-package name="http://github.com/test-st-petersburg/DocTemplates/tools/xslt/OODocumentProcessor/oo-writer.xslt" package-version="1.5">

tools/docs/xslt/OODocumentProcessor/oo-preprocessor.xslt

@@ -70,10 +70,6 @@
 		<xsl:accept component="template" names="oom:get-macro-library-container" visibility="final"/>
 	</xsl:use-package>
 
-	<xsl:use-package name="http://github.com/test-st-petersburg/DocTemplates/tools/xslt/system/fix-saxon.xslt" package-version="2.3">
-		<xsl:accept component="function" names="fix:doc" visibility="private"/>
-	</xsl:use-package>
-
 	<xsl:param name="p:comment-preprocessing-results" as="xs:boolean" static="yes" select=" true() "/>
 	<xsl:param name="p:embed-linked-libraries" as="xs:boolean" static="yes" select=" true() "/>
 	<xsl:param name="p:embed-linked-templates" as="xs:boolean" static="yes" select=" true() "/>
@@ -349,7 +345,7 @@
 			<xsl:attribute name="meta:date" select="
 				format-dateTime(
 					adjust-dateTime-to-timezone(
-						xs:dateTime( fix:doc( resolve-uri(
+						xs:dateTime( doc( resolve-uri(
 							$p:linked-templates-uri || iri-to-uri( @xlink:title ) || '.ott' || '/meta.xml',
 							base-uri()
 						) )/office:document-meta/office:meta/dc:date ),