Merge scaffold settings in PackageInfo.g and makedoc.g

Author: fingolfin

CHANGES.md

@@ -6,6 +6,9 @@ This file describes changes in the AutoDoc package.
     slips by GAPDoc; so it caused no problems in practice, but the resulting XML
     was strictly speaking invalid)
   - Predefine entities `VERSION`, `RELEASEYEAR`, `RELEASEDATE`
+  - Allow specifying scaffold settings *simultaneously* in `PackageInfo.g`
+    and `makedoc.g`; the records are merged, with values from `makedoc.g`
+    taken precedence if e.g. the same entity is defined in both places
 
 2025.10.16
   - Make handling `Date` in `PackageInfo.g` more strict (previously some

gap/Magic.gi

@@ -215,7 +215,7 @@ function( arg )
     if IsBound(scaffold) and IsBound( pkginfo.AutoDoc ) then
         for key in RecNames( pkginfo.AutoDoc ) do
             if IsBound( scaffold.(key) ) then
-                Info(InfoAutoDoc, 1, "WARNING: ", key, " specified in both PackageInfo.AutoDoc and opt.scaffold");
+                AUTODOC_MergeRecords( scaffold.(key), pkginfo.AutoDoc.(key) );
             else
                 scaffold.(key) := pkginfo.AutoDoc.(key);
             fi;

tst/manual.expected/_Chapter_AutoDoc.xml

@@ -152,6 +152,24 @@
              This allows you to write <Q>&amp;SomePackage;</Q> and <Q>&amp;RELEASEYEAR;</Q>
              in your documentation, which will be replaced by respective values specified
              in the entities definition.
+             <P/>
+             Note that &AutoDoc; predefines several entities:
+             <List>
+             <Mark><A>VERSION</A></Mark>
+             <Item>Set to the <C>Version</C> field your package info record.</Item>
+             <Mark><A>RELEASEYEAR</A></Mark>
+             <Item>Set to a string containing the release year, as derived
+                   from the <C>Date</C> field your package info record.</Item>
+             <Mark><A>RELEASEDATE</A></Mark>
+             <Item>Derived from the <C>Date</C> field your package info record.</Item>
+             <Mark><A>SomePackage</A></Mark>
+             <Item>
+                 The precise name of this entity is derived from the
+                 <C>PackageName</C> field your package info record. Note
+                 that it is case sensitive. The content is defined as
+                 suggested by the example above.
+             </Item>
+             </List>
          </Item>
          <Mark><A>TitlePage</A></Mark>
          <Item>