Skip to content

Commit d7a33bb

Browse files
committed
[css2] <SPAN>s with class="noprint" or "dlink" are not printed.
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%401645
1 parent 1d7ca3b commit d7a33bb

2 files changed

Lines changed: 22 additions & 0 deletions

File tree

css2/bin/Attic/html2ps

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2515,6 +2515,17 @@ sub Subst{
25152515
$_="$dbeg$div)BR($dend";
25162516
}
25172517
}
2518+
# Don't print <SPAN> with class="noprint" or "dlink"
2519+
while(/<[sS][pP][aA][nN]\s[^>]*\b(noprint|dlink)\b/) {
2520+
$dbeg=$`;
2521+
$dend=$';
2522+
$dnum=1;
2523+
while($dnum>0 && $dend=~/<(\/?)[sS][pP][aA][nN]\b[^>]*>/) {
2524+
$dnum+= $1 eq '/' ? -1 : +1;
2525+
$dend=$';
2526+
}
2527+
$_=$dbeg.$dend;
2528+
}
25182529
s|<$C$R|)2 Al(|go;
25192530
s|</$C$R|)Ea(|go;
25202531
s|<(\w+)/([^/]+)/|<$1>$2</$1>|go;

css2/bin/html2ps

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2515,6 +2515,17 @@ sub Subst{
25152515
$_="$dbeg$div)BR($dend";
25162516
}
25172517
}
2518+
# Don't print <SPAN> with class="noprint" or "dlink"
2519+
while(/<[sS][pP][aA][nN]\s[^>]*\b(noprint|dlink)\b/) {
2520+
$dbeg=$`;
2521+
$dend=$';
2522+
$dnum=1;
2523+
while($dnum>0 && $dend=~/<(\/?)[sS][pP][aA][nN]\b[^>]*>/) {
2524+
$dnum+= $1 eq '/' ? -1 : +1;
2525+
$dend=$';
2526+
}
2527+
$_=$dbeg.$dend;
2528+
}
25182529
s|<$C$R|)2 Al(|go;
25192530
s|</$C$R|)Ea(|go;
25202531
s|<(\w+)/([^/]+)/|<$1>$2</$1>|go;

0 commit comments

Comments
 (0)