83. Araxis Merge File Comparison Report

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

83.1 Files compared

# Location File Last Modified
1 Thu Oct 16 22:30:06 2008 UTC
2 C:\Documents and Settings\lauren\Desktop\ww-version-snapshots\ww-version-snapshots\2008.3\WebWorks\ePublisher Pro\Formats\Wiki - MediaWiki\Transforms mediawiki.xsl Mon Oct 13 05:52:00 2008 UTC

83.2 Comparison summary

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

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

83.4 Active regular expressions

No regular expressions were active.

83.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:wwsp lits="urn: WebWorks-E ngine-Spli ts-Schema"
        5                                    xmlns:wwto c="urn:Web Works-Engi ne-TOC-Sch ema"
        6                                    xmlns:wwli nks="urn:W ebWorks-En gine-Links -Schema"
        7                                    xmlns:wwmo de="urn:We bWorks-Eng ine-Mode"
        8                                    xmlns:wwfi les="urn:W ebWorks-En gine-Files -Schema"
        9                                    xmlns:wwdo c="urn:Web Works-Docu ment-Schem a"
        10                                    xmlns:wwbe haviors="u rn:WebWork s-Behavior s-Schema"
        11                                    xmlns:wwno tes="urn:W ebWorks-Fo otnote-Sch ema"
        12                                    xmlns:wwpr oject="urn :WebWorks- Publish-Pr oject"
        13                                    xmlns:wwpa ge="urn:We bWorks-Pag e-Template -Schema"
        14                                    xmlns:wwlo cale="urn: WebWorks-L ocale-Sche ma"
        15                                    xmlns:wwpr ogress="ur n:WebWorks -XSLT-Exte nsion-Prog ress"
        16                                    xmlns:wwlo g="urn:Web Works-XSLT -Extension -Log"
        17                                    xmlns:wwfi lesystem=" urn:WebWor ks-XSLT-Ex tension-Fi leSystem"
        18                                    xmlns:wwur i="urn:Web Works-XSLT -Extension -URI"
        19                                    xmlns:wwst ring="urn: WebWorks-X SLT-Extens ion-String Utilities"
        20                                    xmlns:wwfi lesext="ur n:WebWorks -XSLT-Exte nsion-File s"
        21                                    xmlns:wwpr ojext="urn :WebWorks- XSLT-Exten sion-Proje ct"
        22                                    xmlns:wwex sldoc="urn :WebWorks- XSLT-Exten sion-Docum ent"
        23                                    xmlns:wwmu ltisere="u rn:WebWork s-XSLT-Ext ension-Mul tiSearchRe place"
        24                                    exclude-re sult-prefi xes="xsl m sxsl wwspl its wwtoc  wwlinks ww mode wwfil es wwdoc w wbehaviors  wwproject  wwpage ww locale wwp rogress ww log wwfile system wwu ri wwstrin g wwfilese xt wwproje xt wwexsld oc wwmulti sere"
        25   >
        26  
        27    <!-- Wiki  Name Repl acements - ->
        28    <!--                          - ->
        29    <xsl:vari able name= "GlobalWik iNameRepla cementsAsX ML">
        30     <wwmulti sere:Entry  match=";"  replaceme nt="_" />
        31     <wwmulti sere:Entry  match="/"  replaceme nt="_" />
        32     <wwmulti sere:Entry  match="?"  replaceme nt="_" />
        33     <wwmulti sere:Entry  match="@"  replaceme nt="_" />
        34     <wwmulti sere:Entry  match="&a mp;" repla cement="_"  />
        35     <wwmulti sere:Entry  match="="  replaceme nt="_" />
        36     <wwmulti sere:Entry  match="+"  replaceme nt="_" />
        37     <wwmulti sere:Entry  match="$"  replaceme nt="_" />
        38     <wwmulti sere:Entry  match=","  replaceme nt="_" />
        39     <wwmulti sere:Entry  match="#"  replaceme nt="_" />
        40     <wwmulti sere:Entry  match=" "  replaceme nt="_" />
        41     <wwmulti sere:Entry  match="&l t;" replac ement="_"  />
        42     <wwmulti sere:Entry  match="&g t;" replac ement="_"  />
        43     <wwmulti sere:Entry  match="%"  replaceme nt="_" />
        44     <wwmulti sere:Entry  match="&q uot;" repl acement="_ " />
        45     <wwmulti sere:Entry  match="{{ " replacem ent="_" />
        46     <wwmulti sere:Entry  match="}} " replacem ent="_" />
        47     <wwmulti sere:Entry  match="|"  replaceme nt="_" />
        48     <wwmulti sere:Entry  match="\"  replaceme nt="_" />
        49     <wwmulti sere:Entry  match="^"  replaceme nt="_" />
        50     <wwmulti sere:Entry  match="["  replaceme nt="_" />
        51     <wwmulti sere:Entry  match="]"  replaceme nt="_" />
        52     <wwmulti sere:Entry  match="`"  replaceme nt="_" />
        53    </xsl:var iable>
        54    <xsl:vari able name= "GlobalWik iNameRepla cements" s elect="msx sl:node-se t($GlobalW ikiNameRep lacementsA sXML)/*" / >
        55  
        56  
        57    <xsl:temp late name= "MediaWiki -ProjectRo otedLink">
        58     <xsl:par am name="P aramLinkPa th" />
        59     <xsl:par am name="P aramTarget OutputDire ctoryPath"  />
        60     
        61     <!-- Cre ate the "r ooted" pat h, which i s the part  from the  target out put direct ory to the  end of th e filename  -->
        62     <!--                                                                                                                   -->
        63     <xsl:var iable name ="VarProje ctRootedPa thWithExte nsion" sel ect="wwuri :Unescape( wwuri:GetR elativeTo( $ParamLink Path, $Par amTargetOu tputDirect oryPath))"  />
        64     <xsl:var iable name ="VarFileN ameWithout Extension"  select="w wfilesyste m:GetFileN ameWithout Extension( $VarProjec tRootedPat hWithExten sion)" />
        65     <xsl:var iable name ="VarProje ctRootedDi rectory" s elect="wws tring:Repl ace(wwfile system:Get DirectoryN ame($VarPr ojectRoote dPathWithE xtension),  '\', ':') " />
        66  
        67     <xsl:var iable name ="VarWikiD eploymentP refix" sel ect="wwmul tisere:Rep laceAllInS tring(wwpr ojext:GetF ormatSetti ng('wiki-d eployment- prefix'),  $GlobalWik iNameRepla cements)"  />
        68     
        69     <xsl:var iable name ="VarResul t">
        70      <xsl:if  test="str ing-length ($VarWikiD eploymentP refix) &gt ; 0">
        71       <xsl:v alue-of se lect="wwst ring:ToUpp er(substri ng($VarWik iDeploymen tPrefix, 1 , 1))" />
        72       <xsl:v alue-of se lect="subs tring($Var WikiDeploy mentPrefix , 2)" />
        73       <xsl:t ext>:</xsl :text>
        74      </xsl:i f>
        75      
        76      <!-- Em it group b it and any  subdirect ories -->
        77      <!--                                           -->
        78      <xsl:ap ply-templa tes select ="msxsl:no de-set(wwm ultisere:R eplaceAllI nString($V arProjectR ootedDirec tory, $Glo balWikiNam eReplaceme nts))" mod e="wwmode: mediawiki"  />
        79      
        80      <xsl:te xt>:</xsl: text>
        81  
        82      <xsl:ap ply-templa tes select ="msxsl:no de-set(wwm ultisere:R eplaceAllI nString($V arFileName WithoutExt ension, $G lobalWikiN ameReplace ments))" m ode="wwmod e:mediawik i" />
        83     </xsl:va riable>
        84     
        85     <xsl:val ue-of sele ct="$VarRe sult" />
        86    </xsl:tem plate>
        87    
        88    <xsl:temp late name= "MediaWiki -ImageRoot edLink">
        89     <xsl:par am name="P aramLinkPa th" />
        90     <xsl:par am name="P aramTarget OutputDire ctoryPath"  />
        91     <xsl:par am name="P aramInclud eNamespace " select=" true()" />
        92  
        93     <!-- Cre ate the "r ooted" pat h, which i s the part  from the  target out put direct ory to the  end of th e filename  -->
        94     <!--                                                                                                                   -->
        95     <xsl:var iable name ="VarProje ctRootedPa thWithExte nsion" sel ect="wwuri :Unescape( wwuri:GetR elativeTo( $ParamLink Path, $Par amTargetOu tputDirect oryPath))"  />
        96     <xsl:var iable name ="VarFileN ame" selec t="wwfiles ystem:GetF ileName($V arProjectR ootedPathW ithExtensi on)" />
        97     <xsl:var iable name ="VarProje ctRootedDi rectory" s elect="wws tring:Repl ace(wwfile system:Get DirectoryN ame($VarPr ojectRoote dPathWithE xtension),  '\', '-') " />
        98  
        99     <xsl:var iable name ="VarWikiD eploymentP refix" sel ect="wwmul tisere:Rep laceAllInS tring(wwpr ojext:GetF ormatSetti ng('wiki-d eployment- prefix'),  $GlobalWik iNameRepla cements)"  />
        100     
        101     <xsl:var iable name ="VarResul t">
        102      <!-- Em it Image n amespace - ->
        103      <!--                        - ->
        104      <xsl:if  test="$Pa ramInclude Namespace" >
        105       <xsl:t ext>Image: </xsl:text >
        106      </xsl:i f>
        107  
        108      <xsl:if  test="str ing-length ($VarWikiD eploymentP refix) &gt ; 0">
        109       <xsl:v alue-of se lect="wwst ring:ToUpp er(substri ng($VarWik iDeploymen tPrefix, 1 , 1))" />
        110       <xsl:v alue-of se lect="subs tring($Var WikiDeploy mentPrefix , 2)" />
        111       <xsl:t ext>-</xsl :text>
        112      </xsl:i f>
        113      
        114      <!-- Em it group b it and any  subdirect ories -->
        115      <!--                                           -->
        116      <xsl:ap ply-templa tes select ="msxsl:no de-set(wwm ultisere:R eplaceAllI nString($V arProjectR ootedDirec tory, $Glo balWikiNam eReplaceme nts))" mod e="wwmode: mediawiki"  />
        117      
        118      <xsl:te xt>-</xsl: text>
        119  
        120      <xsl:ap ply-templa tes select ="msxsl:no de-set(wwm ultisere:R eplaceAllI nString($V arFileName , $GlobalW ikiNameRep lacements) )" mode="w wmode:medi awiki" />
        121     </xsl:va riable>
        122     
        123     <xsl:val ue-of sele ct="$VarRe sult" />
        124    </xsl:tem plate>
        125  
        126  
        127    <!-- Call  template  for synthe sizing und erscores - ->
        128    <!--                                                - ->
        129    <xsl:temp late match ="text()"  name="Medi aWiki-Synt hesizeUnde rscores" m ode="wwmod e:mediawik i">
        130     <xsl:par am name="P aramOrigin alString"  select="."  />
        131     <xsl:par am name="P aramBuilde rString" s elect="''"  />
        132     <xsl:par am name="P aramCharac terIndex"  select="1"  />
        133     <xsl:par am name="P aramCanApp endUndersc ore" selec t="false() " />
        134  
        135     <xsl:var iable name ="VarFirst Character"  select="s ubstring($ ParamOrigi nalString,  $ParamCha racterInde x, 1)" />
        136  
        137     <xsl:var iable name ="VarAppen dCharacter ">
        138      <xsl:ch oose>
        139       <xsl:w hen test=" $VarFirstC haracter =  '_'">
        140        <xsl: if test="$ ParamCanAp pendUnders core = 'tr ue'">
        141         <xsl :text>_</x sl:text>
        142        </xsl :if>
        143       </xsl: when>
        144       <xsl:o therwise>
        145        <xsl: value-of s elect="$Va rFirstChar acter" />
        146       </xsl: otherwise>
        147      </xsl:c hoose>
        148     </xsl:va riable>
        149     
        150     <xsl:var iable name ="VarBuild erString">
        151      <xsl:va lue-of sel ect="$Para mBuilderSt ring" />
        152      <xsl:va lue-of sel ect="$VarA ppendChara cter" />
        153     </xsl:va riable>
        154     
        155     <xsl:cho ose>
        156      <xsl:wh en test="( $ParamChar acterIndex  + 1) &gt;  string-le ngth($Para mOriginalS tring)">
        157       <!-- R eturn -->
        158       <!--         -->
        159       <xsl:v alue-of se lect="$Var BuilderStr ing" />
        160      </xsl:w hen>
        161  
        162      <xsl:ot herwise>
        163       <!-- R ecurse -->
        164       <!--          -->
        165       <xsl:c all-templa te name="M ediaWiki-S ynthesizeU nderscores ">
        166        <xsl: with-param  name="Par amOriginal String" se lect="$Par amOriginal String" />
        167        <xsl: with-param  name="Par amBuilderS tring" sel ect="$VarB uilderStri ng" />
        168        <xsl: with-param  name="Par amCharacte rIndex" se lect="$Par amCharacte rIndex + 1 " />
        169        <xsl: with-param  name="Par amCanAppen dUnderscor e" select= "($VarFirs tCharacter  != '_')"  />
        170       </xsl: call-templ ate>
        171      </xsl:o therwise>
        172     </xsl:ch oose>
        173    </xsl:tem plate>
        174   </xsl:styl esheet>