1313# <span class="propinst-name"><'name'></span>
1414#
1515# Ian Jacobs - ij@w3.org (Based on work by Arnaud Le Hors)
16- # $Id: pextr,v 1.25 2002-11-28 21:27:53 bbos Exp $
16+ # $Id: pextr,v 1.26 2003-01-17 21:27:31 bbos Exp $
1717#
1818
1919$PROGNAME = substr ($0 , rindex ($0 , " /" ) + 1);
@@ -80,12 +80,17 @@ print output "</dl>\n";
8080print output " </div>\n\n " ;
8181}
8282
83+ sub clean {
84+ $_ [0] =~ s / <([^>']*)>/ <span class=\" value-inst-$1 \" ><$1 ><\/ span>/ g ;
85+ $_ [0] =~ s / <[']([^']*)[']>/ <span class=\" propinst-$1 \" >'$1 '<\/ span>/ g ;
86+ $_ [0] =~ s /\{ ([^\} ]*)\} ([^{]*)\{\} / <a href=\" $1 \" >$2 <\/ a>/ g ;
87+ return $_ [0];
88+ }
89+
8390# Include an nbsp before TD since CSS not used to
8491# align tables yet.
8592sub format_values {
86- $values = $_ [0];
87- $values =~ s / <([^>']*)>/ <span class=\" value-inst-$1 \" ><$1 ><\/ span>/ g ;
88- $values =~ s / <[']([^']*)[']>/ <span class=\" propinst-$1 \" ><'$1 '><\/ span>/ g ;
93+ $values = clean($_ [0]);
8994$values =~ s / inherit/ <span class=\" value-inst-inherit\" >inherit<\/ span>/ g ;
9095print output " <tr valign=baseline>" ;
9196print output " <td><em>Value:</em> " ;
@@ -94,37 +99,32 @@ print output "<td>$values\n";
9499
95100sub format_init {
96101# Note that in the case of properties, <> are removed in text.
97- $init = $_ [0];
102+ $init = clean( $_ [0]) ;
98103$init =~ s / XX/ not defined for shorthand properties/ g ;
99- $init =~ s / <([^>']*)>/ <span class=\" value-inst-$1 \" ><$1 ><\/ span>/ g ;
100- $init =~ s / <[']([^']*)[']>/ <span class=\" propinst-$1 \" >'$1 '<\/ span>/ g ;
101104print output " <tr valign=baseline>" ;
102105print output " <td><em>Initial:</em> " ;
103106print output " <td>$init \n " ;
104107}
105108
106109sub format_applies {
107110# Note that in the case of properties, <> are removed in text.
108- $applies = $_ [0];
111+ $applies = clean( $_ [0]) ;
109112$applies =~ s /\* / all elements/ g ;
110- $applies =~ s / <([^>']*)>/ <span class=\" value-inst-$1 \" ><$1 ><\/ span>/ g ;
111- $applies =~ s / <[']([^']*)[']>/ <span class=\" propinst-$1 \" >'$1 '<\/ span>/ g ;
112113print output " <tr valign=baseline>" ;
113114print output " <td><em>Applies to:</em> " ;
114115print output " <td>$applies \n " ;
115116}
116117
117118sub format_inherited {
119+ $inherited = clean($_ [0]);
118120print output " <tr valign=baseline>" ;
119121print output " <td><em>Inherited:</em> " ;
120- print output " <td>$_ [0] \n " ;
122+ print output " <td>$inherited \n " ;
121123}
122124
123125sub format_percentages {
124126# Note that in the case of properties, <> are removed in text.
125- $perc = $_ [0];
126- $perc =~ s / <([^>']*)>/ <span class=\" value-inst-$1 \" ><$1 ><\/ span>/ g ;
127- $perc =~ s / <[']([^']*)[']>/ <span class=\" propinst-$1 \" >'$1 '<\/ span>/ g ;
127+ $perc = clean($_ [0]);
128128print output " <tr valign=baseline>" ;
129129print output " <td><em>Percentages:</em> " ;
130130print output " <td>$perc \n " ;
@@ -147,9 +147,7 @@ sub format_media {
147147}
148148
149149sub format_compval {
150- $values = $_ [0];
151- $values =~ s / <([^>']*)>/ <span class=\" value-inst-$1 \" ><$1 ><\/ span>/ g ;
152- $values =~ s / <[']([^']*)[']>/ <span class=\" propinst-$1 \" ><'$1 '><\/ span>/ g ;
150+ $values = clean($_ [0]);
153151$values =~ s / inherit/ <span class=\" value-inst-inherit\" >inherit<\/ span>/ g ;
154152print output " <tr valign=baseline>" ;
155153print output " <td><em>Computed value:</em> " ;
0 commit comments