From 87855260ed06f3fc29862cb41d20409226bbb67b Mon Sep 17 00:00:00 2001 From: Patrick Gundlach Date: Sun, 21 Apr 2024 16:26:39 +0200 Subject: [PATCH] Fix Value in Function --- doc/commands-xml/commands.xml | 1 + qa/programming/functiongeneral/data.xml | 1 + qa/programming/functiongeneral/layout.xml | 106 +++++++++++++------ qa/programming/functiongeneral/reference.pdf | Bin 4190 -> 4297 bytes schema/layoutschema-de.rng | 3 + schema/layoutschema-de.xsd | 1 + schema/layoutschema-en.rng | 3 + schema/layoutschema-en.xsd | 1 + src/lua/publisher/commands.lua | 6 +- 9 files changed, 87 insertions(+), 35 deletions(-) diff --git a/doc/commands-xml/commands.xml b/doc/commands-xml/commands.xml index b8eb9a56..2ed0d64b 100644 --- a/doc/commands-xml/commands.xml +++ b/doc/commands-xml/commands.xml @@ -3790,6 +3790,7 @@ + diff --git a/qa/programming/functiongeneral/data.xml b/qa/programming/functiongeneral/data.xml index d1f15cf3..7b4fef1b 100644 --- a/qa/programming/functiongeneral/data.xml +++ b/qa/programming/functiongeneral/data.xml @@ -1,3 +1,4 @@ + diff --git a/qa/programming/functiongeneral/layout.xml b/qa/programming/functiongeneral/layout.xml index b1643fca..823ab823 100644 --- a/qa/programming/functiongeneral/layout.xml +++ b/qa/programming/functiongeneral/layout.xml @@ -1,27 +1,86 @@ + xmlns:fn="mynamespace"> - + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + Value + + + + Squared + +
+ + + + + + + + - + + + + + + + + + - - - + + + + + + + + - + + + - + + + @@ -38,30 +97,9 @@ - - - - - - - - - - - - - - - - - - - -
- Value - - Squared -
- - + + + + + \ No newline at end of file diff --git a/qa/programming/functiongeneral/reference.pdf b/qa/programming/functiongeneral/reference.pdf index e85e2dda2bb991b7627c7ee59bf7971ca8a76cfb..3896608722866aafcf1107aaa7571a248296575f 100644 GIT binary patch delta 3608 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 delta 3506 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 diff --git a/schema/layoutschema-de.rng b/schema/layoutschema-de.rng index 48874e4e..e27c6b42 100644 --- a/schema/layoutschema-de.rng +++ b/schema/layoutschema-de.rng @@ -2130,6 +2130,9 @@ + + + diff --git a/schema/layoutschema-de.xsd b/schema/layoutschema-de.xsd index 6298805c..8d840f7a 100644 --- a/schema/layoutschema-de.xsd +++ b/schema/layoutschema-de.xsd @@ -1789,6 +1789,7 @@ + diff --git a/schema/layoutschema-en.rng b/schema/layoutschema-en.rng index 60441c47..71fc3c6c 100644 --- a/schema/layoutschema-en.rng +++ b/schema/layoutschema-en.rng @@ -2130,6 +2130,9 @@ + + + diff --git a/schema/layoutschema-en.xsd b/schema/layoutschema-en.xsd index b9bab533..77539422 100644 --- a/schema/layoutschema-en.xsd +++ b/schema/layoutschema-en.xsd @@ -1789,6 +1789,7 @@ + diff --git a/src/lua/publisher/commands.lua b/src/lua/publisher/commands.lua index b82f52f9..2e3db5ca 100644 --- a/src/lua/publisher/commands.lua +++ b/src/lua/publisher/commands.lua @@ -1195,15 +1195,19 @@ function commands.func(layoutxml, dataxml) local x = publisher.dispatch(layoutxml,copy) local res = {} + local has_value = false for i = 1, #x do local thiselt = x[i] local eltname = publisher.elementname(thiselt) if eltname ~= "Param" then res[#res+1] = thiselt end + if eltname == "Value" then + has_value = true + end end - res.raw = true + res.raw = not has_value return res,nil end -- name, namespace, function, minarg, maxarg