5. Araxis Merge File Comparison Report

Produced by Araxis Merge on Mon May 18 06:28:23 2009 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

5.1 Files compared

# Location File Last Modified
1 D:\Dolphin-v.6.1.5\groups\orca\layout\uni\xsl canvas.xsl Thu Apr 23 04:14:24 2009 UTC
2 D:\Dolphin-v.6.1.6\groups\orca\layout\uni\xsl canvas.xsl Wed May 13 11:59:35 2009 UTC

5.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 2 108
Changed 0 0
Inserted 1 2
Removed 0 0

5.3 Comparison options

Whitespace All differences in whitespace within lines are ignored
Character case Differences in character case are ignored
Line endings Differences in line endings (CR and LF characters) are significant
CR/LF characters Not shown in the comparison detail

5.4 Active regular expressions

No regular expressions were active.

5.5 Comparison detail

1   <xsl:style sheet vers ion="1.0"  xmlns:xsl= "http://ww w.w3.org/1 999/XSL/Tr ansform" x mlns="http ://www.w3. org/1999/x html">   1   <xsl:style sheet vers ion="1.0"  xmlns:xsl= "http://ww w.w3.org/1 999/XSL/Tr ansform" x mlns="http ://www.w3. org/1999/x html">
2     2  
3   <xsl:inclu de href="c anvas_incl udes.xsl"  />   3   <xsl:inclu de href="c anvas_incl udes.xsl"  />
4   <xsl:inclu de href=". ./../base/ xsl/canvas _init.xsl"  />   4   <xsl:inclu de href=". ./../base/ xsl/canvas _init.xsl"  />
5     5  
6   <xsl:templ ate match= "root">   6   <xsl:templ ate match= "root">
7   <html xmln s="http:// www.w3.org /1999/xhtm l" xml:lan g="en-US"  lang="en-U S">   7   <html xmln s="http:// www.w3.org /1999/xhtm l" xml:lan g="en-US"  lang="en-U S">
8   <head>   8   <head>
9   <meta http -equiv="Co ntent-Type " content= "text/html ; charset= utf-8" />   9   <meta http -equiv="Co ntent-Type " content= "text/html ; charset= utf-8" />
10   <title>   10   <title>
11           <x sl:choose>   11           <x sl:choose>
12                    <xsl :when test ="string-l ength(/roo t/page/pos ts/topic/t itle) &gt;  0">   12                    <xsl :when test ="string-l ength(/roo t/page/pos ts/topic/t itle) &gt;  0">
13                             <xsl:v alue-of se lect="/roo t/page/pos ts/topic/t itle" /> [ L[Orca For um]]   13                             <xsl:v alue-of se lect="/roo t/page/pos ts/topic/t itle" /> [ L[Orca For um]]
14                    </xs l:when>   14                    </xs l:when>
15                    <xsl :when test ="string-l ength(/roo t/page/top ics/forum/ title) &gt ; 0">   15                    <xsl :when test ="string-l ength(/roo t/page/top ics/forum/ title) &gt ; 0">
16                             <xsl:v alue-of se lect="/roo t/page/top ics/forum/ title" />  [L[Orca Fo rum]]   16                             <xsl:v alue-of se lect="/roo t/page/top ics/forum/ title" />  [L[Orca Fo rum]]
17                    </xs l:when>   17                    </xs l:when>
18                    <xsl :otherwise >   18                    <xsl :otherwise >
19                             <xsl:v alue-of se lect="titl e" />   19                             <xsl:v alue-of se lect="titl e" />
20                    </xs l:otherwis e>   20                    </xs l:otherwis e>
21           </ xsl:choose >   21           </ xsl:choose >
22   </title>            22   </title>         
23     23  
24   <xsl:eleme nt name="b ase">   24   <xsl:eleme nt name="b ase">
25           <x sl:attribu te name="h ref"><xsl: value-of s elect="bas e"/></xsl: attribute>   25           <x sl:attribu te name="h ref"><xsl: value-of s elect="bas e"/></xsl: attribute>
26   </xsl:elem ent>   26   </xsl:elem ent>
27     27  
28   <xsl:call- template n ame="canva s_includes " />   28   <xsl:call- template n ame="canva s_includes " />
29     29  
    30   <xsl:value -of select ="/root/ra y_integrat ion" disab le-output- escaping=" yes" /> 
    31  
30   </head>   32   </head>
31   <xsl:eleme nt name="b ody">   33   <xsl:eleme nt name="b ody">
32           <x sl:attribu te name="o nload">if( !document. body) { do cument.bod y = docume nt.getElem entById('b ody'); };  h = new Bx History();  document. h = h; ret urn h.init ('h'); </x sl:attribu te>   34           <x sl:attribu te name="o nload">if( !document. body) { do cument.bod y = docume nt.getElem entById('b ody'); };  h = new Bx History();  document. h = h; ret urn h.init ('h'); </x sl:attribu te>
33       <xsl:a ttribute n ame="id">b ody</xsl:a ttribute>   35       <xsl:a ttribute n ame="id">b ody</xsl:a ttribute>
34     36  
35       <xsl:c all-templa te name="c anvas_init " />   37       <xsl:c all-templa te name="c anvas_init " />
36     38  
37     39  
38           <x sl:value-o f select=" /root/head er" disabl e-output-e scaping="y es" />    40           <x sl:value-o f select=" /root/head er" disabl e-output-e scaping="y es" /> 
39     41  
40                                      <div id= "orca_main ">   42                                      <div id= "orca_main ">
41     43  
42                                                       <x sl:if test ="not(stri ng-length( page/onloa d))">   44                                                       <x sl:if test ="not(stri ng-length( page/onloa d))">
43                                                       <x sl:apply-t emplates s elect="pag e" />   45                                                       <x sl:apply-t emplates s elect="pag e" />
44                                                       </ xsl:if>   46                                                       </ xsl:if>
45     47  
46                                      </div>   48                                      </div>
47     49  
48           <x sl:value-o f select=" /root/foot er" disabl e-output-e scaping="y es" />    50           <x sl:value-o f select=" /root/foot er" disabl e-output-e scaping="y es" /> 
49     51  
50   </xsl:elem ent>   52   </xsl:elem ent>
51   </html>   53   </html>
52   </xsl:temp late>   54   </xsl:temp late>
53     55  
54   </xsl:styl esheet>   56   </xsl:styl esheet>