[interchange-docs] xmldocs - docelic modified 12 files
docs at icdevgroup.org
docs at icdevgroup.org
Tue Mar 28 08:19:42 EST 2006
User: docelic
Date: 2006-03-28 13:19:42 GMT
Modified: bin refs-autogen
Modified: docbook/symbol-templates catconf catvar filter globconf
Modified: globvar mv ordercheck pragma systemtag uitag
Modified: usertag
Log:
* Fix the thing with <meta name='area' ...>.
I wanted to use the "directive type" variable for this kind of
information, but it is only used for config directives so it's not
suitable.
This patch makes the functionality generic. (hopefully ;-)
Revision Changes Path
1.105 +19 -13 xmldocs/bin/refs-autogen
rev 1.105, prev_rev 1.104
Index: refs-autogen
===================================================================
RCS file: /var/cvs/xmldocs/bin/refs-autogen,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- refs-autogen 28 Mar 2006 11:59:45 -0000 1.104
+++ refs-autogen 28 Mar 2006 13:19:41 -0000 1.105
@@ -120,20 +120,20 @@
# Default fields
my %defaults = (
- synopsis => "&DEF_SYNOPSIS;",
- description => "&DEF_DESCRIPTION;",
- example => "&DEF_EXAMPLE;",
- notes => "&DEF_NOTES;",
- bugs => "&DEF_BUGS;",
+ synopsis => '&DEF_SYNOPSIS;',
+ description => '&DEF_DESCRIPTION;',
+ example => '&DEF_EXAMPLE;',
+ notes => '&DEF_NOTES;',
+ bugs => '&DEF_BUGS;',
source => '&DEF_SOURCE;',
- author => "&DEF_AUTHOR;",
- copyright => "&DEF_COPYRIGHT;",
- 'see also' => "&DEF_SEEALSO;",
- purpose => "&DEF_PURPOSE;",
- structure => "&DEF_STRUCTURE;",
- 'directive type' => "&DEF_DIRECTIVE_TYPE;",
- 'variable type' => "&DEF_VARIABLE_TYPE;",
- 'filter type' => "&DEF_FILTER_TYPE;",
+ author => '&DEF_AUTHOR;',
+ copyright => '&DEF_COPYRIGHT;',
+ 'see also' => '&DEF_SEEALSO;',
+ purpose => '&DEF_PURPOSE;',
+ structure => '&DEF_STRUCTURE;',
+ 'directive type' => '&DEF_DIRECTIVE_TYPE;',
+ 'variable type' => '&DEF_VARIABLE_TYPE;',
+ 'filter type' => '&DEF_FILTER_TYPE;',
);
# Translation from fine-grained names to compound names
@@ -584,6 +584,12 @@
$ag{name} ||= $ag{id} || $k;
$ag{name} = $hash{specific}{$ag{name}}{_name} if
$hash{specific}{$ag{name}}{_name};
+
+ # Finegrained name is ok for symbols that can't be of multiple
+ # type at once. But variables and config directives can, so they
+ # override the single value from finegrained name at this point.
+ $_ = $ag{'directive type'} and $ag{'finegrained name'} = $_;
+ $_ = $ag{'variable type'} and $ag{'finegrained name'} = $_;
################################################################
# DO STUFF HERE IF IT'S COMMON FOR ALL SYMBOLS. IF it's not,
1.4 +1 -1 xmldocs/docbook/symbol-templates/catconf
rev 1.4, prev_rev 1.3
Index: catconf
===================================================================
RCS file: /var/cvs/xmldocs/docbook/symbol-templates/catconf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- catconf 28 Mar 2006 11:59:45 -0000 1.3
+++ catconf 28 Mar 2006 13:19:41 -0000 1.4
@@ -9,7 +9,7 @@
<refnamediv>
<refname>$ag{"name"}</refname>
<refpurpose>$ag{"purpose"}</refpurpose>
-<refclass>$ag{"directive type"}</refclass>
+<refclass>$ag{"finegrained name"}</refclass>
</refnamediv>
<refsect1 id='$ag{"name"}_synopsis'>
1.4 +1 -1 xmldocs/docbook/symbol-templates/catvar
rev 1.4, prev_rev 1.3
Index: catvar
===================================================================
RCS file: /var/cvs/xmldocs/docbook/symbol-templates/catvar,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- catvar 28 Mar 2006 11:59:45 -0000 1.3
+++ catvar 28 Mar 2006 13:19:41 -0000 1.4
@@ -9,7 +9,7 @@
<refnamediv>
<refname>$ag{"name"}</refname>
<refpurpose>$ag{"purpose"}</refpurpose>
-<refclass>$ag{"directive type"}</refclass>
+<refclass>$ag{"finegrained name"}</refclass>
</refnamediv>
<refsect1 id='$ag{"name"}_synopsis'>
1.4 +1 -1 xmldocs/docbook/symbol-templates/filter
rev 1.4, prev_rev 1.3
Index: filter
===================================================================
RCS file: /var/cvs/xmldocs/docbook/symbol-templates/filter,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- filter 28 Mar 2006 11:59:45 -0000 1.3
+++ filter 28 Mar 2006 13:19:41 -0000 1.4
@@ -9,7 +9,7 @@
<refnamediv>
<refname>$ag{"name"}</refname>
<refpurpose>$ag{"purpose"}</refpurpose>
-<refclass>$ag{"directive type"}</refclass>
+<refclass>$ag{"finegrained name"}</refclass>
</refnamediv>
<refsect1 id='$ag{"name"}_description'>
1.4 +1 -1 xmldocs/docbook/symbol-templates/globconf
rev 1.4, prev_rev 1.3
Index: globconf
===================================================================
RCS file: /var/cvs/xmldocs/docbook/symbol-templates/globconf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- globconf 28 Mar 2006 11:59:45 -0000 1.3
+++ globconf 28 Mar 2006 13:19:41 -0000 1.4
@@ -9,7 +9,7 @@
<refnamediv>
<refname>$ag{"name"}</refname>
<refpurpose>$ag{"purpose"}</refpurpose>
-<refclass>$ag{"directive type"}</refclass>
+<refclass>$ag{"finegrained name"}</refclass>
</refnamediv>
<refsect1 id='$ag{"name"}_synopsis'>
1.4 +1 -1 xmldocs/docbook/symbol-templates/globvar
rev 1.4, prev_rev 1.3
Index: globvar
===================================================================
RCS file: /var/cvs/xmldocs/docbook/symbol-templates/globvar,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- globvar 28 Mar 2006 11:59:45 -0000 1.3
+++ globvar 28 Mar 2006 13:19:41 -0000 1.4
@@ -9,7 +9,7 @@
<refnamediv>
<refname>$ag{"name"}</refname>
<refpurpose>$ag{"purpose"}</refpurpose>
-<refclass>$ag{"directive type"}</refclass>
+<refclass>$ag{"finegrained name"}</refclass>
</refnamediv>
<refsect1 id='$ag{"name"}_synopsis'>
1.4 +1 -1 xmldocs/docbook/symbol-templates/mv
rev 1.4, prev_rev 1.3
Index: mv
===================================================================
RCS file: /var/cvs/xmldocs/docbook/symbol-templates/mv,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mv 28 Mar 2006 11:59:45 -0000 1.3
+++ mv 28 Mar 2006 13:19:41 -0000 1.4
@@ -9,7 +9,7 @@
<refnamediv>
<refname>$ag{"name"}</refname>
<refpurpose>$ag{"purpose"}</refpurpose>
-<refclass>$ag{"directive type"}</refclass>
+<refclass>$ag{"finegrained name"}</refclass>
</refnamediv>
<refsect1 id='$ag{"name"}_synopsis'>
1.4 +1 -1 xmldocs/docbook/symbol-templates/ordercheck
rev 1.4, prev_rev 1.3
Index: ordercheck
===================================================================
RCS file: /var/cvs/xmldocs/docbook/symbol-templates/ordercheck,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ordercheck 28 Mar 2006 11:59:45 -0000 1.3
+++ ordercheck 28 Mar 2006 13:19:41 -0000 1.4
@@ -9,7 +9,7 @@
<refnamediv>
<refname>$ag{"name"}</refname>
<refpurpose>$ag{"purpose"}</refpurpose>
-<refclass>$ag{"directive type"}</refclass>
+<refclass>$ag{"finegrained name"}</refclass>
</refnamediv>
<refsect1 id='$ag{"name"}_description'>
1.4 +1 -1 xmldocs/docbook/symbol-templates/pragma
rev 1.4, prev_rev 1.3
Index: pragma
===================================================================
RCS file: /var/cvs/xmldocs/docbook/symbol-templates/pragma,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pragma 28 Mar 2006 11:59:45 -0000 1.3
+++ pragma 28 Mar 2006 13:19:41 -0000 1.4
@@ -9,7 +9,7 @@
<refnamediv>
<refname>$ag{"name"}</refname>
<refpurpose>$ag{"purpose"}</refpurpose>
-<refclass>$ag{"directive type"}</refclass>
+<refclass>$ag{"finegrained name"}</refclass>
</refnamediv>
<refsect1 id='$ag{"name"}_synopsis'>
1.4 +1 -1 xmldocs/docbook/symbol-templates/systemtag
rev 1.4, prev_rev 1.3
Index: systemtag
===================================================================
RCS file: /var/cvs/xmldocs/docbook/symbol-templates/systemtag,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- systemtag 28 Mar 2006 11:59:45 -0000 1.3
+++ systemtag 28 Mar 2006 13:19:41 -0000 1.4
@@ -9,7 +9,7 @@
<refnamediv>
<refname>$ag{"name"}</refname>
<refpurpose>$ag{"purpose"}</refpurpose>
-<refclass>$ag{"directive type"}</refclass>
+<refclass>$ag{"finegrained name"}</refclass>
</refnamediv>
<refsect1 id='$ag{"name"}_synopsis'>
1.4 +1 -1 xmldocs/docbook/symbol-templates/uitag
rev 1.4, prev_rev 1.3
Index: uitag
===================================================================
RCS file: /var/cvs/xmldocs/docbook/symbol-templates/uitag,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- uitag 28 Mar 2006 11:59:45 -0000 1.3
+++ uitag 28 Mar 2006 13:19:41 -0000 1.4
@@ -9,7 +9,7 @@
<refnamediv>
<refname>$ag{"name"}</refname>
<refpurpose>$ag{"purpose"}</refpurpose>
-<refclass>$ag{"directive type"}</refclass>
+<refclass>$ag{"finegrained name"}</refclass>
</refnamediv>
<refsect1 id='$ag{"name"}_synopsis'>
1.4 +1 -1 xmldocs/docbook/symbol-templates/usertag
rev 1.4, prev_rev 1.3
Index: usertag
===================================================================
RCS file: /var/cvs/xmldocs/docbook/symbol-templates/usertag,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- usertag 28 Mar 2006 11:59:45 -0000 1.3
+++ usertag 28 Mar 2006 13:19:41 -0000 1.4
@@ -9,7 +9,7 @@
<refnamediv>
<refname>$ag{"name"}</refname>
<refpurpose>$ag{"purpose"}</refpurpose>
-<refclass>$ag{"directive type"}</refclass>
+<refclass>$ag{"finegrained name"}</refclass>
</refnamediv>
<refsect1 id='$ag{"name"}_synopsis'>
More information about the docs
mailing list