Rename cmd DefineMasterpage from DefinePagetype

speedata · May 10, 2022 · 9af767a · 9af767a
1 parent 10206b0
commit 9af767a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/core/commands.go b/core/commands.go
@@ -34,7 +34,7 @@ func init() {
 		"Copy-of":          cmdCopyof,
 		"DefineFontfamily": cmdDefineFontfamily,
 		"DefineFontsize":   cmdDefineFontsize,
-		"DefinePagetype":   cmdDefinePagetype,
+		"DefineMasterpage": cmdDefineMasterpage,
 		"Element":          cmdElement,
 		"ForAll":           cmdForall,
 		"Group":            cmdGroup,
@@ -284,7 +284,7 @@ func cmdDefineFontsize(xd *xtsDocument, layoutelt *goxml.Element) (xpath.Sequenc
 	return nil, nil
 }
 
-func cmdDefinePagetype(xd *xtsDocument, layoutelt *goxml.Element) (xpath.Sequence, error) {
+func cmdDefineMasterpage(xd *xtsDocument, layoutelt *goxml.Element) (xpath.Sequence, error) {
 	var err error
 	attValues := &struct {
 		Margin string `sdxml:"mustexist"`
@@ -534,7 +534,7 @@ func cmdMessage(xd *xtsDocument, layoutelt *goxml.Element) (xpath.Sequence, erro
 			return nil, err
 		}
 	}
-	bag.Logger.Infof("Message (line %d): %s", layoutelt.Line, eval)
+	bag.Logger.Infof("Message (line %d): %s", layoutelt.Line, eval.Stringvalue())
 	return nil, nil
 }
 

diff --git a/doc/commands-xml/commands.xml b/doc/commands-xml/commands.xml
@@ -16,7 +16,7 @@
   <define name="Toplevel">
     <optional><cmd name="DefineFontfamily"/></optional>
     <optional><cmd name="DefineFontsize"/></optional>
-    <optional><cmd name="DefinePagetype"/></optional>
+    <optional><cmd name="DefineMasterpage"/></optional>
     <optional><cmd name="LoadFontfile"/></optional>
     <optional><cmd name="Options"/></optional>
     <optional><cmd name="Pageformat"/></optional>
@@ -878,7 +878,7 @@
 </Record>
 ]]></listing>
     </example>
-    <seealso><cmd name="DefinePagetype"/></seealso>
+    <seealso><cmd name="DefineMasterpage"/></seealso>
   </command>
 
 
@@ -1129,7 +1129,7 @@
   </command>
 
 
-  <command en="DefinePagetype">
+  <command en="DefineMasterpage">
     <description xml:lang="en">
       <para>Define a master page. A master page is chosen depending on the criterion given with the attribute »test«.</para>
     </description>