Re: [docbook] Re: Announce: DocBook V5.0b1

[Michael Smith <smith@xml-doc.org>]

Sam Steingold <sds@gnu.org> writes:

> now it is not its own inverse (applied twice, some entities are still quoted).
> please test on
> http://cvs.sourceforge.net/viewcvs.py/*checkout*/clisp/clisp/doc/impext.xml

OK, I made another tweak to it. Checked in and patch below.

I tested on your file and it seems to work as expected. Let me
know if you see any problems.

  --Mike

Index: cloak
===================================================================
RCS file: /cvsroot/docbook/contrib/tools/cloak/cloak,v
retrieving revision 1.4
diff -u -r1.4 cloak
--- cloak       30 Oct 2005 08:27:04 -0000      1.4
+++ cloak       30 Oct 2005 13:46:59 -0000
@@ -55,7 +55,8 @@

     $lines = $lines . "\n<?" . $comment . " ?>\n";

-    $lines =~ s/(&\w+;)/<?ENT_ $1_ENT?>/g;      # cloak all entities
+    # cloak all entities
+    $lines =~ s/(\w*&[^;]+;\w*)|(&[^;]+;)/<?ENT_ $1_ENT?>/g;

     # uncloak entities in subset
     while ($lines =~ /(<!ENTITY[^']*?'[^']*?)<\?ENT_ (.+?)_ENT\?>(.*?'\s*>)/s) {


-- 
Michael Smith
http://sideshowbarker.net/

smime.p7s