24. Araxis Merge File Comparison Report

Produced by Araxis Merge on Thu Oct 16 22:29:56 2008 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.

24.1 Files compared

# Location File Last Modified
1 C:\Documents and Settings\lauren\Desktop\ww-version-snapshots\ww-version-snapshots\2008.2\WebWorks\ePublisher Pro\Formats\Shared\common\companyinfo companyinfo_content.xsl Fri Apr 28 23:53:36 2006 UTC
2 C:\Documents and Settings\lauren\Desktop\ww-version-snapshots\ww-version-snapshots\2008.3\WebWorks\ePublisher Pro\Formats\Shared\common\companyinfo companyinfo_content.xsl Mon Oct 13 05:52:00 2008 UTC

24.2 Comparison summary

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

24.3 Comparison options

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

24.4 Active regular expressions

No regular expressions were active.

24.5 Comparison detail

1   <?xml vers ion="1.0"  encoding=" UTF-8"?>   1   <?xml vers ion="1.0"  encoding=" UTF-8"?>
2   <xsl:style sheet vers ion="1.0"  xmlns="urn :WebWorks- Engine-Spl its-Schema "   2   <xsl:style sheet vers ion="1.0"  xmlns="urn :WebWorks- Engine-Spl its-Schema "
3                                    xmlns:wwsp lits="urn: WebWorks-E ngine-Spli ts-Schema"   3                                    xmlns:wwsp lits="urn: WebWorks-E ngine-Spli ts-Schema"
4                                    xmlns:xsl= "http://ww w.w3.org/1 999/XSL/Tr ansform"   4                                    xmlns:xsl= "http://ww w.w3.org/1 999/XSL/Tr ansform"
5                                    xmlns:wwsp litpriorit ies="urn:W ebWorks-En gine-Split -Prioritie s-Schema"   5                                    xmlns:wwsp litpriorit ies="urn:W ebWorks-En gine-Split -Prioritie s-Schema"
6                                    xmlns:wwmo de="urn:We bWorks-Eng ine-Mode"   6                                    xmlns:wwmo de="urn:We bWorks-Eng ine-Mode"
7                                    xmlns:wwfi les="urn:W ebWorks-En gine-Files -Schema"   7                                    xmlns:wwfi les="urn:W ebWorks-En gine-Files -Schema"
8                                    xmlns:wwdo c="urn:Web Works-Docu ment-Schem a"   8                                    xmlns:wwdo c="urn:Web Works-Docu ment-Schem a"
9                                    xmlns:wwpr oject="urn :WebWorks- Publish-Pr oject"   9                                    xmlns:wwpr oject="urn :WebWorks- Publish-Pr oject"
10                                    xmlns:wwpa ge="urn:We bWorks-Pag e-Template -Schema"   10                                    xmlns:wwpa ge="urn:We bWorks-Pag e-Template -Schema"
11                                    xmlns:wwpr ogress="ur n:WebWorks -XSLT-Exte nsion-Prog ress"   11                                    xmlns:wwpr ogress="ur n:WebWorks -XSLT-Exte nsion-Prog ress"
12                                    xmlns:wwlo g="urn:Web Works-XSLT -Extension -Log"   12                                    xmlns:wwlo g="urn:Web Works-XSLT -Extension -Log"
13                                    xmlns:wwfi lesystem=" urn:WebWor ks-XSLT-Ex tension-Fi leSystem"   13                                    xmlns:wwfi lesystem=" urn:WebWor ks-XSLT-Ex tension-Fi leSystem"
14                                    xmlns:wwur i="urn:Web Works-XSLT -Extension -URI"   14                                    xmlns:wwur i="urn:Web Works-XSLT -Extension -URI"
15                                    xmlns:wwst ring="urn: WebWorks-X SLT-Extens ion-String Utilities"   15                                    xmlns:wwst ring="urn: WebWorks-X SLT-Extens ion-String Utilities"
16                                    xmlns:wwun its="urn:W ebWorks-XS LT-Extensi on-Units"   16                                    xmlns:wwun its="urn:W ebWorks-XS LT-Extensi on-Units"
17                                    xmlns:wwfi lesext="ur n:WebWorks -XSLT-Exte nsion-File s"   17                                    xmlns:wwfi lesext="ur n:WebWorks -XSLT-Exte nsion-File s"
18                                    xmlns:wwpr ojext="urn :WebWorks- XSLT-Exten sion-Proje ct"   18                                    xmlns:wwpr ojext="urn :WebWorks- XSLT-Exten sion-Proje ct"
19                                    xmlns:wwex sldoc="urn :WebWorks- XSLT-Exten sion-Docum ent"   19                                    xmlns:wwex sldoc="urn :WebWorks- XSLT-Exten sion-Docum ent"
20                                    exclude-re sult-prefi xes="xsl w wsplits ww splitprior ities wwmo de wwfiles  wwdoc wwp roject wwp age wwprog ress wwlog  wwfilesys tem wwuri  wwstring w wunits wwf ilesext ww projext ww exsldoc"   20                                    exclude-re sult-prefi xes="xsl w wsplits ww splitprior ities wwmo de wwfiles  wwdoc wwp roject wwp age wwprog ress wwlog  wwfilesys tem wwuri  wwstring w wunits wwf ilesext ww projext ww exsldoc"
21   >   21   >
22    <xsl:temp late name= "CompanyIn fo-Conditi ons">   22    <xsl:temp late name= "CompanyIn fo-Conditi ons">
23     <xsl:par am name="P aramPageRu le" />   23     <xsl:par am name="P aramPageRu le" />
24     24  
25     <!-- com pany-info- top -->   25     <!-- com pany-info- top -->
26     <!--                    -->   26     <!--                    -->
27     <xsl:if  test="$Par amPageRule /wwproject :Options/w wproject:O ption[@Nam e = 'compa ny-info-to p-generate ']/@Value  = 'true'">   27     <xsl:if  test="$Par amPageRule /wwproject :Options/w wproject:O ption[@Nam e = 'compa ny-info-to p-generate ']/@Value  = 'true'">
28      <wwpage :Condition  name="com pany-info- top" />   28      <wwpage :Condition  name="com pany-info- top" />
29     </xsl:if >   29     </xsl:if >
30     30  
31     <!-- com pany-info- bottom -->   31     <!-- com pany-info- bottom -->
32     <!--                       -->   32     <!--                       -->
33     <xsl:if  test="$Par amPageRule /wwproject :Options/w wproject:O ption[@Nam e = 'compa ny-info-bo ttom-gener ate']/@Val ue = 'true '">   33     <xsl:if  test="$Par amPageRule /wwproject :Options/w wproject:O ption[@Nam e = 'compa ny-info-bo ttom-gener ate']/@Val ue = 'true '">
34      <wwpage :Condition  name="com pany-info- bottom" />   34      <wwpage :Condition  name="com pany-info- bottom" />
35     </xsl:if >   35     </xsl:if >
36     36  
37     <!-- com pany-link- exists      -->   37     <!-- com pany-link- exists      -->
38     <!-- com pany-link- not-exists  -->   38     <!-- com pany-link- not-exists  -->
39     <!--                            -->   39     <!--                            -->
40     <xsl:cho ose>   40     <xsl:cho ose>
41      <xsl:wh en test="s tring-leng th(wwproje xt:GetForm atSetting( 'company-l ink', ''))  &gt; 0">   41      <xsl:wh en test="s tring-leng th(wwproje xt:GetForm atSetting( 'company-l ink', ''))  &gt; 0">
42       <wwpag e:Conditio n name="co mpany-link -exists" / >   42       <wwpag e:Conditio n name="co mpany-link -exists" / >
43      </xsl:w hen>   43      </xsl:w hen>
44     44  
45      <xsl:ot herwise>   45      <xsl:ot herwise>
46       <wwpag e:Conditio n name="co mpany-link -not-exist s" />   46       <wwpag e:Conditio n name="co mpany-link -not-exist s" />
47      </xsl:o therwise>   47      </xsl:o therwise>
48     </xsl:ch oose>   48     </xsl:ch oose>
49     49  
50     <!-- com pany-logo- src-exists  -->   50     <!-- com pany-logo- src-exists  -->
51     <!--                            -->   51     <!--                            -->
52     <xsl:if  test="stri ng-length( wwprojext: GetFormatS etting('co mpany-logo -src', '') ) &gt; 0">   52     <xsl:if  test="stri ng-length( wwprojext: GetFormatS etting('co mpany-logo -src', '') ) &gt; 0">
53      <wwpage :Condition  name="com pany-logo- src-exists " />   53      <wwpage :Condition  name="com pany-logo- src-exists " />
54     </xsl:if >   54     </xsl:if >
55     55  
56     <!-- com pany-name- exists -->   56     <!-- com pany-name- exists -->
57     <!--                       -->   57     <!--                       -->
58     <xsl:if  test="stri ng-length( wwprojext: GetFormatS etting('co mpany-name ', '')) &g t; 0">   58     <xsl:if  test="stri ng-length( wwprojext: GetFormatS etting('co mpany-name ', '')) &g t; 0">
59      <wwpage :Condition  name="com pany-name- exists" />   59      <wwpage :Condition  name="com pany-name- exists" />
60     </xsl:if >   60     </xsl:if >
61     61  
62     <!-- com pany-email -exists -- >   62     <!-- com pany-email -exists -- >
63     <!--                        -- >   63     <!--                        -- >
64     <xsl:if  test="stri ng-length( wwprojext: GetFormatS etting('co mpany-emai l', '')) & gt; 0">   64     <xsl:if  test="stri ng-length( wwprojext: GetFormatS etting('co mpany-emai l', '')) & gt; 0">
65      <wwpage :Condition  name="com pany-email -exists" / >   65      <wwpage :Condition  name="com pany-email -exists" / >
66     </xsl:if >   66     </xsl:if >
67     67  
68     <!-- com pany-fax-e xists -->   68     <!-- com pany-fax-e xists -->
69     <!--                      -->   69     <!--                      -->
70     <xsl:if  test="stri ng-length( wwprojext: GetFormatS etting('co mpany-fax' , '')) &gt ; 0">   70     <xsl:if  test="stri ng-length( wwprojext: GetFormatS etting('co mpany-fax' , '')) &gt ; 0">
71      <wwpage :Condition  name="com pany-fax-e xists" />   71      <wwpage :Condition  name="com pany-fax-e xists" />
72     </xsl:if >   72     </xsl:if >
73     73  
74     <!-- com pany-phone -exists -- >   74     <!-- com pany-phone -exists -- >
75     <!--                        -- >   75     <!--                        -- >
76     <xsl:if  test="stri ng-length( wwprojext: GetFormatS etting('co mpany-phon e', '')) & gt; 0">   76     <xsl:if  test="stri ng-length( wwprojext: GetFormatS etting('co mpany-phon e', '')) & gt; 0">
77      <wwpage :Condition  name="com pany-phone -exists" / >   77      <wwpage :Condition  name="com pany-phone -exists" / >
78     </xsl:if >   78     </xsl:if >
79    </xsl:tem plate>   79    </xsl:tem plate>
80     80  
81     81  
82    <xsl:temp late name= "CompanyIn fo-Replace ments">   82    <xsl:temp late name= "CompanyIn fo-Replace ments">
83     <xsl:par am name="P aramPageRu le" />   83     <xsl:par am name="P aramPageRu le" />
84     <xsl:par am name="P aramPagePa th" />   84     <xsl:par am name="P aramPagePa th" />
85     <xsl:par am name="P aramSplits " />   85     <xsl:par am name="P aramSplits " />
86     86  
87     <!-- com pany-info- top-alignm ent -->   87     <!-- com pany-info- top-alignm ent -->
88     <!--                               -->   88     <!--                               -->
89     <xsl:var iable name ="VarCompa nyInfoTopA lignmentOp tion" sele ct="$Param PageRule/w wproject:O ptions/wwp roject:Opt ion[@Name  = 'company -info-top- alignment' ]/@Value"  />   89     <xsl:var iable name ="VarCompa nyInfoTopA lignmentOp tion" sele ct="$Param PageRule/w wproject:O ptions/wwp roject:Opt ion[@Name  = 'company -info-top- alignment' ]/@Value"  />
90     <xsl:var iable name ="VarCompa nyInfoTopA lignment">   90     <xsl:var iable name ="VarCompa nyInfoTopA lignment">
91      <xsl:ch oose>   91      <xsl:ch oose>
92       <xsl:w hen test=" string-len gth($VarCo mpanyInfoT opAlignmen tOption) & gt; 0">   92       <xsl:w hen test=" string-len gth($VarCo mpanyInfoT opAlignmen tOption) & gt; 0">
93        <xsl: value-of s elect="$Va rCompanyIn foTopAlign mentOption " />   93        <xsl: value-of s elect="$Va rCompanyIn foTopAlign mentOption " />
94       </xsl: when>   94       </xsl: when>
95     95  
96       <xsl:o therwise>   96       <xsl:o therwise>
97        <xsl: value-of s elect="'le ft'" />   97        <xsl: value-of s elect="'le ft'" />
98       </xsl: otherwise>   98       </xsl: otherwise>
99      </xsl:c hoose>   99      </xsl:c hoose>
100     </xsl:va riable>   100     </xsl:va riable>
101     <wwpage: Replacemen t name="co mpany-info -top-align ment" valu e="{$VarCo mpanyInfoT opAlignmen t}" />   101     <wwpage: Replacemen t name="co mpany-info -top-align ment" valu e="{$VarCo mpanyInfoT opAlignmen t}" />
102     102  
103     <!-- com pany-info- bottom-ali gnment -->   103     <!-- com pany-info- bottom-ali gnment -->
104     <!--                                  -->   104     <!--                                  -->
105     <xsl:var iable name ="VarCompa nyInfoBott omAlignmen tOption" s elect="$Pa ramPageRul e/wwprojec t:Options/ wwproject: Option[@Na me = 'comp any-info-b ottom-alig nment']/@V alue" />   105     <xsl:var iable name ="VarCompa nyInfoBott omAlignmen tOption" s elect="$Pa ramPageRul e/wwprojec t:Options/ wwproject: Option[@Na me = 'comp any-info-b ottom-alig nment']/@V alue" />
106     <xsl:var iable name ="VarCompa nyInfoBott omAlignmen t">   106     <xsl:var iable name ="VarCompa nyInfoBott omAlignmen t">
107      <xsl:ch oose>   107      <xsl:ch oose>
108       <xsl:w hen test=" string-len gth($VarCo mpanyInfoB ottomAlign mentOption ) &gt; 0">   108       <xsl:w hen test=" string-len gth($VarCo mpanyInfoB ottomAlign mentOption ) &gt; 0">
109        <xsl: value-of s elect="$Va rCompanyIn foBottomAl ignmentOpt ion" />   109        <xsl: value-of s elect="$Va rCompanyIn foBottomAl ignmentOpt ion" />
110       </xsl: when>   110       </xsl: when>
111     111  
112       <xsl:o therwise>   112       <xsl:o therwise>
113        <xsl: value-of s elect="'ri ght'" />   113        <xsl: value-of s elect="'ri ght'" />
114       </xsl: otherwise>   114       </xsl: otherwise>
115      </xsl:c hoose>   115      </xsl:c hoose>
116     </xsl:va riable>   116     </xsl:va riable>
117     <wwpage: Replacemen t name="co mpany-info -bottom-al ignment" v alue="{$Va rCompanyIn foBottomAl ignment}"  />   117     <wwpage: Replacemen t name="co mpany-info -bottom-al ignment" v alue="{$Va rCompanyIn foBottomAl ignment}"  />
118     118  
        119     <!-- com pany-info- top-style  -->
        120     <!--                           -->
        121     <xsl:var iable name ="VarCompa nyInfoTopS tyle">
        122      <xsl:ch oose>
        123       <xsl:w hen test=" $VarCompan yInfoTopAl ignmentOpt ion = 'cen ter'">
        124        <xsl: value-of s elect="'ma rgin-left:  auto;'" / >
        125        <xsl: value-of s elect="' m argin-righ t: auto;'"  />
        126       </xsl: when>
        127  
        128       <xsl:w hen test=" $VarCompan yInfoTopAl ignmentOpt ion = 'rig ht'">
        129        <xsl: value-of s elect="'ma rgin-left:  auto;'" / >
        130        <xsl: value-of s elect="' m argin-righ t: 0em;'"  />
        131       </xsl: when>
        132  
        133       <xsl:o therwise>
        134        <xsl: value-of s elect="'ma rgin-left:  0em;'" />
        135        <xsl: value-of s elect="' m argin-righ t: auto;'"  />
        136       </xsl: otherwise>
        137      </xsl:c hoose>
        138     </xsl:va riable>
        139     <wwpage: Replacemen t name="co mpany-info -top-style " value="{ $VarCompan yInfoTopSt yle}" />
        140  
        141     <!-- com pany-info- bottom-sty le -->
        142     <!--                              -->
        143     <xsl:var iable name ="VarCompa nyInfoBott omStyle">
        144      <xsl:ch oose>
        145       <xsl:w hen test=" $VarCompan yInfoBotto mAlignment Option = ' center'">
        146        <xsl: value-of s elect="'ma rgin-left:  auto;'" / >
        147        <xsl: value-of s elect="' m argin-righ t: auto;'"  />
        148       </xsl: when>
        149  
        150       <xsl:w hen test=" $VarCompan yInfoBotto mAlignment Option = ' left'">
        151        <xsl: value-of s elect="'ma rgin-left:  0em;'" />
        152        <xsl: value-of s elect="' m argin-righ t: auto;'"  />
        153       </xsl: when>
        154  
        155       <xsl:o therwise>
        156        <xsl: value-of s elect="'ma rgin-left:  auto;'" / >
        157        <xsl: value-of s elect="' m argin-righ t: 0em;'"  />
        158       </xsl: otherwise>
        159      </xsl:c hoose>
        160     </xsl:va riable>
        161     <wwpage: Replacemen t name="co mpany-info -bottom-st yle" value ="{$VarCom panyInfoBo ttomStyle} " />
        162  
119     <!-- com pany-link  -->   163     <!-- com pany-link  -->
120     <!--                -->   164     <!--                -->
121     <wwpage: Replacemen t name="co mpany-link " value="{ wwprojext: GetFormatS etting('co mpany-link ')}" />   165     <wwpage: Replacemen t name="co mpany-link " value="{ wwprojext: GetFormatS etting('co mpany-link ')}" />
122     166  
123     <!-- com pany-logo- src -->   167     <!-- com pany-logo- src -->
124     <!--                    -->   168     <!--                    -->
125     <wwpage: Replacemen t name="co mpany-logo -src">   169     <wwpage: Replacemen t name="co mpany-logo -src">
126      <xsl:at tribute na me="value" >   170      <xsl:at tribute na me="value" >
127       <xsl:c all-templa te name="U RI-Resolve ProjectFil eURI">   171       <xsl:c all-templa te name="U RI-Resolve ProjectFil eURI">
128        <xsl: with-param  name="Par amFromAbso luteURI" s elect="$Pa ramPagePat h" />   172        <xsl: with-param  name="Par amFromAbso luteURI" s elect="$Pa ramPagePat h" />
129        <xsl: with-param  name="Par amSplits"  select="$P aramSplits " />   173        <xsl: with-param  name="Par amSplits"  select="$P aramSplits " />
130        <xsl: with-param  name="Par amURI" sel ect="wwpro jext:GetFo rmatSettin g('company -logo-src' )" />   174        <xsl: with-param  name="Par amURI" sel ect="wwpro jext:GetFo rmatSettin g('company -logo-src' )" />
131       </xsl: call-templ ate>   175       </xsl: call-templ ate>
132      </xsl:a ttribute>   176      </xsl:a ttribute>
133     </wwpage :Replaceme nt>   177     </wwpage :Replaceme nt>
134     178  
135     <!-- com pany-name  -->   179     <!-- com pany-name  -->
136     <!--                -->   180     <!--                -->
137     <wwpage: Replacemen t name="co mpany-name " value="{ wwprojext: GetFormatS etting('co mpany-name ')}" />   181     <wwpage: Replacemen t name="co mpany-name " value="{ wwprojext: GetFormatS etting('co mpany-name ')}" />
138     182  
139     <!-- com pany-email       -->   183     <!-- com pany-email       -->
140     <!-- com pany-email -href -->   184     <!-- com pany-email -href -->
141     <!--                      -->   185     <!--                      -->
142     <wwpage: Replacemen t name="co mpany-emai l" value=" {wwprojext :GetFormat Setting('c ompany-ema il', '')}"  />   186     <wwpage: Replacemen t name="co mpany-emai l" value=" {wwprojext :GetFormat Setting('c ompany-ema il', '')}"  />
143     <wwpage: Replacemen t name="co mpany-emai l-href" va lue="{conc at('mailto :', wwproj ext:GetFor matSetting ('company- email', '' ))}" />   187     <wwpage: Replacemen t name="co mpany-emai l-href" va lue="{conc at('mailto :', wwproj ext:GetFor matSetting ('company- email', '' ))}" />
144     188  
145     <!-- com pany-fax - ->   189     <!-- com pany-fax - ->
146     <!--              - ->   190     <!--              - ->
147     <wwpage: Replacemen t name="co mpany-fax"  value="{w wprojext:G etFormatSe tting('com pany-fax') }" />   191     <wwpage: Replacemen t name="co mpany-fax"  value="{w wprojext:G etFormatSe tting('com pany-fax') }" />
148     192  
149     <!-- com pany-phone  -->   193     <!-- com pany-phone  -->
150     <!--                 -->   194     <!--                 -->
151     <wwpage: Replacemen t name="co mpany-phon e" value=" {wwprojext :GetFormat Setting('c ompany-pho ne')}" />   195     <wwpage: Replacemen t name="co mpany-phon e" value=" {wwprojext :GetFormat Setting('c ompany-pho ne')}" />
152    </xsl:tem plate>   196    </xsl:tem plate>
153   </xsl:styl esheet>   197   </xsl:styl esheet>