97. Araxis Merge File Comparison Report

Produced by Araxis Merge on Thu Oct 16 22:30:08 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.

97.1 Files compared

# Location File Last Modified
1 Thu Oct 16 22:30:08 2008 UTC
2 C:\Documents and Settings\lauren\Desktop\ww-version-snapshots\ww-version-snapshots\2008.3\WebWorks\ePublisher Pro\Formats\Wiki - MoinMoin\Transforms css_properties.xsl Mon Oct 13 05:51:50 2008 UTC

97.2 Comparison summary

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

97.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

97.4 Active regular expressions

No regular expressions were active.

97.5 Comparison detail

        1   <?xml vers ion="1.0"  encoding=" UTF-8"?>
        2   <xsl:style sheet vers ion="1.0"  xmlns:xsl= "http://ww w.w3.org/1 999/XSL/Tr ansform"
        3                                    xmlns:msxs l="urn:sch emas-micro soft-com:x slt"
        4                                    xmlns:wwmo de="urn:We bWorks-Eng ine-Mode"
        5                                    xmlns:wwdo c="urn:Web Works-Docu ment-Schem a"
        6                                    xmlns:wwpr oject="urn :WebWorks- Publish-Pr oject"
        7                                    xmlns:wwpr ops="urn:W ebWorks-Pr operties-S chema"
        8                                    xmlns:wwpr ogress="ur n:WebWorks -XSLT-Exte nsion-Prog ress"
        9                                    xmlns:wwlo g="urn:Web Works-XSLT -Extension -Log"
        10                                    xmlns:wwfi lesystem=" urn:WebWor ks-XSLT-Ex tension-Fi leSystem"
        11                                    xmlns:wwur i="urn:Web Works-XSLT -Extension -URI"
        12                                    xmlns:wwst ring="urn: WebWorks-X SLT-Extens ion-String Utilities"
        13                                    xmlns:wwun its="urn:W ebWorks-XS LT-Extensi on-Units"
        14                                    xmlns:wwfi lesext="ur n:WebWorks -XSLT-Exte nsion-File s"
        15                                    xmlns:wwpr ojext="urn :WebWorks- XSLT-Exten sion-Proje ct"
        16                                    xmlns:wwex sldoc="urn :WebWorks- XSLT-Exten sion-Docum ent"
        17                                    exclude-re sult-prefi xes="xsl m sxsl wwmod e wwdoc ww project ww progress w wlog wwfil esystem ww uri wwstri ng wwunits  wwfilesex t wwprojex t wwexsldo c"
        18   >
        19    <xsl:key  name="wwpr ops-proper ty-by-name " match="w wprops:Pro perty" use ="@name" / >
        20  
        21  
        22    <xsl:vari able name= "GlobalVal idCSSPrope rties" sel ect="wwexs ldoc:LoadX MLWithoutR esolver('w wformat:Tr ansforms/c ss_propert ies.xml')"  />
        23  
        24  
        25    <xsl:temp late name= "CSS-Trans lateProjec tPropertie s">
        26     <xsl:par am name="P aramProper ties" />
        27     <xsl:par am name="P aramFromAb soluteURI"  />
        28     <xsl:par am name="P aramSplits " />
        29  
        30     <!-- bac kground-po sition -->
        31     <!--                       -->
        32     <xsl:for -each sele ct="$Globa lValidCSSP roperties[ 1]">
        33      <xsl:fo r-each sel ect="key(' wwprops-pr operty-by- name', 'ba ckground-p osition')[ 1]">
        34       <xsl:v ariable na me="VarBac kgroundPos itionHoriz ontal" sel ect="$Para mPropertie s[@Name =  'backgroun d-position -horizonta l']/@Value " />
        35       <xsl:v ariable na me="VarBac kgroundPos itionVerti cal" selec t="$ParamP roperties[ @Name = 'b ackground- position-v ertical']/ @Value" />
        36       <xsl:i f test="(s tring-leng th($VarBac kgroundPos itionHoriz ontal) &gt ; 0) or (s tring-leng th($VarBac kgroundPos itionVerti cal) &gt;  0)">
        37        <xsl: variable n ame="VarBa ckgroundPo sition">
        38         <xsl :choose>
        39          <xs l:when tes t="string- length($Va rBackgroun dPositionH orizontal)  &gt; 0">
        40           <x sl:value-o f select=" $VarBackgr oundPositi onHorizont al" />
        41          </x sl:when>
        42  
        43          <xs l:otherwis e>
        44           <x sl:value-o f select=" 'left'" />
        45          </x sl:otherwi se>
        46         </xs l:choose>
        47  
        48         <xsl :if test=" string-len gth($VarBa ckgroundPo sitionVert ical) &gt;  0">
        49          <xs l:text> </ xsl:text>
        50          <xs l:value-of  select="$ VarBackgro undPositio nVertical"  />
        51         </xs l:if>
        52        </xsl :variable>
        53  
        54        <xsl: if test="s tring-leng th($VarBac kgroundPos ition) &gt ; 0">
        55         <wwp roject:Pro perty Name ="backgrou nd-positio n" Value=" {$VarBackg roundPosit ion}" />
        56        </xsl :if>
        57       </xsl: if>
        58      </xsl:f or-each>
        59     </xsl:fo r-each>
        60  
        61     <!-- tex t-decorati on -->
        62     <!--                   -->
        63     <xsl:for -each sele ct="$Globa lValidCSSP roperties[ 1]">
        64      <xsl:fo r-each sel ect="key(' wwprops-pr operty-by- name', 'te xt-decorat ion')[1]">
        65       <xsl:v ariable na me="VarTex tDecoratio n">
        66        <!--  blink -->
        67        <!--        -->
        68        <xsl: for-each s elect="$Pa ramPropert ies[@Name  = 'text-de coration-b link']">
        69         <xsl :if test=" @Value = ' true'">
        70          <xs l:value-of  select="' blink '" / >
        71         </xs l:if>
        72        </xsl :for-each>
        73  
        74        <!--  line-throu gh -->
        75        <!--                -->
        76        <xsl: for-each s elect="$Pa ramPropert ies[@Name  = 'text-de coration-l ine-throug h']">
        77         <xsl :if test=" (@Value =  'single')  or (@Value  = 'double ')">
        78          <xs l:value-of  select="' line-throu gh '" />
        79         </xs l:if>
        80        </xsl :for-each>
        81  
        82        <!--  underline  -->
        83        <!--             -->
        84        <xsl: for-each s elect="$Pa ramPropert ies[@Name  = 'text-de coration-u nderline'] ">
        85         <xsl :if test=" (@Value =  'single')  or (@Value  = 'double ')">
        86          <xs l:value-of  select="' underline  '" />
        87         </xs l:if>
        88        </xsl :for-each>
        89       </xsl: variable>
        90       <xsl:i f test="st ring-lengt h($VarText Decoration ) &gt; 0">
        91        <wwpr oject:Prop erty Name= "text-deco ration" Va lue="{subs tring($Var TextDecora tion, 1, s tring-leng th($VarTex tDecoratio n) - 1)}"  />
        92       </xsl: if>
        93      </xsl:f or-each>
        94     </xsl:fo r-each>
        95  
        96     <!-- Val id CSS pro perties -- >
        97     <!--                        -- >
        98     <xsl:for -each sele ct="$Param Properties ">
        99      <xsl:va riable nam e="VarProp erty" sele ct="." />
        100  
        101      <xsl:fo r-each sel ect="$Glob alValidCSS Properties [1]">
        102       <xsl:f or-each se lect="key( 'wwprops-p roperty-by -name', $V arProperty /@Name)[1] ">
        103        <xsl: choose>
        104         <!--  backgroun d-image -- >
        105         <!--                    -- >
        106         <xsl :when test ="$VarProp erty/@Name  = 'backgr ound-image '">
        107          <xs l:if test= "(string-l ength($Var Property/@ Value) &gt ; 0) and ( $VarProper ty/@Value  != 'none') ">
        108           <x sl:variabl e name="Va rValue">
        109            < xsl:text>u rl("</xsl: text>
        110            < xsl:call-t emplate na me="URI-Re solveProje ctFileURI" >
        111              <xsl:with- param name ="ParamFro mAbsoluteU RI" select ="$ParamFr omAbsolute URI" />
        112              <xsl:with- param name ="ParamSpl its" selec t="$ParamS plits" />
        113              <xsl:with- param name ="ParamURI " select=" $VarProper ty/@Value"  />
        114            < /xsl:call- template>
        115            < xsl:text>" )</xsl:tex t>
        116           </ xsl:variab le>
        117  
        118           <w wproject:P roperty Na me="{$VarP roperty/@N ame}" Valu e="{$VarVa lue}" />
        119          </x sl:if>
        120         </xs l:when>
        121  
        122         <!--  cursor -- >
        123         <!--         -- >
        124         <xsl :when test ="$VarProp erty/@Name  = 'cursor '">
        125          <xs l:choose>
        126           <x sl:when te st="$VarPr operty/@Va lue = 'poi nter'">
        127            < !-- Emit b oth pointe r and hand  for IE co mpatibilit y -->
        128            < !--                                                      -->
        129            < wwproject: Property N ame="curso r" Value=" pointer" / >
        130            < wwproject: Property N ame="curso r" Value=" hand" />
        131           </ xsl:when>
        132  
        133           <x sl:otherwi se>
        134            < xsl:copy-o f select=" $VarProper ty" />
        135           </ xsl:otherw ise>
        136          </x sl:choose>
        137         </xs l:when>
        138  
        139         <!--  border-wi dth -->
        140         <!--                -->
        141         <xsl :when test ="($VarPro perty/@Nam e = 'borde r-left-wid th') or ($ VarPropert y/@Name =  'border-ri ght-width' ) or ($Var Property/@ Name = 'bo rder-top-w idth') or  ($VarPrope rty/@Name  = 'border- bottom-wid th')">
        142          <xs l:variable  name="Var WidthNumbe r" select= "wwunits:N umericPref ix($VarPro perty/@Val ue)" />
        143          <xs l:variable  name="Var WidthUnits " select=" wwunits:Un itsSuffix( $VarProper ty/@Value) " />
        144  
        145          <xs l:choose>
        146           <x sl:when te st="string -length($V arWidthUni ts) &gt; 0 ">
        147            < xsl:variab le name="V arWidthNum berAsPixel s" select= "wwunits:C onvert($Va rWidthNumb er, $VarWi dthUnits,  'px')" />
        148  
        149            < xsl:choose >
        150              <xsl:when  test="($Va rWidthNumb erAsPixels  &gt; 0) a nd ($VarWi dthNumberA sPixels &l t; 1)">
        151               <wwprojec t:Property  Name="{$V arProperty /@Name}" V alue="1px"  />
        152              </xsl:when >
        153  
        154              <xsl:other wise>
        155               <xsl:copy -of select ="$VarProp erty" />
        156              </xsl:othe rwise>
        157            < /xsl:choos e>
        158           </ xsl:when>
        159  
        160           <x sl:when te st="($VarW idthNumber  &gt; 0) a nd ($VarWi dthNumber  &lt; 1)">
        161            < wwproject: Property N ame="{$Var Property/@ Name}" Val ue="1px" / >
        162           </ xsl:when>
        163  
        164           <x sl:otherwi se>
        165            < xsl:copy-o f select=" $VarProper ty" />
        166           </ xsl:otherw ise>
        167          </x sl:choose>
        168         </xs l:when>
        169  
        170         <!--  Everythin g else -->
        171         <!--                   -->
        172         <xsl :otherwise >
        173          <xs l:copy-of  select="$V arProperty " />
        174         </xs l:otherwis e>
        175        </xsl :choose>
        176       </xsl: for-each>
        177      </xsl:f or-each>
        178     </xsl:fo r-each>
        179    </xsl:tem plate>
        180  
        181  
        182    <xsl:temp late name= "CSS-Inlin ePropertie s">
        183     <xsl:par am name="P aramProper ties" />
        184  
        185     <xsl:for -each sele ct="$Param Properties [1]">
        186      <!-- At tempts to  sort empty  node sets  results i n fatal er rors on so me systems  -->
        187      <!--                                                                                  -->
        188      <xsl:fo r-each sel ect="$Para mPropertie s">
        189       <xsl:s ort select ="@Name" d ata-type=" text" orde r="ascendi ng" />
        190  
        191       <!-- E mit Proper ty -->
        192       <!--                 -->
        193       <xsl:v alue-of se lect="@Nam e" />
        194       <xsl:t ext>: </xs l:text>
        195       <xsl:v alue-of se lect="@Val ue" />
        196       <xsl:t ext>;</xsl :text>
        197       <xsl:i f test="po sition() ! = last()">
        198        <xsl: value-of s elect="' ' " />
        199       </xsl: if>
        200      </xsl:f or-each>
        201     </xsl:fo r-each>
        202    </xsl:tem plate>
        203   </xsl:styl esheet>