rpms/docbook-utils/F-9 docbook-utils-docbook2man-pl-sdata.patch, NONE, 1.1 docbook-utils.spec, 1.28, 1.29
Ondrej Vasik
ovasik at fedoraproject.org
Wed Sep 10 11:58:41 UTC 2008
Author: ovasik
Update of /cvs/extras/rpms/docbook-utils/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv904
Modified Files:
docbook-utils.spec
Added Files:
docbook-utils-docbook2man-pl-sdata.patch
Log Message:
added many sdata entities to docbook2man-spec.pl, do not consider missing sdata as an error, just spawn warning (#460921)
docbook-utils-docbook2man-pl-sdata.patch:
--- NEW FILE docbook-utils-docbook2man-pl-sdata.patch ---
diff -urNp docbook-utils-0.6.14-orig/helpers/docbook2man-spec.pl docbook-utils-0.6.14/helpers/docbook2man-spec.pl
--- docbook-utils-0.6.14-orig/helpers/docbook2man-spec.pl 2008-09-10 13:12:23.000000000 +0200
+++ docbook-utils-0.6.14/helpers/docbook2man-spec.pl 2008-09-10 13:21:21.000000000 +0200
@@ -1168,17 +1168,268 @@ sgml('<XREF>', sub {
########################################################################
#
-# Other handlers
+# SDATA
#
########################################################################
-man_sgml('|[lt ]|', '<');
-man_sgml('|[gt ]|', '>');
-man_sgml('|[amp ]|', '&');
man_sgml('|[minus ]|', '-');
man_sgml('|[copy ]|', '(C)');
man_sgml('|[nbsp ]|', '\~');
man_sgml('|[thinsp]|', '\~');
+man_sgml('|[lt ]|', '<');
+man_sgml('|[equals]|', '=');
+man_sgml('|[gt ]|', '>');
+man_sgml('|[plus ]|', '\(pl');
+man_sgml('|[dollar]|', '$');
+man_sgml('|[num ]|', '#');
+man_sgml('|[percnt]|', '%');
+man_sgml('|[amp ]|', '&');
+man_sgml('|[commat]|', '@');
+man_sgml('|[lsqb ]|', '[');
+man_sgml('|[bsol ]|', '\e');
+man_sgml('|[rsqb ]|', ']');
+man_sgml('|[lcub ]|', '{');
+man_sgml('|[verbar]|', '\(or');
+man_sgml('|[rcub ]|', '}');
+man_sgml('|[excl ]|', '!');
+man_sgml('|[quot ]|', '"');
+man_sgml('|[apos ]|', '\\&\'');
+man_sgml('|[lpar ]|', '(');
+man_sgml('|[rpar ]|', ')');
+man_sgml('|[comma ]|', ',');
+man_sgml('|[lowbar]|', '_');
+man_sgml('|[period]|', '.');
+man_sgml('|[sol ]|', '/');
+man_sgml('|[colon ]|', ':');
+man_sgml('|[semi ]|', ';');
+man_sgml('|[quest ]|', '?');
+man_sgml('|[grave ]|', '`');
+man_sgml('|[tilde ]|', '~');
+man_sgml('|[half ]|', '\(12');
+man_sgml('|[frac12]|', '\(12');
+man_sgml('|[frac14]|', '\(14');
+man_sgml('|[frac34]|', '\(34');
+man_sgml('|[frac18]|', '1/8');
+man_sgml('|[frac38]|', '3/8');
+man_sgml('|[frac58]|', '5/8');
+man_sgml('|[frac78]|', '7/8');
+man_sgml('|[sup1 ]|', '\u1\l');
+man_sgml('|[sup2 ]|', '\u2\l');
+man_sgml('|[sup3 ]|', '\u3\l');
+man_sgml('|[plusmn]|', '\(+-');
+man_sgml('|[divide]|', '\(di');
+man_sgml('|[times ]|', '\(ti');
+man_sgml('|[pound ]|', '#');
+man_sgml('|[cent ]|', '\(ct');
+man_sgml('|[yen ]|', 'yen');
+man_sgml('|[ast ]|', '*');
+man_sgml('|[horbar]|', '_');
+man_sgml('|[micro ]|', '\(*m');
+man_sgml('|[ohm ]|', '\(*W');
+man_sgml('|[deg ]|', '\(de');
+man_sgml('|[sect ]|', '\(sc');
+man_sgml('|[larr ]|', '\(<-');
+man_sgml('|[rarr ]|', '\(->');
+man_sgml('|[uarr ]|', '\(ua');
+man_sgml('|[darr ]|', '\(da');
+man_sgml('|[reg ]|', '\(rg');
+man_sgml('|[trade ]|', '\(tm');
+man_sgml('|[brvbar]|', '|');
+man_sgml('|[not ]|', '\(no');
+man_sgml('|[hyphen]|', '\-');
+man_sgml('|[laquo ]|', '<<');
+man_sgml('|[raquo ]|', '>>');
+man_sgml('|[lsquo ]|', '`');
+man_sgml('|[rsquo ]|', '\&\'');
+man_sgml('|[ldquo ]|', '"');
+man_sgml('|[rdquo ]|', '"');
+man_sgml('|[shy ]|', '\%');
+man_sgml('|[emsp ]|', '\ \ ');
+man_sgml('|[ensp ]|', '\ ');
+man_sgml('|[emsp3 ]|', '\ ');
+man_sgml('|[emsp4 ]|', '\ ');
+man_sgml('|[numsp ]|', '\0');
+man_sgml('|[puncsp]|', '\|');
+man_sgml('|[hairsp]|', '\\^');
+man_sgml('|[mdash ]|', '\(em');
+man_sgml('|[ndash ]|', '-');
+man_sgml('|[dash ]|', '-');
+man_sgml('|[blank ]|', '\ ');
+man_sgml('|[hellip]|', '\&...');
+man_sgml('|[nldr ]|', '\&..');
+man_sgml('|[frac13]|', '1/3');
+man_sgml('|[frac23]|', '2/3');
+man_sgml('|[frac15]|', '1/5');
+man_sgml('|[frac25]|', '2/5');
+man_sgml('|[frac35]|', '3/5');
+man_sgml('|[frac45]|', '4/5');
+man_sgml('|[frac16]|', '1/6');
+man_sgml('|[frac56]|', '5/6');
+man_sgml('|[cir ]|', '\(ci');
+man_sgml('|[squ ]|', '\(sq');
+man_sgml('|[star ]|', '\(**');
+man_sgml('|[bull ]|', '\(bu');
+man_sgml('|[dagger]|', '\(dg');
+man_sgml('|[Dagger]|', '\(dd');
+man_sgml('|[caret ]|', '\^');
+man_sgml('|[lsquor]|', '`');
+man_sgml('|[ldquor]|', '``');
+man_sgml('|[fflig ]|', '\(ff');
+man_sgml('|[filig ]|', '\(fi');
+man_sgml('|[ffilig]|', '\(Fi');
+man_sgml('|[ffllig]|', '\(Fl');
+man_sgml('|[fllig ]|', '\(fl');
+man_sgml('|[rdquor]|', '\&\'\'');
+man_sgml('|[rsquor]|', '\&\'');
+man_sgml('|[vellip]|', '\&...');
+man_sgml('|[aacute]|', '\(a\'');
+man_sgml('|[Aacute]|', '\(A\'');
+man_sgml('|[acirc ]|', '\(a^');
+man_sgml('|[Acirc ]|', '\(A^');
+man_sgml('|[agrave]|', '\(a`');
+man_sgml('|[Agrave]|', '\(A`');
+man_sgml('|[auml ]|', '\(a:');
+man_sgml('|[aelig ]|', '\(ae');
+man_sgml('|[AElig ]|', '\(AE');
+man_sgml('|[eacute]|', '\(e\'');
+man_sgml('|[Eacute]|', '\(E\'');
+man_sgml('|[egrave]|', '\(e`');
+man_sgml('|[Egrave]|', '\(E`');
+man_sgml('|[iacute]|', '\(i\'');
+man_sgml('|[Iacute]|', '\(I\'');
+man_sgml('|[igrave]|', '\(i`');
+man_sgml('|[Igrave]|', '\(I`');
+man_sgml('|[ntilde]|', '\(n~');
+man_sgml('|[Ntilde]|', '\(N~');
+man_sgml('|[oacute]|', '\(o\'');
+man_sgml('|[Oacute]|', '\(O\'');
+man_sgml('|[ograve]|', '\(o`');
+man_sgml('|[Ograve]|', '\(O`');
+man_sgml('|[oslash]|', '\(o/');
+man_sgml('|[Oslash]|', '\(O/');
+man_sgml('|[szlig ]|', '\(ss');
+man_sgml('|[thorn ]|', '\(th');
+man_sgml('|[uacute]|', '\(u\'');
+man_sgml('|[Uacute]|', '\(U\'');
+man_sgml('|[ugrave]|', '\(u`');
+man_sgml('|[Ugrave]|', '\(U`');
+man_sgml('|[aogon ]|', '\(ao');
+man_sgml('|[agr ]|', '\(*a');
+man_sgml('|[Agr ]|', '\(*A');
+man_sgml('|[bgr ]|', '\(*b');
+man_sgml('|[Bgr ]|', '\(*B');
+man_sgml('|[ggr ]|', '\(*g');
+man_sgml('|[Ggr ]|', '\(*G');
+man_sgml('|[dgr ]|', '\(*d');
+man_sgml('|[Dgr ]|', '\(*D');
+man_sgml('|[egr ]|', '\(*e');
+man_sgml('|[Egr ]|', '\(*E');
+man_sgml('|[zgr ]|', '\(*z');
+man_sgml('|[Zgr ]|', '\(*Z');
+man_sgml('|[eegr ]|', '\(*y');
+man_sgml('|[EEgr ]|', '\(*Y');
+man_sgml('|[thgr ]|', '\(*h');
+man_sgml('|[THgr ]|', '\(*H');
+man_sgml('|[igr ]|', '\(*i');
+man_sgml('|[Igr ]|', '\(*I');
+man_sgml('|[kgr ]|', '\(*k');
+man_sgml('|[Kgr ]|', '\(*K');
+man_sgml('|[lgr ]|', '\(*l');
+man_sgml('|[Lgr ]|', '\(*L');
+man_sgml('|[mgr ]|', '\(*m');
+man_sgml('|[Mgr ]|', '\(*M');
+man_sgml('|[ngr ]|', '\(*n');
+man_sgml('|[Ngr ]|', '\(*N');
+man_sgml('|[xgr ]|', '\(*c');
+man_sgml('|[Xgr ]|', '\(*C');
+man_sgml('|[ogr ]|', '\(*o');
+man_sgml('|[Ogr ]|', '\(*O');
+man_sgml('|[pgr ]|', '\(*p');
+man_sgml('|[Pgr ]|', '\(*P');
+man_sgml('|[rgr ]|', '\(*r');
+man_sgml('|[Rgr ]|', '\(*R');
+man_sgml('|[sgr ]|', '\(*s');
+man_sgml('|[Sgr ]|', '\(*S');
+man_sgml('|[sfgr ]|', '\(ts');
+man_sgml('|[tgr ]|', '\(*t');
+man_sgml('|[Tgr ]|', '\(*T');
+man_sgml('|[ugr ]|', '\(*u');
+man_sgml('|[Ugr ]|', '\(*U');
+man_sgml('|[phgr ]|', '\(*f');
+man_sgml('|[PHgr ]|', '\(*F');
+man_sgml('|[khgr ]|', '\(*x');
+man_sgml('|[KHgr ]|', '\(*X');
+man_sgml('|[psgr ]|', '\(*q');
+man_sgml('|[PSgr ]|', '\(*Q');
+man_sgml('|[ohgr ]|', '\(*w');
+man_sgml('|[OHgr ]|', '\(*W');
+man_sgml('|[alpha ]|', '\(*a');
+man_sgml('|[beta ]|', '\(*b');
+man_sgml('|[gamma ]|', '\(*g');
+man_sgml('|[Gamma ]|', '\(*G');
+man_sgml('|[delta ]|', '\(*d');
+man_sgml('|[Delta ]|', '\(*D');
+man_sgml('|[epsi ]|', '\(*e');
+man_sgml('|[epsis ]|', '\(*e');
+man_sgml('|[zeta ]|', '\(*z');
+man_sgml('|[eta ]|', '\(*y');
+man_sgml('|[thetas]|', '\(*h');
+man_sgml('|[Theta ]|', '\(*H');
+man_sgml('|[iota ]|', '\(*i');
+man_sgml('|[kappa ]|', '\(*k');
+man_sgml('|[lambda]|', '\(*l');
+man_sgml('|[Lambda]|', '\(*L');
+man_sgml('|[mu ]|', '\(*m');
+man_sgml('|[nu ]|', '\(*n');
+man_sgml('|[xi ]|', '\(*c');
+man_sgml('|[Xi ]|', '\(*C');
+man_sgml('|[pi ]|', '\(*p');
+man_sgml('|[Pi ]|', '\(*P');
+man_sgml('|[rho ]|', '\(*r');
+man_sgml('|[sigma ]|', '\(*s');
+man_sgml('|[Sigma ]|', '\(*S');
+man_sgml('|[tau ]|', '\(*t');
+man_sgml('|[upsi ]|', '\(*u');
+man_sgml('|[Upsi ]|', '\(*U');
+man_sgml('|[phis ]|', '\(*f');
+man_sgml('|[Phi ]|', '\(*F');
+man_sgml('|[chi ]|', '\(*x');
+man_sgml('|[psi ]|', '\(*q');
+man_sgml('|[Psi ]|', '\(*X');
+man_sgml('|[omega ]|', '\(*w');
+man_sgml('|[Omega ]|', '\(*W');
+man_sgml('|[ap ]|', '\(ap');
+man_sgml('|[equiv ]|', '\(==');
+man_sgml('|[ge ]|', '\(>=');
+man_sgml('|[infin ]|', '\(if');
+man_sgml('|[isin ]|', '\(sb');
+man_sgml('|[le ]|', '\(<=');
+man_sgml('|[ne ]|', '\(!=');
+man_sgml('|[prop ]|', '\(pt');
+man_sgml('|[square]|', '\(sq');
+man_sgml('|[sub ]|', '\(sb');
+man_sgml('|[sube ]|', '\(ib');
+man_sgml('|[sup ]|', '\(sp');
+man_sgml('|[supe ]|', '\(ip');
+man_sgml('|[acute ]|', '\&\'');
+man_sgml('|[breve ]|', '\(be');
+man_sgml('|[caron ]|', '\(hc');
+man_sgml('|[cedil ]|', '\(cd');
+man_sgml('|[dot ]|', '\(dt');
+man_sgml('|[macr ]|', '\(ma');
+man_sgml('|[ogon ]|', '\(og');
+man_sgml('|[ring ]|', '\(ri');
+man_sgml('|[uml ]|', '\(..');
+
+sgml('sdata',sub {
+ my ($element, $event) = @_;
+ my ($file, $line) = ($event->file, $event->line);
+ man_output "|[", $_[0], "]|";
+ warn "Warning: unrecognized SDATA '$_[0]'"
+ . ($file && $line ? " in $file on line $line" : "")
+ . ": please add definition to docbook2man-spec.pl\n";
+});
+
#
# Default handlers (uncomment these if needed). Right now, these are set
@@ -1236,15 +1487,11 @@ sgml('re', sub
$newline_last = 1;
});
-sgml('sdata',sub
-{
- die "Unknown SDATA: " . $_[0];
-});
-sgml('pi',sub { die "Unknown processing instruction: " . $_[0]; });
+sgml('pi',sub {});
sgml('entity',sub { die "Unknown external entity: " . $_[0]->name; });
sgml('start_subdoc',sub { die "Unknown subdoc entity: " . $_[0]->name; });
-sgml('end_subdoc','');
-sgml('conforming','');
+sgml('end_subdoc',sub{});
+sgml('conforming',sub{});
1;
Index: docbook-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-utils/F-9/docbook-utils.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- docbook-utils.spec 22 Nov 2007 15:09:12 -0000 1.28
+++ docbook-utils.spec 10 Sep 2008 11:58:11 -0000 1.29
@@ -1,6 +1,6 @@
Name: docbook-utils
Version: 0.6.14
-Release: 13%{?dist}
+Release: 14%{?dist}
Group: Applications/Text
Summary: Shell scripts for managing DocBook documents
@@ -29,6 +29,7 @@
Patch1: docbook-utils-funcsynopsis.patch
Patch2: docbook-utils-2ndspaces.patch
Patch3: docbook-utils-w3mtxtconvert.patch
+Patch4: docbook-utils-docbook2man-pl-sdata.patch
%description
This package contains scripts are for easy conversion from DocBook
@@ -56,6 +57,7 @@
%patch1 -p1 -b .0
%patch2 -p1 -b .2ndspaces
%patch3 -p1 -b .w3mtxtconvert
+%patch4 -p1 -b .sdata
%build
./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir}
@@ -122,6 +124,11 @@
%{_mandir}/*/docbook2ps.*
%changelog
+* Wed Sep 10 2008 Ondrej Vasik <ovasik at redhat.com> 0.6.14-14
+- added many sdata entities to docbook2man-spec.pl (all from
+ latest upstream docbook2X), do not consider missing sdata
+ as error (just warning) - #460921
+
* Thu Nov 22 2007 Ondrej Vasik <ovasik at redhat.com> 0.6.14-13
- fix of w3m params while converting to txt
More information about the fedora-extras-commits
mailing list