21. Araxis Merge File Comparison Report

Produced by Araxis Merge on Wed Jan 21 22:23:27 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.

21.1 Files compared

# Location File Last Modified
1 Q:\Formats.2008.3.20682\Palm Reader\Transforms pages.fti Mon Oct 13 05:52:04 2008 UTC
2 Q:\Formats.2008.4.20859\Palm Reader\Transforms pages.fti Mon Jan 19 18:02:56 2009 UTC

21.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 8 368
Changed 0 0
Inserted 3 7
Removed 0 0

21.3 Comparison options

Whitespace Differences in whitespace at the start of 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 Shown in the comparison detail

21.4 Active regular expressions

Expression Description
\$(Id|Author|Date|Header|Id|Locker|Name|RCSfile|Revision|Source|State):[^$]*\$ CVS comments
<LastModified>.*</LastModified> last modified
- Title ignore - Title

21.5 Comparison detail

1   <?xml vers ion="1.0"  encoding=" utf-8"?> CR LF   1   <?xml vers ion="1.0"  encoding=" utf-8"?> CR LF
2   <FormatTra itInfo ver sion="1.0"  xmlns="ur n:WebWorks -Engine-Fo rmatTraitI nfo-Schema "> CR LF   2   <FormatTra itInfo ver sion="1.0"  xmlns="ur n:WebWorks -Engine-Fo rmatTraitI nfo-Schema "> CR LF
3    <Classes> CR LF   3    <Classes> CR LF
4     <Class n ame="encod ing" valid ater="enco ding"> CR LF   4     <Class n ame="encod ing" valid ater="enco ding"> CR LF
5      <Item v alue="Wind ows-1252"  stringid=" encoding-w indows-125 2" /> CR LF   5      <Item v alue="Wind ows-1252"  stringid=" encoding-w indows-125 2" /> CR LF
6     </Class> CR LF   6     </Class> CR LF
7   CR LF   7   CR LF
8     <Class n ame="font- style"> CR LF   8     <Class n ame="font- style"> CR LF
9      <Item v alue="norm al" /> CR LF   9      <Item v alue="norm al" /> CR LF
10      <Item v alue="ital ic" /> CR LF   10      <Item v alue="ital ic" /> CR LF
11      <Item v alue="obli que" /> CR LF   11      <Item v alue="obli que" /> CR LF
12     </Class> CR LF   12     </Class> CR LF
13   CR LF   13   CR LF
14     <Class n ame="font- weight"> CR LF   14     <Class n ame="font- weight"> CR LF
15      <Item v alue="norm al" /> CR LF   15      <Item v alue="norm al" /> CR LF
16      <Item v alue="bold " /> CR LF   16      <Item v alue="bold " /> CR LF
17     </Class> CR LF   17     </Class> CR LF
18   CR LF   18   CR LF
19     <Class n ame="text- align-vert ical"> CR LF   19     <Class n ame="text- align-vert ical"> CR LF
20      <Item v alue="base line" /> CR LF   20      <Item v alue="base line" /> CR LF
21      <Item v alue="sub"  /> CR LF   21      <Item v alue="sub"  /> CR LF
22      <Item v alue="supe r" /> CR LF   22      <Item v alue="supe r" /> CR LF
23     </Class> CR LF   23     </Class> CR LF
24   CR LF   24   CR LF
25     <Class n ame="text- decoration -lines"> CR LF   25     <Class n ame="text- decoration -lines"> CR LF
26      <Item v alue="none " /> CR LF   26      <Item v alue="none " /> CR LF
27      <Item v alue="sing le" /> CR LF   27      <Item v alue="sing le" /> CR LF
28     </Class> CR LF   28     </Class> CR LF
29   CR LF   29   CR LF
30     <Class n ame="marke r-type"> CR LF   30     <Class n ame="marke r-type"> CR LF
31      <Item v alue="igno re" string id="ignore " /> CR LF   31      <Item v alue="igno re" string id="ignore " /> CR LF
32      <Item v alue="file name" stri ngid="file name" /> CR LF   32      <Item v alue="file name" stri ngid="file name" /> CR LF
33      <Item v alue="file name-and-t opic" stri ngid="file name-and-t opic" /> CR LF   33      <Item v alue="file name-and-t opic" stri ngid="file name-and-t opic" /> CR LF
34      <Item v alue="imag e-scale" / > CR LF   34      <Item v alue="imag e-scale" / > CR LF
    35      <Item v alue="pass -through"  stringid=" pass-throu gh" /> CR LF
35     </Class> CR LF   36     </Class> CR LF
36   CR LF   37   CR LF
37     <Class n ame="palm- chapter-le vel"> CR LF   38     <Class n ame="palm- chapter-le vel"> CR LF
38      <Item v alue="new- chapter" s tringid="p alm-new-ch apter" /> CR LF   39      <Item v alue="new- chapter" s tringid="p alm-new-ch apter" /> CR LF
39      <Item v alue="new- sub-chapte r-1" strin gid="palm- new-sub-ch apter-1" / > CR LF   40      <Item v alue="new- sub-chapte r-1" strin gid="palm- new-sub-ch apter-1" / > CR LF
40      <Item v alue="new- sub-chapte r-2" strin gid="palm- new-sub-ch apter-2" / > CR LF   41      <Item v alue="new- sub-chapte r-2" strin gid="palm- new-sub-ch apter-2" / > CR LF
41      <Item v alue="new- sub-chapte r-3" strin gid="palm- new-sub-ch apter-3" / > CR LF   42      <Item v alue="new- sub-chapte r-3" strin gid="palm- new-sub-ch apter-3" / > CR LF
42      <Item v alue="new- sub-chapte r-4" strin gid="palm- new-sub-ch apter-4" / > CR LF   43      <Item v alue="new- sub-chapte r-4" strin gid="palm- new-sub-ch apter-4" / > CR LF
43     </Class> CR LF   44     </Class> CR LF
44    </Classes > CR LF   45    </Classes > CR LF
45   CR LF   46   CR LF
46    <Groups> CR LF   47    <Groups> CR LF
47     <Group n ame="files " /> CR LF   48     <Group n ame="files " /> CR LF
48     <Group n ame="toc"  /> CR LF   49     <Group n ame="toc"  /> CR LF
49     <Group n ame="acces sibility"  /> CR LF   50     <Group n ame="acces sibility"  /> CR LF
50     <Group n ame="pdf"  /> CR LF   51     <Group n ame="pdf"  /> CR LF
51     <Group n ame="optio ns" /> CR LF   52     <Group n ame="optio ns" /> CR LF
52     <Group n ame="navig ation" /> CR LF   53     <Group n ame="navig ation" /> CR LF
53     <Group n ame="file- processing " /> CR LF   54     <Group n ame="file- processing " /> CR LF
54    </Groups> CR LF   55    </Groups> CR LF
55   CR LF   56   CR LF
56    <Settings > CR LF   57    <Settings > CR LF
57     <!-- Enc oding --> CR LF   58     <!-- Enc oding --> CR LF
58     <!--           --> CR LF   59     <!--           --> CR LF
59     <Setting  name="enc oding" gro up="locale " default= "Windows-1 252"> CR LF   60     <Setting  name="enc oding" gro up="locale " default= "Windows-1 252"> CR LF
60      <Settin gClass nam e="encodin g" /> CR LF   61      <Settin gClass nam e="encodin g" /> CR LF
61     </Settin g> CR LF   62     </Settin g> CR LF
62   CR LF   63   CR LF
63     <!-- Pro cessing -- > CR LF   64     <!-- Pro cessing -- > CR LF
64     <!--             -- > CR LF   65     <!--             -- > CR LF
65     <Setting  name="fil e-processi ng-toc" gr oup="file- processing " default= "ignore"> CR LF   66     <Setting  name="fil e-processi ng-toc" gr oup="file- processing " default= "ignore"> CR LF
66      <Settin gClass nam e="process ing" /> CR LF   67      <Settin gClass nam e="process ing" /> CR LF
67     </Settin g> CR LF   68     </Settin g> CR LF
68     <Setting  name="fil e-processi ng-index"  group="fil e-processi ng" defaul t="ignore" > CR LF   69     <Setting  name="fil e-processi ng-index"  group="fil e-processi ng" defaul t="ignore" > CR LF
69      <Settin gClass nam e="process ing" /> CR LF   70      <Settin gClass nam e="process ing" /> CR LF
70     </Settin g> CR LF   71     </Settin g> CR LF
71     <Setting  name="fil e-processi ng-front-m atter" gro up="file-p rocessing"  default=" output"> CR LF   72     <Setting  name="fil e-processi ng-front-m atter" gro up="file-p rocessing"  default=" output"> CR LF
72      <Settin gClass nam e="process ing" /> CR LF   73      <Settin gClass nam e="process ing" /> CR LF
73     </Settin g> CR LF   74     </Settin g> CR LF
74    </Setting s> CR LF   75    </Setting s> CR LF
75   CR LF   76   CR LF
76    <RuleTrai tsSet> CR LF   77    <RuleTrai tsSet> CR LF
77     <RuleTra its catego ry="Paragr aph"> CR LF   78     <RuleTra its catego ry="Paragr aph"> CR LF
78      <Option s> CR LF   79      <Option s> CR LF
79       <Optio n name="us e-numberin g" group=" options" d efault="tr ue"> CR LF   80       <Optio n name="us e-numberin g" group=" options" d efault="tr ue"> CR LF
80        <Opti onClass na me="boolea n" /> CR LF   81        <Opti onClass na me="boolea n" /> CR LF
81       </Opti on> CR LF   82       </Opti on> CR LF
82       <Optio n name="us e-characte r-styles"  group="opt ions" defa ult="true" > CR LF   83       <Optio n name="us e-characte r-styles"  group="opt ions" defa ult="true" > CR LF
83        <Opti onClass na me="boolea n" /> CR LF   84        <Opti onClass na me="boolea n" /> CR LF
84       </Opti on> CR LF   85       </Opti on> CR LF
85       <Optio n name="to c-level" g roup="opti ons" defau lt="none"> CR LF   86       <Optio n name="to c-level" g roup="opti ons" defau lt="none"> CR LF
86        <Opti onClass na me="none"  /> CR LF   87        <Opti onClass na me="none"  /> CR LF
87        <Opti onClass na me="number " /> CR LF   88        <Opti onClass na me="number " /> CR LF
88       </Opti on> CR LF   89       </Opti on> CR LF
89       <Optio n name="mi nitoc-subl evels" gro up="option s" default ="none"> CR LF   90       <Optio n name="mi nitoc-subl evels" gro up="option s" default ="none"> CR LF
90        <Opti onClass na me="none"  /> CR LF   91        <Opti onClass na me="none"  /> CR LF
91        <Opti onClass na me="all" / > CR LF   92        <Opti onClass na me="all" / > CR LF
92        <Opti onClass na me="number " /> CR LF   93        <Opti onClass na me="number " /> CR LF
93       </Opti on> CR LF   94       </Opti on> CR LF
94       <Optio n name="pa lm-chapter -level" gr oup="optio ns" defaul t="none"> CR LF   95       <Optio n name="pa lm-chapter -level" gr oup="optio ns" defaul t="none"> CR LF
95        <Opti onClass na me="none"  /> CR LF   96        <Opti onClass na me="none"  /> CR LF
96        <Opti onClass na me="palm-c hapter-lev el" /> CR LF   97        <Opti onClass na me="palm-c hapter-lev el" /> CR LF
97       </Opti on> CR LF   98       </Opti on> CR LF
    99       <Optio n name="pa ss-through " group="o ptions" de fault="fal se"> CR LF
    100        <Opti onClass na me="boolea n" /> CR LF
    101       </Opti on> CR LF
98      </Optio ns> CR LF   102      </Optio ns> CR LF
99   CR LF   103   CR LF
100      <Proper ties> CR LF   104      <Proper ties> CR LF
101       <!-- F ont props  --> CR LF   105       <!-- F ont props  --> CR LF
102       <!--              --> CR LF   106       <!--              --> CR LF
103       <Prope rty name=" font-style " group="f ont" defau lt="normal "> CR LF   107       <Prope rty name=" font-style " group="f ont" defau lt="normal "> CR LF
104        <Prop ertyClass  name="font -style" /> CR LF   108        <Prop ertyClass  name="font -style" /> CR LF
105       </Prop erty> CR LF   109       </Prop erty> CR LF
106       <Prope rty name=" font-weigh t" group=" font" defa ult="norma l"> CR LF   110       <Prope rty name=" font-weigh t" group=" font" defa ult="norma l"> CR LF
107        <Prop ertyClass  name="font -weight" / > CR LF   111        <Prop ertyClass  name="font -weight" / > CR LF
108       </Prop erty> CR LF   112       </Prop erty> CR LF
109        CR LF   113        CR LF
110       <!-- T ext props  --> CR LF   114       <!-- T ext props  --> CR LF
111       <!--              --> CR LF   115       <!--              --> CR LF
112       <Prope rty name=" text-decor ation-unde rline" gro up="text"  default="n one"> CR LF   116       <Prope rty name=" text-decor ation-unde rline" gro up="text"  default="n one"> CR LF
113        <Prop ertyClass  name="text -decoratio n-lines" / > CR LF   117        <Prop ertyClass  name="text -decoratio n-lines" / > CR LF
114       </Prop erty> CR LF   118       </Prop erty> CR LF
115       <Prope rty name=" text-decor ation-line -through"  group="tex t" default ="none"> CR LF   119       <Prope rty name=" text-decor ation-line -through"  group="tex t" default ="none"> CR LF
116        <Prop ertyClass  name="text -decoratio n-lines" / > CR LF   120        <Prop ertyClass  name="text -decoratio n-lines" / > CR LF
117       </Prop erty> CR LF   121       </Prop erty> CR LF
118       <Prope rty name=" vertical-a lign" grou p="text" d efault="no rmal"> CR LF   122       <Prope rty name=" vertical-a lign" grou p="text" d efault="no rmal"> CR LF
119        <Prop ertyClass  name="text -align-ver tical" /> CR LF   123        <Prop ertyClass  name="text -align-ver tical" /> CR LF
120       </Prop erty> CR LF   124       </Prop erty> CR LF
121      </Prope rties> CR LF   125      </Prope rties> CR LF
122     </RuleTr aits> CR LF   126     </RuleTr aits> CR LF
123   CR LF   127   CR LF
124     <RuleTra its catego ry="Charac ter"> CR LF   128     <RuleTra its catego ry="Charac ter"> CR LF
125      <Option s> CR LF   129      <Option s> CR LF
126       <Optio n name="ge nerate-out put" group ="options"  default=" true"> CR LF   130       <Optio n name="ge nerate-out put" group ="options"  default=" true"> CR LF
127        <Opti onClass na me="boolea n" /> CR LF   131        <Opti onClass na me="boolea n" /> CR LF
128       </Opti on> CR LF   132       </Opti on> CR LF
    133       <Optio n name="pa ss-through " group="o ptions" de fault="fal se"> CR LF
    134        <Opti onClass na me="boolea n" /> CR LF
    135       </Opti on> CR LF
129      </Optio ns> CR LF   136      </Optio ns> CR LF
130   CR LF   137   CR LF
131      <Proper ties> CR LF   138      <Proper ties> CR LF
132       <!-- F ont props  --> CR LF   139       <!-- F ont props  --> CR LF
133       <!--              --> CR LF   140       <!--              --> CR LF
134       <Prope rty name=" font-style " group="f ont" defau lt="normal "> CR LF   141       <Prope rty name=" font-style " group="f ont" defau lt="normal "> CR LF
135        <Prop ertyClass  name="font -style" /> CR LF   142        <Prop ertyClass  name="font -style" /> CR LF
136       </Prop erty> CR LF   143       </Prop erty> CR LF
137       <Prope rty name=" font-weigh t" group=" font" defa ult="norma l"> CR LF   144       <Prope rty name=" font-weigh t" group=" font" defa ult="norma l"> CR LF
138        <Prop ertyClass  name="font -weight" / > CR LF   145        <Prop ertyClass  name="font -weight" / > CR LF
139       </Prop erty> CR LF   146       </Prop erty> CR LF
140        CR LF   147        CR LF
141       <!-- T ext props  --> CR LF   148       <!-- T ext props  --> CR LF
142       <!--              --> CR LF   149       <!--              --> CR LF
143       <Prope rty name=" text-decor ation-unde rline" gro up="text"  default="n one"> CR LF   150       <Prope rty name=" text-decor ation-unde rline" gro up="text"  default="n one"> CR LF
144        <Prop ertyClass  name="text -decoratio n-lines" / > CR LF   151        <Prop ertyClass  name="text -decoratio n-lines" / > CR LF
145       </Prop erty> CR LF   152       </Prop erty> CR LF
146       <Prope rty name=" text-decor ation-line -through"  group="tex t" default ="none"> CR LF   153       <Prope rty name=" text-decor ation-line -through"  group="tex t" default ="none"> CR LF
147        <Prop ertyClass  name="text -decoratio n-lines" / > CR LF   154        <Prop ertyClass  name="text -decoratio n-lines" / > CR LF
148       </Prop erty> CR LF   155       </Prop erty> CR LF
149       <Prope rty name=" vertical-a lign" grou p="text" d efault="no rmal"> CR LF   156       <Prope rty name=" vertical-a lign" grou p="text" d efault="no rmal"> CR LF
150        <Prop ertyClass  name="text -align-ver tical" /> CR LF   157        <Prop ertyClass  name="text -align-ver tical" /> CR LF
151       </Prop erty> CR LF   158       </Prop erty> CR LF
152      </Prope rties> CR LF   159      </Prope rties> CR LF
153     </RuleTr aits> CR LF   160     </RuleTr aits> CR LF
154   CR LF   161   CR LF
155     <RuleTra its catego ry="Table" > CR LF   162     <RuleTra its catego ry="Table" > CR LF
156      <Option s /> CR LF   163      <Option s /> CR LF
157   CR LF   164   CR LF
158      <Proper ties /> CR LF   165      <Proper ties /> CR LF
159     </RuleTr aits> CR LF   166     </RuleTr aits> CR LF
160   CR LF   167   CR LF
161     <RuleTra its catego ry="Page"> CR LF   168     <RuleTra its catego ry="Page"> CR LF
162      <Option s> CR LF   169      <Option s> CR LF
163       <Optio n name="fi le-extensi on" group= "options"  default=". txt"> CR LF   170       <Optio n name="fi le-extensi on" group= "options"  default=". txt"> CR LF
164        <Opti onClass na me="file-e xtension"  /> CR LF   171        <Opti onClass na me="file-e xtension"  /> CR LF
165       </Opti on> CR LF   172       </Opti on> CR LF
166       <Optio n name="ge nerate-out put" group ="options"  default=" true"> CR LF   173       <Optio n name="ge nerate-out put" group ="options"  default=" true"> CR LF
167        <Opti onClass na me="boolea n" /> CR LF   174        <Opti onClass na me="boolea n" /> CR LF
168       </Opti on> CR LF   175       </Opti on> CR LF
169      </Optio ns> CR LF   176      </Optio ns> CR LF
170   CR LF   177   CR LF
171      <Proper ties /> CR LF   178      <Proper ties /> CR LF
172     </RuleTr aits> CR LF   179     </RuleTr aits> CR LF
173   CR LF   180   CR LF
174     <RuleTra its catego ry="Marker "> CR LF   181     <RuleTra its catego ry="Marker "> CR LF
175      <Option s> CR LF   182      <Option s> CR LF
176       <Optio n name="ma rker-type"  group="op tions" def ault="igno re"> CR LF   183       <Optio n name="ma rker-type"  group="op tions" def ault="igno re"> CR LF
177        <Opti onClass na me="marker -type" /> CR LF   184        <Opti onClass na me="marker -type" /> CR LF
178       </Opti on> CR LF   185       </Opti on> CR LF
179      </Optio ns> CR LF   186      </Optio ns> CR LF
180   CR LF   187   CR LF
181      <Proper ties /> CR LF   188      <Proper ties /> CR LF
182     </RuleTr aits> CR LF   189     </RuleTr aits> CR LF
183    </RuleTra itsSet> CR LF   190    </RuleTra itsSet> CR LF
184   </FormatTr aitInfo> CR LF   191   </FormatTr aitInfo> CR LF