Index: ccr/trunk/p/GPLXPATH.m
===================================================================
--- ccr/trunk/p/GPLXPATH.m	(revision 38)
+++ ccr/trunk/p/GPLXPATH.m	(revision 39)
@@ -364,64 +364,64 @@
 ;;><TEST>
 ;;><INIT>
-;;>>>K  GPL S GPL=""
-;;>>>D  PUSH^GPLXPATH("GPL","FIRST")
-;;>>>D  PUSH^GPLXPATH("GPL","SECOND")
-;;>>>D  PUSH^GPLXPATH("GPL","THIRD")
-;;>>>D  PUSH^GPLXPATH("GPL","FOURTH")
+;;>>>K GPL S GPL=""
+;;>>>D PUSH^GPLXPATH("GPL","FIRST")
+;;>>>D PUSH^GPLXPATH("GPL","SECOND")
+;;>>>D PUSH^GPLXPATH("GPL","THIRD")
+;;>>>D PUSH^GPLXPATH("GPL","FOURTH")
 ;;>>?GPL(0)=4
 ;;><INITXML>
-;;>>>K  GXML S GXML=""
-;;>>>D  PUSH^GPLXPATH("GXML","<FIRST>")
-;;>>>D  PUSH^GPLXPATH("GXML","<SECOND>")
-;;>>>D  PUSH^GPLXPATH("GXML","<THIRD>")
-;;>>>D  PUSH^GPLXPATH("GXML","<FOURTH>@@DATA1@@</FOURTH>")
-;;>>>D  PUSH^GPLXPATH("GXML","<FIFTH>")
-;;>>>D  PUSH^GPLXPATH("GXML","@@DATA2@@")
-;;>>>D  PUSH^GPLXPATH("GXML","</FIFTH>")
-;;>>>D  PUSH^GPLXPATH("GXML","<SIXTH ID=""SELF"" />")
-;;>>>D  PUSH^GPLXPATH("GXML","</THIRD>")
-;;>>>D  PUSH^GPLXPATH("GXML","<SECOND>")
-;;>>>D  PUSH^GPLXPATH("GXML","</SECOND>")
-;;>>>D  PUSH^GPLXPATH("GXML","</SECOND>")
-;;>>>D  PUSH^GPLXPATH("GXML","</FIRST>")
+;;>>>K GXML S GXML=""
+;;>>>D PUSH^GPLXPATH("GXML","<FIRST>")
+;;>>>D PUSH^GPLXPATH("GXML","<SECOND>")
+;;>>>D PUSH^GPLXPATH("GXML","<THIRD>")
+;;>>>D PUSH^GPLXPATH("GXML","<FOURTH>@@DATA1@@</FOURTH>")
+;;>>>D PUSH^GPLXPATH("GXML","<FIFTH>")
+;;>>>D PUSH^GPLXPATH("GXML","@@DATA2@@")
+;;>>>D PUSH^GPLXPATH("GXML","</FIFTH>")
+;;>>>D PUSH^GPLXPATH("GXML","<SIXTH ID=""SELF"" />")
+;;>>>D PUSH^GPLXPATH("GXML","</THIRD>")
+;;>>>D PUSH^GPLXPATH("GXML","<SECOND>")
+;;>>>D PUSH^GPLXPATH("GXML","</SECOND>")
+;;>>>D PUSH^GPLXPATH("GXML","</SECOND>")
+;;>>>D PUSH^GPLXPATH("GXML","</FIRST>")
 ;;><INITXML2>
-;;>>>K  GXML S GXML=""
-;;>>>D  PUSH^GPLXPATH("GXML","<FIRST>")
-;;>>>D  PUSH^GPLXPATH("GXML","<SECOND>")
-;;>>>D  PUSH^GPLXPATH("GXML","<THIRD>")
-;;>>>D  PUSH^GPLXPATH("GXML","<FOURTH>DATA1</FOURTH>")
-;;>>>D  PUSH^GPLXPATH("GXML","<FOURTH>")
-;;>>>D  PUSH^GPLXPATH("GXML","DATA2")
-;;>>>D  PUSH^GPLXPATH("GXML","</FOURTH>")
-;;>>>D  PUSH^GPLXPATH("GXML","</THIRD>")
-;;>>>D  PUSH^GPLXPATH("GXML","<_SECOND>")
-;;>>>D  PUSH^GPLXPATH("GXML","<FOURTH>DATA3</FOURTH>")
-;;>>>D  PUSH^GPLXPATH("GXML","</_SECOND>")
-;;>>>D  PUSH^GPLXPATH("GXML","</SECOND>")
-;;>>>D  PUSH^GPLXPATH("GXML","</FIRST>")
+;;>>>K GXML S GXML=""
+;;>>>D PUSH^GPLXPATH("GXML","<FIRST>")
+;;>>>D PUSH^GPLXPATH("GXML","<SECOND>")
+;;>>>D PUSH^GPLXPATH("GXML","<THIRD>")
+;;>>>D PUSH^GPLXPATH("GXML","<FOURTH>DATA1</FOURTH>")
+;;>>>D PUSH^GPLXPATH("GXML","<FOURTH>")
+;;>>>D PUSH^GPLXPATH("GXML","DATA2")
+;;>>>D PUSH^GPLXPATH("GXML","</FOURTH>")
+;;>>>D PUSH^GPLXPATH("GXML","</THIRD>")
+;;>>>D PUSH^GPLXPATH("GXML","<_SECOND>")
+;;>>>D PUSH^GPLXPATH("GXML","<FOURTH>DATA3</FOURTH>")
+;;>>>D PUSH^GPLXPATH("GXML","</_SECOND>")
+;;>>>D PUSH^GPLXPATH("GXML","</SECOND>")
+;;>>>D PUSH^GPLXPATH("GXML","</FIRST>")
 ;;><PUSHPOP>
-;;>>>D  ZLOAD^GPLUNIT("ZTMP","GPLXPATH")
-;;>>>D  ZTEST^GPLUNIT(.ZTMP,"INIT")
+;;>>>D ZLOAD^GPLUNIT("ZTMP","GPLXPATH")
+;;>>>D ZTEST^GPLUNIT(.ZTMP,"INIT")
 ;;>>?GPL(GPL(0))="FOURTH"
-;;>>>D  POP^GPLXPATH("GPL",.GX)
+;;>>>D POP^GPLXPATH("GPL",.GX)
 ;;>>?GX="FOURTH"
 ;;>>?GPL(GPL(0))="THIRD"
-;;>>>D  POP^GPLXPATH("GPL",.GX)
+;;>>>D POP^GPLXPATH("GPL",.GX)
 ;;>>?GX="THIRD"
 ;;>>?GPL(GPL(0))="SECOND"
 ;;><MKMDX>
-;;>>>D  ZLOAD^GPLUNIT("ZTMP","GPLXPATH")
-;;>>>D  ZTEST^GPLUNIT(.ZTMP,"INIT")
-;;>>>S  GX=""
-;;>>>D  MKMDX^GPLXPATH("GPL",.GX)
+;;>>>D ZLOAD^GPLUNIT("ZTMP","GPLXPATH")
+;;>>>D ZTEST^GPLUNIT(.ZTMP,"INIT")
+;;>>>S GX=""
+;;>>>D MKMDX^GPLXPATH("GPL",.GX)
 ;;>>?GX="//FIRST/SECOND/THIRD/FOURTH"
 ;;><XNAME>
 ;;>>?$$XNAME^GPLXPATH("<FOURTH>DATA1</FOURTH>")="FOURTH"
-;;>>?$$XNAME^GPLXPATH("<SIXTH   ID=""SELF"" />")="SIXTH"
+;;>>?$$XNAME^GPLXPATH("<SIXTH  ID=""SELF"" />")="SIXTH"
 ;;>>?$$XNAME^GPLXPATH("</THIRD>")="THIRD"
 ;;><INDEX>
-;;>>>D  ZLOAD^GPLUNIT("ZTMP","GPLXPATH")
-;;>>>D  ZTEST^GPLUNIT(.ZTMP,"INITXML")
-;;>>>D  INDEX^GPLXPATH("GXML")
+;;>>>D ZLOAD^GPLUNIT("ZTMP","GPLXPATH")
+;;>>>D ZTEST^GPLUNIT(.ZTMP,"INITXML")
+;;>>>D INDEX^GPLXPATH("GXML")
 ;;>>?GXML("//FIRST/SECOND")="2^12"
 ;;>>?GXML("//FIRST/SECOND/THIRD")="3^9"
@@ -432,6 +432,6 @@
 ;;>>?GXML("//FIRST")="1^13"
 ;;><INDEX2>
-;;>>>D  ZTEST^GPLXPATH("INITXML2")
-;;>>>D  INDEX^GPLXPATH("GXML")
+;;>>>D ZTEST^GPLXPATH("INITXML2")
+;;>>>D INDEX^GPLXPATH("GXML")
 ;;>>?GXML("//FIRST/SECOND")="2^12"
 ;;>>?GXML("//FIRST/SECOND/_SECOND")="9^11"
@@ -441,82 +441,82 @@
 ;;>>?GXML("//FIRST")="1^13"
 ;;><MISSING>
-;;>>>D  ZTEST^GPLXPATH("INITXML")
-;;>>>S  OUTARY="^TMP($J,""MISSINGTEST"")"
-;;>>>D  MISSING^GPLXPATH("GXML",OUTARY)
+;;>>>D ZTEST^GPLXPATH("INITXML")
+;;>>>S OUTARY="^TMP($J,""MISSINGTEST"")"
+;;>>>D MISSING^GPLXPATH("GXML",OUTARY)
 ;;>>?@OUTARY@(1)="DATA1"
 ;;>>?@OUTARY@(2)="DATA2"
 ;;><MAP>
-;;>>>D  ZTEST^GPLXPATH("INITXML")
-;;>>>S  MAPARY="^TMP($J,""MAPVALUES"")"
-;;>>>S  OUTARY="^TMP($J,""MAPTEST"")"
-;;>>>S  @MAPARY@("DATA2")="VALUE2"
-;;>>>D  MAP^GPLXPATH("GXML",MAPARY,OUTARY)
+;;>>>D ZTEST^GPLXPATH("INITXML")
+;;>>>S MAPARY="^TMP($J,""MAPVALUES"")"
+;;>>>S OUTARY="^TMP($J,""MAPTEST"")"
+;;>>>S @MAPARY@("DATA2")="VALUE2"
+;;>>>D MAP^GPLXPATH("GXML",MAPARY,OUTARY)
 ;;>>?@OUTARY@(6)="VALUE2"
 ;;><QUEUE>
-;;>>>D  QUEUE^GPLXPATH("BTLIST","GXML",2,3)
-;;>>>D  QUEUE^GPLXPATH("BTLIST","GXML",4,5)
+;;>>>D QUEUE^GPLXPATH("BTLIST","GXML",2,3)
+;;>>>D QUEUE^GPLXPATH("BTLIST","GXML",4,5)
 ;;>>?$P(BTLIST(2),";",2)=4
 ;;><BUILD>
-;;>>>D  ZTEST^GPLXPATH("INITXML")
-;;>>>D  QUERY^GPLXPATH("GXML","//FIRST/SECOND/THIRD/FOURTH","G2")
-;;>>>D  ZTEST^GPLXPATH("QUEUE")
-;;>>>D  BUILD^GPLXPATH("BTLIST","G3")
+;;>>>D ZTEST^GPLXPATH("INITXML")
+;;>>>D QUERY^GPLXPATH("GXML","//FIRST/SECOND/THIRD/FOURTH","G2")
+;;>>>D ZTEST^GPLXPATH("QUEUE")
+;;>>>D BUILD^GPLXPATH("BTLIST","G3")
 ;;><CP>
-;;>>>D  ZTEST^GPLXPATH("INITXML")
-;;>>>D  CP^GPLXPATH("GXML","G2")
+;;>>>D ZTEST^GPLXPATH("INITXML")
+;;>>>D CP^GPLXPATH("GXML","G2")
 ;;>>?G2(0)=13
 ;;><QOPEN>
-;;>>>K  G2,GBL
-;;>>>D  ZTEST^GPLXPATH("INITXML")
-;;>>>D  QOPEN^GPLXPATH("GBL","GXML")
+;;>>>K G2,GBL
+;;>>>D ZTEST^GPLXPATH("INITXML")
+;;>>>D QOPEN^GPLXPATH("GBL","GXML")
 ;;>>?$P(GBL(1),";",3)=12
-;;>>>D  BUILD^GPLXPATH("GBL","G2")
+;;>>>D BUILD^GPLXPATH("GBL","G2")
 ;;>>?G2(G2(0))="</SECOND>"
 ;;><QOPEN2>
-;;>>>K  G2,GBL
-;;>>>D  ZTEST^GPLXPATH("INITXML")
-;;>>>D  QOPEN^GPLXPATH("GBL","GXML","//FIRST/SECOND")
+;;>>>K G2,GBL
+;;>>>D ZTEST^GPLXPATH("INITXML")
+;;>>>D QOPEN^GPLXPATH("GBL","GXML","//FIRST/SECOND")
 ;;>>?$P(GBL(1),";",3)=11
-;;>>>D  BUILD^GPLXPATH("GBL","G2")
+;;>>>D BUILD^GPLXPATH("GBL","G2")
 ;;>>?G2(G2(0))="</SECOND>"
 ;;><QCLOSE>
-;;>>>K  G2,GBL
-;;>>>D  ZTEST^GPLXPATH("INITXML")
-;;>>>D  QCLOSE^GPLXPATH("GBL","GXML")
+;;>>>K G2,GBL
+;;>>>D ZTEST^GPLXPATH("INITXML")
+;;>>>D QCLOSE^GPLXPATH("GBL","GXML")
 ;;>>?$P(GBL(1),";",3)=13
-;;>>>D  BUILD^GPLXPATH("GBL","G2")
+;;>>>D BUILD^GPLXPATH("GBL","G2")
 ;;>>?G2(G2(0))="</FIRST>"
 ;;><QCLOSE2>
-;;>>>K  G2,GBL
-;;>>>D  ZTEST^GPLXPATH("INITXML")
-;;>>>D  QCLOSE^GPLXPATH("GBL","GXML","//FIRST/SECOND/THIRD")
+;;>>>K G2,GBL
+;;>>>D ZTEST^GPLXPATH("INITXML")
+;;>>>D QCLOSE^GPLXPATH("GBL","GXML","//FIRST/SECOND/THIRD")
 ;;>>?$P(GBL(1),";",3)=13
-;;>>>D  BUILD^GPLXPATH("GBL","G2")
+;;>>>D BUILD^GPLXPATH("GBL","G2")
 ;;>>?G2(G2(0))="</FIRST>"
 ;;>>?G2(1)="</THIRD>"
 ;;><INSERT>
-;;>>>K  G2,GBL,G3,G4
-;;>>>D  ZTEST^GPLXPATH("INITXML")
-;;>>>D  QUERY^GPLXPATH("GXML","//FIRST/SECOND/THIRD/FIFTH","G2")
-;;>>>D  INSERT^GPLXPATH("GXML","G2","//FIRST/SECOND/THIRD")
-;;>>>D  INSERT^GPLXPATH("G3","G2","//")
+;;>>>K G2,GBL,G3,G4
+;;>>>D ZTEST^GPLXPATH("INITXML")
+;;>>>D QUERY^GPLXPATH("GXML","//FIRST/SECOND/THIRD/FIFTH","G2")
+;;>>>D INSERT^GPLXPATH("GXML","G2","//FIRST/SECOND/THIRD")
+;;>>>D INSERT^GPLXPATH("G3","G2","//")
 ;;>>?G2(1)=GXML(9)
 ;;><REPLACE>
-;;>>>K  G2,GBL,G3
-;;>>>D  ZTEST^GPLXPATH("INITXML")
-;;>>>D  QUERY^GPLXPATH("GXML","//FIRST/SECOND/THIRD/FIFTH","G2")
-;;>>>D  REPLACE^GPLXPATH("GXML","G2","//FIRST/SECOND")
+;;>>>K G2,GBL,G3
+;;>>>D ZTEST^GPLXPATH("INITXML")
+;;>>>D QUERY^GPLXPATH("GXML","//FIRST/SECOND/THIRD/FIFTH","G2")
+;;>>>D REPLACE^GPLXPATH("GXML","G2","//FIRST/SECOND")
 ;;>>?GXML(3)="<FIFTH>"
 ;;><INSINNER>
-;;>>>K  GXML,G2,GBL,G3
-;;>>>D  ZTEST^GPLXPATH("INITXML")
-;;>>>D  QUERY^GPLXPATH("GXML","//FIRST/SECOND/THIRD","G2")
-;;>>>D  INSINNER^GPLXPATH("GXML","G2","//FIRST/SECOND/THIRD")
+;;>>>K GXML,G2,GBL,G3
+;;>>>D ZTEST^GPLXPATH("INITXML")
+;;>>>D QUERY^GPLXPATH("GXML","//FIRST/SECOND/THIRD","G2")
+;;>>>D INSINNER^GPLXPATH("GXML","G2","//FIRST/SECOND/THIRD")
 ;;>>?GXML(10)="<FIFTH>"
 ;;><INSINNER2>
-;;>>>K  GXML,G2,GBL,G3
-;;>>>D  ZTEST^GPLXPATH("INITXML")
-;;>>>D  QUERY^GPLXPATH("GXML","//FIRST/SECOND/THIRD","G2")
-;;>>>D  INSINNER^GPLXPATH("G2","G2")
+;;>>>K GXML,G2,GBL,G3
+;;>>>D ZTEST^GPLXPATH("INITXML")
+;;>>>D QUERY^GPLXPATH("GXML","//FIRST/SECOND/THIRD","G2")
+;;>>>D INSINNER^GPLXPATH("G2","G2")
 ;;>>?G2(8)="<FIFTH>"
 ;;></TEST>