You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by je...@apache.org on 2007/10/15 21:26:49 UTC
svn commit: r584858 [2/9] - in /xmlgraphics/site/deploy/fop: ./ 0.93/ 0.94/
dev/ dev/design/ skin/ trunk/
Modified: xmlgraphics/site/deploy/fop/0.94/compiling.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/compiling.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/compiling.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/compiling.pdf Mon Oct 15 12:26:16 2007
@@ -406,8 +406,8 @@
56 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
57 0 obj
@@ -420,22 +420,22 @@
58 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
59 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F9
+/BaseFont /Courier
/Encoding /WinAnsiEncoding >>
endobj
60 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F9
-/BaseFont /Courier
+/Name /F2
+/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
61 0 obj
@@ -459,7 +459,7 @@
endobj
3 0 obj
<<
-/Font << /F1 56 0 R /F5 57 0 R /F3 58 0 R /F2 59 0 R /F9 60 0 R /F7 61 0 R >>
+/Font << /F3 56 0 R /F5 57 0 R /F1 58 0 R /F9 59 0 R /F2 60 0 R /F7 61 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -574,10 +574,10 @@
0000012265 00000 n
0000012488 00000 n
0000012670 00000 n
-0000012778 00000 n
-0000012888 00000 n
+0000012783 00000 n
+0000012893 00000 n
0000013001 00000 n
-0000013117 00000 n
+0000013107 00000 n
0000013223 00000 n
trailer
<<
Modified: xmlgraphics/site/deploy/fop/0.94/compiling.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/compiling.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/compiling.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/compiling.xml Mon Oct 15 12:26:16 2007
@@ -134,4 +134,4 @@
</ul>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/site/deploy/fop/0.94/configuration.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/configuration.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/configuration.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/configuration.html Mon Oct 15 12:26:16 2007
@@ -177,7 +177,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: xmlgraphics/site/deploy/fop/0.94/configuration.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/configuration.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/configuration.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/configuration.pdf Mon Oct 15 12:26:16 2007
@@ -658,8 +658,8 @@
85 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
86 0 obj
@@ -672,22 +672,22 @@
87 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
88 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F9
+/BaseFont /Courier
/Encoding /WinAnsiEncoding >>
endobj
89 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F9
-/BaseFont /Courier
+/Name /F2
+/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
90 0 obj
@@ -711,7 +711,7 @@
endobj
3 0 obj
<<
-/Font << /F1 85 0 R /F5 86 0 R /F3 87 0 R /F2 88 0 R /F9 89 0 R /F7 90 0 R >>
+/Font << /F3 85 0 R /F5 86 0 R /F1 87 0 R /F9 88 0 R /F2 89 0 R /F7 90 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -861,10 +861,10 @@
0000027739 00000 n
0000027974 00000 n
0000028188 00000 n
-0000028296 00000 n
-0000028406 00000 n
+0000028301 00000 n
+0000028411 00000 n
0000028519 00000 n
-0000028635 00000 n
+0000028625 00000 n
0000028741 00000 n
trailer
<<
Modified: xmlgraphics/site/deploy/fop/0.94/configuration.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/configuration.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/configuration.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/configuration.xml Mon Oct 15 12:26:16 2007
@@ -378,4 +378,4 @@
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/site/deploy/fop/0.94/embedding.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/embedding.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/embedding.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/embedding.html Mon Oct 15 12:26:16 2007
@@ -177,7 +177,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: xmlgraphics/site/deploy/fop/0.94/embedding.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/embedding.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/embedding.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/embedding.pdf Mon Oct 15 12:26:16 2007
@@ -1412,8 +1412,8 @@
176 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
177 0 obj
@@ -1426,22 +1426,22 @@
178 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
179 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F9
+/BaseFont /Courier
/Encoding /WinAnsiEncoding >>
endobj
180 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F9
-/BaseFont /Courier
+/Name /F2
+/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
181 0 obj
@@ -1465,7 +1465,7 @@
endobj
3 0 obj
<<
-/Font << /F1 176 0 R /F5 177 0 R /F3 178 0 R /F2 179 0 R /F9 180 0 R /F7 181 0 R >>
+/Font << /F3 176 0 R /F5 177 0 R /F1 178 0 R /F9 179 0 R /F2 180 0 R /F7 181 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -1802,10 +1802,10 @@
0000053611 00000 n
0000053988 00000 n
0000054158 00000 n
-0000054267 00000 n
-0000054378 00000 n
+0000054272 00000 n
+0000054383 00000 n
0000054492 00000 n
-0000054609 00000 n
+0000054599 00000 n
0000054716 00000 n
trailer
<<
Modified: xmlgraphics/site/deploy/fop/0.94/embedding.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/embedding.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/embedding.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/embedding.xml Mon Oct 15 12:26:16 2007
@@ -681,4 +681,4 @@
</section>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/site/deploy/fop/0.94/extensions.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/extensions.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/extensions.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/extensions.html Mon Oct 15 12:26:16 2007
@@ -177,7 +177,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: xmlgraphics/site/deploy/fop/0.94/extensions.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/extensions.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/extensions.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/extensions.pdf Mon Oct 15 12:26:16 2007
@@ -319,8 +319,8 @@
46 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
47 0 obj
@@ -333,22 +333,22 @@
48 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
49 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F9
+/BaseFont /Courier
/Encoding /WinAnsiEncoding >>
endobj
50 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F9
-/BaseFont /Courier
+/Name /F2
+/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
51 0 obj
@@ -372,7 +372,7 @@
endobj
3 0 obj
<<
-/Font << /F1 46 0 R /F5 47 0 R /F3 48 0 R /F2 49 0 R /F9 50 0 R /F7 51 0 R >>
+/Font << /F3 46 0 R /F5 47 0 R /F1 48 0 R /F9 49 0 R /F2 50 0 R /F7 51 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -471,10 +471,10 @@
0000008822 00000 n
0000009080 00000 n
0000009486 00000 n
-0000009594 00000 n
-0000009704 00000 n
+0000009599 00000 n
+0000009709 00000 n
0000009817 00000 n
-0000009933 00000 n
+0000009923 00000 n
0000010039 00000 n
trailer
<<
Modified: xmlgraphics/site/deploy/fop/0.94/extensions.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/extensions.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/extensions.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/extensions.xml Mon Oct 15 12:26:16 2007
@@ -114,4 +114,4 @@
</section>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/site/deploy/fop/0.94/fonts.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/fonts.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/fonts.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/fonts.html Mon Oct 15 12:26:16 2007
@@ -177,7 +177,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
@@ -226,7 +226,7 @@
<a href="#truetype-collections-metrics">TrueType Collections Font Metrics</a>
</li>
<li>
-<a href="#register">Register Fonts with FOP - Auto-Detect Fonts</a>
+<a href="#register">Register Fonts with FOP</a>
</li>
<li>
<a href="#embedding">Embedding</a>
@@ -528,7 +528,7 @@
org.apache.fop.fonts.apps.TTFReader -ttcname "MS Mincho"
msmincho.ttc msminch.xml</pre>
<a name="N10248"></a><a name="register"></a>
-<h3 class="underlined_5">Register Fonts with FOP - Auto-Detect Fonts</h3>
+<h3 class="underlined_5">Register Fonts with FOP</h3>
<p>You must tell FOP how to find and use the font metrics files by registering them in the <a href="configuration.html">FOP Configuration</a>. Add entries for your custom fonts, regardless of font type, to the configuration file in a manner similar to the following:</p>
<pre class="code">
<fonts>
@@ -559,30 +559,17 @@
<ul>
<li>
-<span class="codefrag">java user.home + "/.fonts"</span>
-</li>
-
-<li>
-<span class="codefrag">"/usr/local/fonts"</span>
-</li>
-
-<li>
-<span class="codefrag">"/usr/share/fonts"</span>
-</li>
-
-<li>
-<span class="codefrag">"/usr/X11R6/lib/X11/fonts"</span>
-</li>
-
-</ul>
-<ul>
-
-<li>
URLs are used to access the font metric and font files.
Relative URLs are resolved relative to the font-base property (or base) if available.
See <a href="configuration.html">FOP: Configuration</a> for more information.
</li>
+<li>
+ If relative URLs are specified, they are evaluated relative to the value of the
+ "font-base" setting. If there is no "font-base" setting, the fonts are evaluated
+ relative to the base directory.
+ </li>
+
<li>Either an "embed-url" or a "metrics-url" must be specified for font tag configurations.</li>
<li>The font "kerning" attribute is optional.</li>
@@ -593,20 +580,25 @@
<li>The fonts "directory" tag can be used to register fonts contained within a single or list of directory paths. The "recursive" attribute can be specified to recursively add fonts from all sub directories.</li>
-<li>The fonts "auto-detect" tag can be used to automatically register fonts that are found to be installed on the native operating system.</li>
-
<li>Fonts registered with "font" tag configurations override fonts found by means of "directory" tag definitions.</li>
<li>Fonts found as a result of a "directory" tag configuration override fonts found as a result of the "auto-detect" tag being specified.</li>
-<li>
- If relative URLs are specified, they are evaluated relative to the value of the
- "font-base" setting. If there is no "font-base" setting, the fonts are evaluated
- relative to the base directory.
- </li>
+<li>The fonts "auto-detect" tag can be used to automatically register fonts that are found to be installed on the native operating system.
+ <ul>
+
+<li>On Unix platforms the autodetect feature looks in java user.home + "/.fonts", "/usr/local/fonts", "/usr/share/fonts" and "/usr/X11R6/lib/X11/fonts" for fonts it is able to use.</li>
+
+<li>On Mac platforms the autodetect feature looks in java user.home + "/Library/Fonts/, "/Library/Fonts/", "/System/Library/Fonts/" and "/Network/Library/Fonts/" for fonts it is able to use.</li>
+
+<li>On Windows platforms the autodetect feature attempts to determine the Windows fonts directory (usually C:\WINDOWS\FONTS) and also the existence of a PSFONTS directory for fonts it is able to use.</li>
+
+</ul>
+
+</li>
</ul>
-<a name="N1029B"></a><a name="embedding"></a>
+<a name="N10294"></a><a name="embedding"></a>
<h3 class="underlined_5">Embedding</h3>
<div class="note">
<div class="label">Note</div>
@@ -631,7 +623,7 @@
<p>When embedding PostScript fonts, the entire font is always embedded.</p>
<p>When embedding TrueType fonts (ttf) or TrueType Collections (ttc), a subset of the
original font, containing only the glyphs used, is embedded in the output document.</p>
-<a name="N102B7"></a><a name="embedding-base14"></a>
+<a name="N102B0"></a><a name="embedding-base14"></a>
<h3 class="underlined_5">Explicitly embedding the base 14 fonts</h3>
<p>
There are cases where you might want to force the embedding of one or more of the base 14 fonts that
Modified: xmlgraphics/site/deploy/fop/0.94/fonts.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/fonts.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/fonts.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/fonts.pdf Mon Oct 15 12:26:16 2007
@@ -5,10 +5,10 @@
/Producer (FOP 0.20.5) >>
endobj
5 0 obj
-<< /Length 890 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 875 /Filter [ /ASCII85Decode /FlateDecode ]
>>
stream
-Gb!$F9lo#B&;KZQ'fttPAr=s55B7tT3FjJ#2"=6MD%FVlUC"rC/CO%V/)(o_8I"@@+`P4ICKJ-/X]N\7lqOW3+:KG*00N;7U`KT*LB0/;$j'nXI"id:6P/G=f4\>7kt7Is0aU0fDfgDOJ*pFX7TX6\%u>-tBFHS/6hfU1&47GC2VtnJnLQ1nCn)p/O"b%orcX)g61eJKNZb4r"Qql4GU&HoAQ%3DgY\5Mod%<,Tt!oo4gRlV/2QJ_FJ36NZ1d9;Qdq;P*HDJeB(%$71#s1\8]Af!h(6EYaJ33YY>^'I\C<LRW#m[oj)YpMORY4MG%\R!*0JjZ+1HNe.$JYW+?]J?'Q5$/V"FtOaACtLN1f(Y6A?uYc+Z^u0uhGchS5_]#1:(Y/HGJV!We%WX,.<!E+_sr`fn#4W'ng'AiW!A.P:3)EA>XWhH')pUj>cZl0;]0e[r.@\!8R@<T[-YfHe(Yr:C8FW4!T*&01bdA"+Pb%XHqThNa,ni'%Qbh$U8pH3uWS%d5#?__eT9V2`<$K!;033lGb`qF&%!#.&c/3Wa,R!0';qE=<m%KU+mLi@TW(@_EPV2MZ6o67hf,?nDH_JIb'QO]=CGO6OM&K'VnK12.G!]oe&pr$V0[\TrC;NNp0eDKR\J'&(_04HZTf;r4Lm0GpEAEXDOq(tW2^cc'A@S/#Br,oLT-#QdK3@,6dP.d7Jqm5iHtb-ap>?LR65'UD0HUfYjUR@EW];-'U>=FT*ee))JmQ!*JPD*%EgpV`s+$]OTNFiT@^iBR^RoR;$$FiR8fr"'9.?jPD>T28E]O!s'T$g.HRg,?^F&r@A345b;:n,,&qB6T/,0_@^B6?Dj_2Z-25npE3<ak)qQb*C?kQo&ejTsDeG-muI?s.S)=#6~>
+Gb!$F9lo#B&;KZQ'ftD@Af@@=J)geJ%[kG#-D'IqmD0WJ1r7h09cF"ZAK)jS@;mhN0aEfA?0sh=?7k3a)9sWQ$mH7c*)q@*%K_K>!R`%u4JM^XL*1Ve&>nC+@$F1O>$Q\!iq`H,?oEME[9D7l/?ZfB&Dh-Q(gte%meGg+L=g-u^T0lp+q'fU/MGnS?4`Lte^5TF_'t-Z5thdi0)!<S:+27IW%^C/5:L+-=ai)2@A^,RVVC0#-J%M1;TWTfg65elMeB:Z`oI0E:'F'@j;9gAL!a@.:VnX'K5>+J`u:AMWH!Gcf:QFGkK&9>j,H9>O++u++E'b7mF!gh3oYHPGk"9OYEoXFl2_"8QT=X>kdJ$`^<A[6a&+!t0Jg'H)t_Q$lL!($?lpQM@E@/mBJ0C5o]UW]SEE4-V;*DP_pc=J7=$+0H<SU`m+m_5cRC,V5--\iHh:iMPhDn]4:;/T?k:FVcN"6N2PV7d,62uVn70B[mi$lVgl``6Kje0ZU/Wn^"IpqGFHhE,)V?pq`o&jC37+l=6F@J4,+emgT&2me!S0bk#/63Z#1!TB6_IrYT"lW+Cd_On9=VJSQKh;NL4P)pHQi1*W#UHQFQ!592L#pme-`/28OM81,KmLfErPPmG=4;CAZ\/gUMu&9OHB43YRRJo67eJrmI1F(Ol9m[&2<U"o4H4t7CPL"gL0lHDe(EBc/,P.0J(q\Ec%A3KrudS/[YqDe\A_!\d,",1(Bf3FfetORon9hSsDFHW_j?R*%1hgc8TB@ebJ4H%mch4RXcjW#pn-kJ3rZ]?lm&-9Xu)m&X?g>3pc_>`1MTJF@Yd&6eCM:f=)c7gonmV^E!ekdnQR2I'$BP7^X>*WFWN]ntF1p0Dt@0PQ~>
endstream
endobj
6 0 obj
@@ -109,7 +109,7 @@
22 0 obj
<< /Type /Annot
/Subtype /Link
-/Rect [ 90.0 388.641 323.504 376.641 ]
+/Rect [ 90.0 388.641 224.516 376.641 ]
/C [ 0 0 0 ]
/Border [ 0 0 0 ]
/A 23 0 R
@@ -315,10 +315,10 @@
>>
endobj
47 0 obj
-<< /Length 2707 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2690 /Filter [ /ASCII85Decode /FlateDecode ]
>>
stream
-GauHND3*G]&cTMZ6M6[_J=)Y$pTuq'Qc.Js0"j+)U+!TA+j76p6kXWg\W-Xf%4Omf>4Tj[h/';KU<)<...@hKT9X>rGT72`:*b.X,=cPg15:Q0l=H
7_!9JRlElJP0`7oNUl&p7P\V%-f*KC:WmDO)6C0[]CXMtpDaY#F6Jd,+*JOgm[:!R_o(L;XNbtO:D9=bsgQBOPh@EC:/*j-NFP;:Gfs'##^`jmUWg@CgWaKfZV((+Zfa`L!ZCs2rY'M%p*sg?h;rt!,W;&IZ_/(n9c/L9(An\nlCC&@4[;9&%Zq$?&-"`'Ei"<.[;<u-RAN<8,DHN-p_Q77)p*i_M0PjM4kIO=e]1W-(Z"<8]i+Z-[N^IW'%fWpW!/X-M5u([".XYWHRDb@c0`bg?#AFfq'G:l'KgNXuFE?H<a<dZ+#e'^2Nc0;5dI-`KTKIFcDRhA+*4/$8[md3VJ3m_]c4Yu=mI?G.&,2m&A)rXqAX-pW:W?MV9?fm;HH5WP:rgl>88-,>)GSI;bV_8^W)=#olF6o'p&bbYSc-TcG0i"XWK>/3$>r`1p?hfXLn;i"!FI*uc^PUpi#9ktZ(.'Z_Zjhc7TqX6._?@@c0!rl4Nc;m$4&_8TH5L(GbM16Vk5<D:Ob,Ke[LCiLDS!c+F#*#bSXp*4gD'[e24ne'Y4RQcak4aW2qY?L4nS]O`Cbkn]5[R,B\$5Ash)&FIN9U1Psr.AWe6o&(2K23Mgo^Ad"lNkJI[l=b"Bt-RmJYdp5fC(>uZ74b?@]r=N#U1#a[^Tr!IoW,T+O3;u0@n%Zk9g+sage/e,U0:F8O9&F:.-cuc)0Xah)S<d0rV3<0HJqMFU0n6nuC/7VamO)B8[DTES@L^;l%Z-t4Je5>D(d$.)3i[3!*;q2uL*fO4<*W+k%<'-LX]RMR\p8PQnq)7Lb!2`EqV_I.Ucb8f98Egun'Jh+H'U`rRAYGA"*DR:&h_1aG-u-p&e1OJ;7.u/G9eZ4GgD2u=u$0g'G\I[gY"=BL)QJ.pgn^FOQ>r'+7l6Rh*_@':etqs<LKAW*3#7);=ZS;06JBO%TFKkU8e<8:hkGg4!6i53_Q%2oTYK)?@D5PJ%fW35(CUfFks
5m\lkLhTonmg\uojJ.%F5<@Cg#r`:pEK;^`*K3X&Fk\45X=_doT0ZfdB_*lmN#fh%s=VUF1aPB;#J(VqE/<:2n%eCg75!W1&^K0Ws1<N`T^lusR*Cs)pf!iW\]OhjUgHlV5>,H:/Y*983$?WtBDb#='Yl%22Ro"oA!H<IN(LN"`OV,e@.Oq#J2DIfQ.mX*-@\uV=`I%0I@6-6d?(&59sLdm;!EkU/a8sFt_:A0XnrS]OA`#6nn!5Q8l\2>`pi,p:T(D8l=C+/s4Vo/&'59-/nK4EUJ_MLJ86rT==H&g"C9!T_%at&_069E..O"Uj3=ffPk7W8rlKZ*Ga.9;`V&Em8$_uD:$n_FdBJKs<.>hAE+rF%l3kdhai<fNc0=$U,[`(c/K)H/idC<:jL6Ph/ua,6PldIP5g.FZm)=nWYi`S4IPllZa>/6>(7=+#i31)lO-@Iem0p$BJo;/n>pDAM_\@&Zl^rS-EsMX>_5Ck6.iCn]"+/iI,JH:*aH9G(:sok[bhFg>N=:W[K],E8c#OM^=lj$i!h9MFe[/ACH9,W,Y_N4]Qr"-m2XaZ$NJMg4mQd,o[S1AiYN?rZ'7*85oT(LF8%1K4<U?@8V6[6:%:!ak?o1"tl=]1D\q"*kMETl^ki;4EHV+>bXLg/<37fmef&O1"1PF,`BO5o']R6.6f#Y3Wd:($Z";P/"3d!h9`TZn%mQcD=Om+@33<J0ntb!;&?eZ7O?~>
+GauHND3N__&cR6oK%63ZB.Si=hq^=LNajC"`/X)]e&bR[%Rj5-D3A9t.VJ_W/jPM'Lt#X(om,tZ+L'LHG5'YnjDPhFmhQGK4]#VrhqpYCN0o@c]("0lIJ>gF=?p-V)J*`d*rb^!mDT5cE(E7?b]dI/"$`b*2"M#pNi/Ab[6;tn9]ApmA)as&,DK'5NM-afh]Q<J[...@QSg-N>d0^^FU3/c^!Qu[af6H6@/hFo=NlrL5muj\A_o!>J,?](Li7Fg^ru!NV%SjVKF2eEW2_dK7dNdFf42_q6oP4HfgqcQ`6>R+k\q0Wf+4dJU,*ds#LKP3i2<(2TT)Z?%/iaOQQM??CSp:&Ko2YhbS#GDK&8gtm%bG\lqLRbgr9"UN3riVK9(cj.WonMNkSLCI>Y4&2JN-<L;n\)ZV)goh;=/29s-Y5H?R(KpE0Xl4G"K&.[T2?SID8-0O/'4b_@iiZiT5?PCHa?dIU\8Xo#42?f-4[=;t4f_jduj[CFPmdC8l&!'lITeB1Q]pBEVRLI)g6=n9UG'iq5@S[n#u;50S:YTB?.96@Y+T^BSf2*SbiZq@31/pjXp]K]cciLA[[%nO;10)@/?InBuFr>D!K:+6Mmnk2cV`n)(ZFTAqpc`_0,r>7TK1e7_p^k-`(Vi:ep"f)<C>n)iXs/\C&i237GKn@d];!\u*Ma]/r_D;aIK`^:k0Ckmo!^p]UmP*j00*1@+a#4'9=6XSm^p`7g1DBS+@WjXt#b$jZ7ZJ"%!:'q]+'H.udO*GgMd_EXS#C!l0PK"l!9rZbCQCEmCpM`!i.(kp9#'U^?QJ4U
)DG4G]Zfhb6Dd=Yh</\b$1RgI\5<MsMQ<4n^`+En>eusHS@aG_X*jb@_5K$od\4knp3HI&fRkRG.AJ<,/aAZ"*qPP_ol`b)FRXmo<Nu*QQMh&aE?D;;:,*%g?:!qP6VZ.Tu%D>nce_@&$5a]!P.Sn;V`MX:RNn=6V,g*u5K'&!"L*1m\o;36iH\D2l@Q#Y2/ob)0[6CZpQ?/kb3Y'V;R'fW84Jg0_(n6_2\LnQ2C(ij4C`,;mGhQ-0@hXcjKE!M.5U'',O;$fG$Ld#d9VP.W(a$'$Kf&=*#)NQK_B<8j\iK:YjH@q&"C#2Va#?,TB_Qj3:nH-3ViF,l)m'[f:"^?r:e3#$/<Le'*f\jeHmEhT+a52G>`"4+A;k*4e6E]^G<A(sFmKNsKU-U[UT%CS\Y]QH<GFg+*ESoRI\=NM[Jr56%U,au/*(]<Jf>E:?$edOU*oQ7`tsThnU69-E/!Fmj#eppL,ID"Ks]K6WpGc4249'Jnh>tL@mF.I%J;se_$aNp4oI4:?2Ba^WLcPK0"a/%"Mkc2AB$%hc&#`&VoJ69a3[7oIFA'rLLknU1aF&ZMNgbqN2IKt4&RHhAVNdY:U^qo>a&8q>UCn_\<QF>qbq7=DFQ<PG:m6qbk_o%S>8]VFaHF)=b,D$oa!;fp.%qFa,$dlL6`TYK>Q#d@=(./^&&G]d[ouZ@nrZB5A6WZ.XdpqT.hcL^t;,AE*?9cQ]@6U#nB;FLA^l4W'*<"\=\0%eIIN6K_EC#$Abh9JcN34(d$.)g8]/l'`K^!L*fO4<)egN%;u>UX]XtSFM1psGX4NIj^6GH[9S<FPipLi$1T/,*P+0AcSDFKe!+d[JF;nq_St0TY1+(2YlKXs;qpk`9>Vm3FtjS594i^*U*;RH><D]::a;1u^[r'*P<@Rh@t(6%:!BMg\SBTpb2cO`8@;]^OtTsaW<6RJTQ6_><?6mT;Y+D2"VSbT1Y:;T:RV41lQ1HZK?hPlE4N:C?uY
V2rH)ec`,i-H3uA?uh"YA"[DpO8N7g_Tg-4lu':Qs]5%2%M\7]/_IE5"Z]$t!CRTh7k*EV+a9`<$21*,6gC!;fWX?N1l#]u!9J<g^We2K-B>)LXMlu"'`^4_^GPOV:updobroHmkjb=,_S"O\1,)BZgNf90<7i"ujIna4C_/)BsLQ+F#sjF!/-pOZn#9E+_aeVcnT:q"#>j3j*CgJ0YXd*CT;$H*h.oDl\O+1O0ZfALcs%T`it?tuY#0?;!#W8S\aX+Onc'#KdJJ"k-._E>kT;'fA.L?0/mCnO#P:WFj_B3$,E^C)%"+9A2(2:[J.5(P&f1&S6')rDV9jP+,baE=S-hOg[oSq"qT3RnBb@0JK68[NDt;.Ib(D/kr'Ds.0IH<;o?p^L"mpLX2I,4##?2LG=9Q5ub%Zh`UYs,&I,&gmR_c`t-%Gs+1+eY(W`!]LHKlr1<k]MQ5Q8$Q2kN\-p$`"pL-i*[4qTJn\ja:qJe?VfhG^.u+Vq,=TTeO\`#5,@\ZBjoEa;_08=04s*`Ko[*8Ym4TiW.EC!lJ<I_[RE<)E!l2A-5lfJ51%eC'V7Q"9u)Q(/4[[IWIN2G4sV6)*Y(3EVfr(ODY:[`UjMhB47T"@3f&lb`Pc'o)O.3b;dMk8T?>5r._;K^U!IY=`P,Zkq`AXe>i-.YqOWkbX6ThW%Pb=B_ZC=:<SR%/o.u$%B@[1W5AW8%@/~>
endstream
endobj
48 0 obj
@@ -383,10 +383,10 @@
>>
endobj
54 0 obj
-<< /Length 2628 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2705 /Filter [ /ASCII85Decode /FlateDecode ]
>>
stream
-Gau`VlYkfA'*"Q<6M76->0A*9l4NXqh"L#%&)B-<;m\f2+)%.PFXp*;74%:"re>_/D:+E=_!N>N7<@>'h[IPNs*XRsoA-$_`7_rPLV&ARSeHi%r!pR\ISUhU>gIViE#*X^hn?e;T0sq$4Z<cnO#`dN&O3#d21cR`OW2@?iR8$E6inO:lVf';2GY=P_+2i;40M]/KE&lH"&6pI@-]rDS3QGVSumoUIIkb[O7W;<UMYJH-:ti:Ms9l)1CZLlo3R;K=t1\N'qT!SKA)4A6*i67A!O6Pa#$:KL:=3_MPVf`@9Asna-D<[&AM5N-i<&\LR4?gLUi^F^7Gf"UFa'r%ESS(:.$[$ZskRX>fI]$39Fgd;65lsX?p&A:*l_<m<H1F8n>eCWj]goP"Y?9mU?/uS@E!J*!#?CAL5Ol<W$@$A0iQ^2"X[Z=I?Ti1_q!9WFEnJ\cc@_Be,m-*HKG38D'2GOBW2+dN&flWITh-=^u0P4S2n,jc.i(g.7hVn#jteA"H=25'1AFYCQd8j+.I8i&.TC)^%+Gee!pV`L%aY@I++\XYIV4@r_W+j'5C%$2aejqD'Y@)e^[Aj/Ah!Um691/Yhr#nSB9>\4$sH2%!7^,hfcta$PUf_gcP:&/%"Z/*VTVA9mZOUIXW7lFZ#?mV?(c&XPCVd%DPqh?/7a[SaUZ*K/WfcCFYDo+PJp&I>f]2U6X^YGlc!"K)Y/=o5EQQISak$B@iC&'O9*RdTlO*:(I0_6"lnqEofX#q2-n+;>e(6?`q468sL,lW,b`?r2L4S6m2jXo,Qb4Y6;SOYQI"*j8W2=:MB7HsX'nR)[0?)<;D<m7]To##]!Y[me#+2jJ1]:n*4"8Ju<S,GI4]?*#lYa_Ig>b@),UF2pL&TK&5<[7@iaV5[1ub[5XanO82R<+05*[M=TR<Ps/dje[<WQ;+r:;=1pJ[\#fHq3I?+.uSp07qUmSNAl;Op9.=OVtnJS^nI]g".*!ojTR#]Y-<8
hgUl/_Sas*IA1-b`$c.9''/s;bA&r`Oj[^KAqd8seoC/RA7pip_[C+qmP)(A6MGN@'=>pu^H\GV+M_$C8>5LA/-1CH!gElAW;t<!#8<"ocEhHic(b9Mj(qE4Nk6n,fG>*&:Ql="ekNYPh_1*W!L3a4_Uq84%W&=BkGWV>([Bc!SY%N;)h4tZ'/CLLSR8p)RBt%Z[/*-p;g9k/G!C:2;/%<lJ>q6H.Tmr7g+G`^:^D$/PcE_Pchd%`KqIME3QW`AN!UJhGqXakNXBZqLJ[ho'iIikNU-rMr>a^@g-^7;kLbrJl[]\(QB_^h`T0rlrj;"p`UT>/@OhG4XjU&IU_8J7FlmLbRq'VJ%(VE./H`:4OKja9/*^dWt?$GNR2Be1J0cJa?M\&rk9-8Hn)?ujRF"VWr+$d1$`VkZHCb^ic/E6h>j9PbXL[-fZdK;=9oXnd;0KimMErlEpO20&I2lNWB#$i_=!H`q8OV<['^+40:h,8@mQs,TtE^K`W+->s'<7b?%Jqj"5Z!3%7[$')F'iqsbm;7kmH*ho'[2%dV19oVmA\(WjEF>X1oI>mD\'_%:QQ6be(9"Z%W4n(VAUI1NaX86Q.(mW-Y.tF'9&Wn3Y&(:Ak1O=:=_NA5S'F:G_u9<8([;j+m>msgHArgp"/(NDm42`8>?XfH3ijgReEdeW@O42g*&4F2rgA=RCPfYUK=Xc('>7c0+\`bT1Yoj*5]>QkQ,log0.^8:9$;Y&%lc(Z;XS+b/,\@^@9&oPbEor#iT"N,Zc5bShe23%Cq@m`6XBMDn\0eD:14E"OTK[OK2,u@0=dUEE#Z=sF%A,qc>U];TbL,PY:$(^1ig_Im!(_\d7;,s@/8>tkfZS%mPbSS*@r*mcJRZ`k"A]gO,en3o*8AP6b236)sM2bki;T9EGe6LTG"^;qQO@=3SFsET5/bWNQCcD9iu62rSnFO>I($!HSM3BGj$KedfbdJUQP=C5BK:"A<mm6o+kE8W+]
3o/eq!Cib=G;otWH(QYMamOT.:N31$rc=&==I4j>Mr70CusZ"sYL>]"KLC\V\n%rKXb0WU[4._4fEQ9>FD^04ZfB@_c_r&nM0(_$2j%)7,pmt]eedgeod_D03SJ7E6@%aBh0`l's1KO:40-3tH4S*nIX&S[0NdR*nG^bIrJmrHq/'BDYB-9SKHXo;/,<87Zo5g[Efh"4>(]]6neJuQFtNM=g[,3rQhPj->^,"IZ#TQol-2cuc&cG6cKi".Y/JYD7!XOB;FY%8r:D89ZO01jN@B7AE,h!o>'KsJkN\BWf<roJD&ol/]Zk%PN#N.su;5B?u\/;/9q3deU\[`C@kZ@sks6RdCu3#uq-R?$nHRQ$(UA\33K=iJqQC!%i[BOW]f-DmR8q9%n]+Uj@Ng(kB&aR;j3`nfE*IPq?&Y%]lMY#n1Cpc#e+*%^c<Ak4*1`,:)=+p^OPT\YH\mh4?'ansCI?adja%Jh5jg=ZpABT0aaDJkn->9I5TjgG'!L&)`cr;@?jepr<^5PCWnE9!lsi/qqOnKG32s.]fXVGY.uf-W]3io0r3Btq'(r7ASne;Ur7kZljn2!E],7n2+V_j=+]HV3'IB):#rh&f^7Q.eIHAtO;#7e6KnH=3)kN8-a;B'Wnj)gq9B`/"Z>~>
+Gb!#^lYkgn&c\H;6M76^1mUR&U85d$JF<)X\751jc/rsM2#T\o[%jcF/g\L&s1Ui`LU--aid`pQ@Z0@WkP:Sjl1[tt5<dp%kDiY+q"s;.TXJ>b`o+VP6MNe>?"+K!P/:DYrT!>E2pQV`jopc`3Hd[CJ?%3$7P%4#/G"XX5?SXM&/*\L74TpTO[U8bk\5D,e:K^M9<?K=Uj`ScXf'\FkF:oUgH7"$Ir##+HM[MPRN'sXe5#niI/_]c1Ipt_,K28f8g/s%Sg;3@q'(Ou`P0-K<ONbdisbGphJQdOen$Ip_pEcp/L6=?D&XXFZL<9fp\asZ\5[7-mhWh9,RZ!*4n?A=;j3+N-(#cC[dQ/,EQh.@,2],+YR!\*3aF0MBZBY5W^&$RippZ*>&u-ahd1DT+%A/H`X]dB>Z\4e?c?AaV6%TD]7sX4NR&e1$Dq(GX"mIr)6^jlBXNgJJK6Mk?:^HKm>tJ2i6i=OVC7"PfGK$Nd[W<Ul/G1S1N-<$N+^c<lMHT9I@PCJ2m7c7aDoOW+*_AiCBF^;_[6Gh-(+-VRt[0kdM`3-4!Z0r1X5TWSA65nDD0Ij^O_^IFr8_.KXC&O60hHqSp7LKHJB\M[i0fH!"s-Bpe+qNGFJKsa<Mt7\l[;\l,iF&^IF77IakdYQ0)jUi"2A9>#;CG^"rhJ7,&"'OA:(<Z1P0f'_<PNOV)Q@_]%PuMUtrM+Mat;J?41OjQe91=UAf+B>a3sQb'^J57CP#U0q"+YO55[8-Hdu$l0!K_kO,!*G,NfCu%V`"?t>.KCud;h8iA@hSWgK(Fc]goPh3G@kj3UiH`8B@2b/oq@H:`1GeD4)G#uW5NLKUhGpk(5cksu-h[G(4!L]\e+lU%R]P(t^)0>E2cK^P!QD#DW%H^dXEA6g@K+F0KWc"V<osT%LDPLij)TAtX/rNqB\A'>'@`>KFo)<ia[9<hHc#n<*3#>L0b4,;o\ZBVNjF^WJ7Dn/"0S[+apS^YXMj6
)CT"R+3oLlJLec[_(4prf,dul_N?Z]5qE9CZ6;ZjS+p`gei7H![82D[8_ZNm+c*Zm6H7b#ki*0KN<0T.E,LUC<R_"IlTmYBR5DfRpn;:>?&QXc5:L:<Anq:8ITEg(t2RohEa,)/7'edq\?E/<Y,+h*7_0M_df.B_[8/)Ya5U.:6$ZS&2\,bTSGp%'6HQ[9B\K5i^:=tUU'F=Zq7a)hH,""Wf^UmgXOW5L3:X;[W"k+'AeFEn;C7^i+Y>A#O'Y8sC*gFo_A-<A4dN$<^9c4:WlJ.Vt5i?cOr4G0/dq;RQfSambNQ($dbLE:q\p3=.`QQFR1n"#o(d2=ReE5$PUmb")UIV$PBJhG2W>]Q:/jJZ<22<"K>$J3i9uHe`+Cs)ps7'^LdA5Zg>Rhoj9\E,`"M7^41ZXV%1):(&A06r:`+E>t"PF%#4\'Q41bV>);lF7u`MjCgFa;F>T]E%VC0a,Ffg*mih,X\ZkL:C5a]uVn?\HWG<fk&."=pRRdL^j&?AZmib;)-jlo3#p"DeD]C*2a.L*k;kCC9aI.eaZUpCPq<s/t/=7BC]E)K@4?QIo\FKl`t'a0!9cN^hh/PMQ:%^I=<gY[jc73s?$/G"OnslG@2E+Y#EjYtt-,7jSYf]o4a!^F'_rZGbN!WN?\+2m%ATB(GmaM:[';X+qe^JgZcnfRT84b__G^8\X?.0[9F3`UIse]a]$fjpmdMS(<b3J86VA;]%?RAK#_S*V\bB1.(I,C"F/d1r+28<C_[p&'O],Wqj6-PXQs)!j,9YoFKT>)d[P:]X7`f=FScjAtk29E+c/5"UiN$FP(>5e&LiEVTu>t60I,iIQ668O&G^m5e65>]MesWLs]o3=^O`t!9rSJf/t#bB(M\%g$)M17$Tm[0YKO*N:A51"W50BFr?>%,fUQu2,=mJ7GS"/n1eS]>J,@"gF(6PZi6'YI"iN`1f;A;>IEfP8Fk$FBKNm[eAofI.ME&0KCr[EW,mj8jjn
rOlo#iY;)$q\;O>!'MQtW#%Atoh[B9_Er)H9*Dp/gMSb@916"Wjqf3"`\5g,'aqpNh3^e0f3,IVS-?e9VO^pu&!'`g,CGGHUhS/cmLW021)B5UQGZ9Q(Z*B/d7i<;F...@d1Sd>:m1h^9/G/K2Q`CU.e/^ZFmIg@ohj--pYV'6[F=2U`5gt`Nmuc&ko5K'/Z_t`RTs)UXfR6ETV(DB0(5oA1ZBK\9!h1^0f8T'$mJs`iMnqm_"fq?Kd/~>
endstream
endobj
55 0 obj
@@ -420,7 +420,7 @@
58 0 obj
<< /Type /Annot
/Subtype /Link
-/Rect [ 324.264 404.57 419.94 392.57 ]
+/Rect [ 324.264 476.87 419.94 464.87 ]
/C [ 0 0 0 ]
/Border [ 0 0 0 ]
/A << /URI (configuration.html)
@@ -451,10 +451,10 @@
>>
endobj
61 0 obj
-<< /Length 2432 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2468 /Filter [ /ASCII85Decode /FlateDecode ]
>>
stream
-Gatm=D0+Gi%/ui*U#jId]8!TIV1.a]B'X>?]@OU^[dF5Ldl)+WV,<Hjs8,)8[Qp7f'5u.7MI_8@*WQ]Np:L.Ng\KAa=0Alah]K"1O3F+BMVp:H')9*K]nlH4j@JDaY("(\DLQ_P+$6V9hp#5(ZVGBB5H`JY#!PUac^>TpT.^6YOrNT8$YStRMmpZW/XK_DDk+S4q+pt/1Qo7c*'%tt]JtFWlD9't3-+E=^\m_V1T9So,RracZ6Vhq)D(Jm,T'n_?'fg8<!'-E_$p=Z2<q?X1<5G[2:C'aaA)PSrH=N3[oN?_b8TGIp]]X,H/U#cKkC^Kr4!CBKDM.2+<5^a)<oGqZej.`o(8T]9;3^"4oJ$QfIPd]i$^O-p=FpeNuj?)%[u`M$qTqW$p,<Ce0E)lOKb("1("g)GC&^h:!UA_&"Vc@<DpSq98Obf4b3,5)`-Sc=f]l:jHUXU8LB`s1-%O$QE2.r7#>7,0m$>Q<E2Z`?nNBVhc4@-<@LoGEkGa9kk0mlnV4GCN0_nXE@37L/L$dY<ak>=A=oJp])4A5.Z?X.]/6Wb8Y8\W0FGlPrZBU(YK<VT'njNs/krCiKR:B;fk73_k`Rn\V,\IuiuLY3;tHa+GEXF^i]uZnQ/eF`ZLuI*g4SPs,nd\'W+BaFMCk$L/bf(hRcf"o!(#-mo\+h=He[sGF4aT#9cGiR(V+FF`LNf;&i<e^20g`nh6QR2MPXp8P%Ceu^Xu]?mhEHP,[-Wd,rooS6f#VkeGt=65Z]07!-Vq+fhd'S8ZuS@?X9CY777ZX#G1)oD_@pa5TJIU<F;U;3!S,[NWBF6O9Bn1,[3Q+&D7m\"%i-qeG]mKJ0#\d+c%?UH"YcP\s,M/`2chAN_4m/.)8!bW)Ksm78CsqjO1K]9;6u1^JH@%4Z#3BSLJW'gDV,oW"$lXW53+c(:;rpp=6tdhs[D5@f1;dH7]B$kE9Hh7O/BIo))='V)1ZP+Gj,FC0A9#pZ<7N[FD/
*dZ2tc,\n[D]Y^XGa`?'FBE9`o2!8P5,EAqAdAc9T3FP\),bnC,q#10;P6C7b$t9k<&_'CI@";!aA(7Ba6[ddbL<6pef8)@8`CoaLAd!#/aoYY?s6@n9T$taj[/*gtG9s:o4;<g0UEXIRfM>&L#P\ZCY5o&Bm=n4?CEb?GVTot.?j8(F%CGtC_[pAQ+$NFb63^?DFA(_n98cII%*fqjR#`%"Zs`#tRA_((`@83?=^U5X)(VZ.2PpiB6Np*U:n:Ih7%&bHOGd:>]jGH,;>Hi&E;+tahQXXr2*!Q]D:"UE&j%0RWu@.r2XBurPN;jUoncO?]LUBM6K197*'gI63\9slb%Mnu@uL(ADE,$)9&CR+qS4)OL*k8(92<MjSHji-nk!+Cboc/P4uU9ZFYJGkri'(nAX9MQPZiLK6$T!^V=31,1fJ]GZtj2ZD\*I.2="jOj!bn%NJ:L`q3h\[)iaRNO]Ee3d5K76$dEM$"4Xb^kIYJ]P_V.;\!>b,#98a^jVq3.NaA#S;_Wb.F$/d;/G%;W\6ca2kDSgihd_rCN2tuib$O!A[)V87_3*XT[hD+>RP?`.SpFl0,sI1*fA-G(F6tO.;Gb"C_ECL$;^fp>MJk8S*;;MjX'-f&pj.RJ#Ds0.f)mGLRB:<\GQNYD.C@GkS!VPilt7;`S/#?9=g?"ZP1P$EdWu^,aoXPF1*WE6Wd/qXL;KO".F6bZ(Y`S">Z&&Oq-N/^!KI>\M_/QP9VSVh,T"gCI(_i)s$9=t1&qm\&>.(<K\#jA^j-A`m+lFs.Qg(PYCM`T]%-X4^U#Mu+`ethbpWFF;%<6r0X]g=^pK#:U<&cF=h\I)B8E=jd@tG&a!F_IhbfQFa`@h2I@tV[2&a!Nrk'`sAWD(Pm@<55%pH*lJ:5d#eCP?R?5bD<@hS,[h38EM1QER;/-Fj]&^f=O&qV!TjFUsM_;<S.<QLcR3>:bFBtGr7KQ"\\PqC]um3lWVG0Y]%mNrOJ*Y:
3:6VbpE(HZ33m:mlhB"bIJo^VoDP(XF)=NhTC_b&Upe-3@I/S2*ZemFn?G#NTq0c2hgD>pmnfaWr'cDmKHCY^o'_9isZC#;O`[Kb3hiB`,?\],03^PT]+,k:T(R;n1qau5lnR:)1mURZ5%m\b8R,aE\rNTV5Y58u6!:9B7gk]S^L),-'BOe.)()nkOPLagn&:Bd?K@#HU,a-VGGaAnT1%5rn-83@nJb5iKu'$",b,ZM2Mns3_-W@_$qiNF77=B"Lh4&DBsEdCJIJtn>UL-G7VEPASheuoJ?RDtB@jo-e/_,9A$NEm(?X?E<rH919=6LAm=2/]#j,`.<45LQsRGDpY$T12-T$6<f9:=q\dC\LF&Y[a%,L3'=RklRnIDH`&2qD7dCDe*j.TK:?d0O9eh$!VP9GZ]Hj<;#PEm]jjbP#fp`e:_uQO]&@N<b6D4!q\.jlZ12~>
+Gatm=gN)%,&:O:SY^VElA&GsCb$/aYdqN8M<l^b3I=N_:_N_N]TPaXU(F3QE-pk5i`"P_<\A7OKmb*NT:JX/K:]<LsX;1[5HkO!.[_a_O=$MZ&oeQ#Qid%4DQo.,(mH"43!A>c`HMZnfYT3>_FEq=S68na%Q=Htn_]U4um9A&`qWht6"\WAL2WrYf)qaZQg$GfCC7;$`eq^`@g&77U+)gT9B!^fmDpu>OH2fJ@([*'FMZ-5N=b"8ZGU6LaTNfAJ8bO6En!ZtrXhV"&015D\O8+(O?PW]MjKe&(\O<(;I6(/d;A'jD=,_69>[9jcj0bh'<GIT3%S5NfX[YJ\82'rkS$U(ckGrK[jrA4N4&-Jnn/f0'&+:0Ui]EGP<gNR)n"6`UjF^#l!^D!S()#tVP[FQrrSsL0&D%jnJ2I<Vr.FaJH#Ju$]rfeO.,0@+C"N%-/shSrr.W=SaMVX:]K@_b:R#g/K,%6."pVIs^Habth#l*M.GNTUmUN0F3V%tF8*rlt.jTJBT.:nG'3X)ak7c[^h1O?oZ3AW'nI%'f@0h8?D[d"VfpAIQS8bNQ-TcKrMLFJinsQH'#spm#nlc$kQlL"%9&:kGQRG6*b83i+'[M\hTs2cLo^IU/MlJDQ6D,8r;7#MaA-6SVkca/,H9@l]i[kn`BIRd9B<WT-4Q;1$niVTl&RhNX^G`1/0n=D,%BDY?qnpPc8/V<HYj+&*2QZ8,`9sm=Fe!EOG:3:QY_'OKKk"PfHu_@4<BMdONc2RXJK:<EdZhmm5@1*JGfhWK-Wr$)P9PKa6F'%P?2L'ZbH?;q*85+D]@P27I<HXcOQ@sqCBb[#JLiH>UEs90V_$@M1XnGS\.hB3XZt\[eo)89X9Ddr8gu`=%R\d`QfXn"B`Vmf6jLN)W%f7RD_UF@/E+c^F>/O7cL]-+e8UlJiBH0i->M(t.<=d-C7Pq:Jr&&`!!HLm8q8++TegO%9Br^U#B]!o(jr9H?2"?2%[S)
r*95SC=@4CK)\Lu\a/DA1Q::MhmH%4fH3Z\$\FcAM*5Y(<;o...@ZeZKME>2,.L?``odAso2]\\s-0rOhbg<Mt]'4[H34bg$e3-o@uN?K!LT]8_PH+o$rX1`\C+NT6U2"pCWWB$,2>CqTo"[TTGrEfH<=1*)^HI,l9O4.;D;AViEn;'^;(Ed;WLk6<YtgrX`b(ZII4;jm30bM@oqSD`P:_K,j0kM1R>`)&$)L&O^mL9;U0[t!1allI(Bb;qg.\9f&WGG.!j.)&6fEa7qoO(t(Fj/Y%T*[hLlS.?`6-`41\j<UsF(V/\^B_+P-M#G+TN^O$bRGepN6!W`T9<2@h6=fp@*k,;a:)-hD1-C&9TKLcffnCjf,S_gLmq#*;i0[raGi7qN#o%NYi&T:*ZZG4,2u*HO&HM.tqNCV6KiVf8^i9fPm+"2a.Qg"R08#Q1Wn$CEF(Z$-KZo#"*1u^F7btK0RCEf-nQ:cUe^u4+XSJ9\%nuNsEO=;#'XcjYV/#TB.B!TF9/t<h.Mc
3]Ja;[79f=Y&<*O-ZNmg4,\bla,6-W5s%WJop[5<KdDenUKGQaD=s,?Y,i!pS9X^!EmR?:.f=[HnO3a/cqd5..G$2"Z<hJL*EI5@H6fg7Q34&.S@B,L8_2t1MVLo<m&3@VS1DkoD&bI&b`e_6\EmIaO+#qZiGR%G1UHYm[f(Z:UVO?)-#Il_=bi:\]+m:NKnT8"Y]VK'8SC:hAU\'6`h)Bpr<>A:'W0NA8e+q2:FIQ79hrs(g35OC>WRinjhod;8U1I8EL:,c0;V_>P+'mdiYq\oFRL*NHlbFr_J0PI2l3leYXn&E7%*^T>VCs/>m,u%R<UPMU<ctscjXaXcX>_-Xa"k&E%'Qf%^:#%uQaZ-'M:OEdFh<qaoV=,EJh7"U_>E-l*!0),+cW,>251n6tU>7LKMOVCpAfQa.7Q\+s59l*HkP3JQ"I^GG`dq#HNk4o8;O27)Y+Dq@-"mTfWZnfQL_O<@[4KJ$*h`N5!.njs~>
endstream
endobj
62 0 obj
@@ -495,10 +495,10 @@
>>
endobj
66 0 obj
-<< /Length 627 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 773 /Filter [ /ASCII85Decode /FlateDecode ]
>>
stream
-Gat$t9on!^&A@7.N,iA<9P...@6c>Jp?WtH>9]G3;Q53Mej(b/R5%Y!+%Zo]<U5"FbEAp[W#f=OC.n\6ICU%+bQY),=pf;N27]/^q4@;`,d[lUo^eYTJ`5P_ROEW7)t6o>1t(l)CU6^lco[nFFtm`.V/Gn_f>,!rnLRkO.iGjIq"$/YHfhHZ)/gQ$nN#7hub_6Dm;Pnq9>h.>>UWcU313r=];1p<k:l.gMuV8g@IT5i;PEnn;N^,qrp/q<r6@ua*c,1Jlh5qZEB%n4(`>+1/l`3E>E#4p0!;;XY:SpCGa8RI7rBeW^OXYCNq<naEJ)S`I@;Wc>Z&<f?u9e=_oTAFZNBU$Zd#T_%49bO.udh)br);=*1r!HET10Bf"XmEVV/2-C?Vs3N=3kh@i#`d'K>/E`jr,#FKUEH51Od0Xc,me(-"i=c;OU-l<jleW*mKW"~>
+Gat$u?#Q2d'Re<2Y]rb^Eq'sSWR=bHQ;j;2/_cZ"Xm1P&3!9Nn,IC)Br<tE57!-k1E,r_=osm9]+WAV#dI.Z5Z$d]aOoe*>#eP,NloH;["66=:BJoWAHMIMfIh<f$Va]>PDT]23#We:V'EmPHb0\Tse+nnse'ebpciDhaGeMROCc]2^oo'ub5'FqhT3%SKRArs3LL)r3H^-YLFN1".lX\acl?ta*X*m%TfDA:*a'KS8QT++G73AZlYRl'&_>C'eD-aTueR8Hp3*58l9tc0/Gr:$4qX=^T=.R'm54A'%7*c9`:JGHl$3k2U"gk*\5O,=@c)jWTc5_Jp&dJ\p,YZY_='?,$AW5IUIXOUZ,m4<g<MC2K99Fm`i3Ps,FqoZ=BQ2hXo_t5SQAiWB8XT(1m.3<"!;8Ht9Dd$3*\A_]]:TP;%28m[3o!n$P>3nDW&b[UcAR-(kJY!P:qXf0$j,##aE;*,BDG7"c8/QR(^TA`9suerIlK)hTLbR8\BQWP3q`LW"sGsYYas`V(R(C]ia"DTP"knH4]onog<Ss8AkF5DrpcV'PQQ'7Gli563W=USAS'4MAo;Mtas=:(!CC(mGD0@q`@N<g;G]2VHsYZ93p_5)(BV"R967TG99=_R)QraCQ*tOp7]pqHfZm/F'QR$uD.'@'bP%sVTN*HG73rIjQPsGBDJ)I)W&qBJqaCU_RL?5S\h]c#Yr[%-H__V81;4YYV$)GYC'cETn97l4h"nb`1u_CL4"Fad%1qmLfSZp&],CPJBi&S(~>
endstream
endobj
67 0 obj
@@ -596,7 +596,7 @@
>> endobj
79 0 obj
<<
- /Title (\376\377\0\64\0\56\0\64\0\40\0\122\0\145\0\147\0\151\0\163\0\164\0\145\0\162\0\40\0\106\0\157\0\156\0\164\0\163\0\40\0\167\0\151\0\164\0\150\0\40\0\106\0\117\0\120\0\40\0\55\0\40\0\101\0\165\0\164\0\157\0\55\0\104\0\145\0\164\0\145\0\143\0\164\0\40\0\106\0\157\0\156\0\164\0\163)
+ /Title (\376\377\0\64\0\56\0\64\0\40\0\122\0\145\0\147\0\151\0\163\0\164\0\145\0\162\0\40\0\106\0\157\0\156\0\164\0\163\0\40\0\167\0\151\0\164\0\150\0\40\0\106\0\117\0\120)
/Parent 75 0 R
/Prev 78 0 R
/Next 80 0 R
@@ -620,8 +620,8 @@
82 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
83 0 obj
@@ -634,22 +634,22 @@
84 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
85 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F9
+/BaseFont /Courier
/Encoding /WinAnsiEncoding >>
endobj
86 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F9
-/BaseFont /Courier
+/Name /F2
+/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
87 0 obj
@@ -673,7 +673,7 @@
endobj
3 0 obj
<<
-/Font << /F1 82 0 R /F5 83 0 R /F3 84 0 R /F2 85 0 R /F9 86 0 R /F7 87 0 R >>
+/Font << /F3 82 0 R /F5 83 0 R /F1 84 0 R /F9 85 0 R /F2 86 0 R /F7 87 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -727,13 +727,13 @@
25 0 obj
<<
/S /GoTo
-/D [62 0 R /XYZ 67.0 659.0 null]
+/D [62 0 R /XYZ 67.0 620.6 null]
>>
endobj
27 0 obj
<<
/S /GoTo
-/D [62 0 R /XYZ 67.0 312.217 null]
+/D [62 0 R /XYZ 67.0 273.817 null]
>>
endobj
71 0 obj
@@ -744,93 +744,93 @@
xref
0 88
0000000000 65535 f
-0000028415 00000 n
-0000028522 00000 n
-0000028614 00000 n
+0000028527 00000 n
+0000028634 00000 n
+0000028726 00000 n
0000000015 00000 n
0000000071 00000 n
-0000001052 00000 n
-0000001172 00000 n
-0000001274 00000 n
-0000028748 00000 n
-0000001408 00000 n
-0000028811 00000 n
-0000001542 00000 n
-0000028877 00000 n
-0000001678 00000 n
-0000028943 00000 n
-0000001813 00000 n
-0000029007 00000 n
-0000001949 00000 n
-0000029073 00000 n
-0000002085 00000 n
-0000029138 00000 n
-0000002221 00000 n
-0000029203 00000 n
-0000002357 00000 n
-0000029269 00000 n
-0000002493 00000 n
-0000029333 00000 n
-0000002629 00000 n
-0000002811 00000 n
-0000002997 00000 n
-0000006191 00000 n
-0000006314 00000 n
-0000006348 00000 n
-0000006530 00000 n
-0000006716 00000 n
-0000008910 00000 n
-0000009033 00000 n
-0000009081 00000 n
-0000009288 00000 n
-0000009499 00000 n
-0000009681 00000 n
-0000009867 00000 n
-0000013258 00000 n
-0000013381 00000 n
-0000013415 00000 n
-0000013597 00000 n
-0000013783 00000 n
-0000016583 00000 n
-0000016706 00000 n
-0000016754 00000 n
-0000016926 00000 n
-0000017095 00000 n
-0000017277 00000 n
-0000017463 00000 n
-0000020184 00000 n
-0000020307 00000 n
-0000020355 00000 n
-0000020525 00000 n
-0000020694 00000 n
-0000020876 00000 n
-0000021062 00000 n
-0000023587 00000 n
-0000023710 00000 n
-0000023744 00000 n
-0000023926 00000 n
-0000024112 00000 n
-0000024831 00000 n
-0000024954 00000 n
-0000024988 00000 n
-0000025170 00000 n
-0000029399 00000 n
-0000025356 00000 n
-0000025489 00000 n
-0000025669 00000 n
-0000025928 00000 n
-0000026131 00000 n
-0000026343 00000 n
-0000026583 00000 n
-0000026894 00000 n
-0000027260 00000 n
-0000027430 00000 n
-0000027753 00000 n
-0000027861 00000 n
-0000027971 00000 n
-0000028084 00000 n
-0000028200 00000 n
-0000028306 00000 n
+0000001037 00000 n
+0000001157 00000 n
+0000001259 00000 n
+0000028860 00000 n
+0000001393 00000 n
+0000028923 00000 n
+0000001527 00000 n
+0000028989 00000 n
+0000001663 00000 n
+0000029055 00000 n
+0000001798 00000 n
+0000029119 00000 n
+0000001934 00000 n
+0000029185 00000 n
+0000002070 00000 n
+0000029250 00000 n
+0000002206 00000 n
+0000029315 00000 n
+0000002342 00000 n
+0000029381 00000 n
+0000002478 00000 n
+0000029445 00000 n
+0000002614 00000 n
+0000002796 00000 n
+0000002982 00000 n
+0000006176 00000 n
+0000006299 00000 n
+0000006333 00000 n
+0000006515 00000 n
+0000006701 00000 n
+0000008895 00000 n
+0000009018 00000 n
+0000009066 00000 n
+0000009273 00000 n
+0000009484 00000 n
+0000009666 00000 n
+0000009852 00000 n
+0000013243 00000 n
+0000013366 00000 n
+0000013400 00000 n
+0000013582 00000 n
+0000013768 00000 n
+0000016551 00000 n
+0000016674 00000 n
+0000016722 00000 n
+0000016894 00000 n
+0000017063 00000 n
+0000017245 00000 n
+0000017431 00000 n
+0000020229 00000 n
+0000020352 00000 n
+0000020400 00000 n
+0000020570 00000 n
+0000020739 00000 n
+0000020921 00000 n
+0000021107 00000 n
+0000023668 00000 n
+0000023791 00000 n
+0000023825 00000 n
+0000024007 00000 n
+0000024193 00000 n
+0000025058 00000 n
+0000025181 00000 n
+0000025215 00000 n
+0000025397 00000 n
+0000029511 00000 n
+0000025583 00000 n
+0000025716 00000 n
+0000025896 00000 n
+0000026155 00000 n
+0000026358 00000 n
+0000026570 00000 n
+0000026810 00000 n
+0000027121 00000 n
+0000027372 00000 n
+0000027542 00000 n
+0000027865 00000 n
+0000027978 00000 n
+0000028088 00000 n
+0000028196 00000 n
+0000028302 00000 n
+0000028418 00000 n
trailer
<<
/Size 88
@@ -838,5 +838,5 @@
/Info 4 0 R
>>
startxref
-29450
+29562
%%EOF
Modified: xmlgraphics/site/deploy/fop/0.94/fonts.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/fonts.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/fonts.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/fonts.xml Mon Oct 15 12:26:16 2007
@@ -17,7 +17,7 @@
<document>
<header>
<title>Apache FOP: Fonts</title>
- <version>$Revision: 569104 $</version>
+ <version>$Revision: 573799 $</version>
<authors>
<person name="Jeremias Märki" email=""/>
<person name="Tore Engvig" email=""/>
@@ -231,7 +231,7 @@
msmincho.ttc msminch.xml]]></source>
</section>
<section id="register">
- <title>Register Fonts with FOP - Auto-Detect Fonts</title>
+ <title>Register Fonts with FOP</title>
<p>You must tell FOP how to find and use the font metrics files by registering them in the <link href="configuration.html">FOP Configuration</link>. Add entries for your custom fonts, regardless of font type, to the configuration file in a manner similar to the following:</p>
<source xml:space="preserve"><![CDATA[
<fonts>
@@ -256,31 +256,30 @@
instructions on making the FOP configuration available to FOP when it runs. Otherwise,
FOP has no way of finding your custom font information.
</note>
- The Unix autodetect feature looks in the following locations for fonts it can use:
- <ul>
- <li><code>java user.home + "/.fonts"</code></li>
- <li><code>"/usr/local/fonts"</code></li>
- <li><code>"/usr/share/fonts"</code></li>
- <li><code>"/usr/X11R6/lib/X11/fonts"</code></li>
- </ul>
<ul>
<li>
URLs are used to access the font metric and font files.
Relative URLs are resolved relative to the font-base property (or base) if available.
See <link href="configuration.html">FOP: Configuration</link> for more information.
</li>
+ <li>
+ If relative URLs are specified, they are evaluated relative to the value of the
+ "font-base" setting. If there is no "font-base" setting, the fonts are evaluated
+ relative to the base directory.
+ </li>
<li>Either an "embed-url" or a "metrics-url" must be specified for font tag configurations.</li>
<li>The font "kerning" attribute is optional.</li>
<li>If embedding is off, the output will position the text correctly (from the metrics file), but it will not be displayed or printed correctly unless the viewer has the applicable font available to their local system.</li>
<li>When setting the "embed-url" attribute for Type 1 fonts, be sure to specify the PFB (actual font data), not PFM (font metrics) file that you used to generate the XML font metrics file.</li>
<li>The fonts "directory" tag can be used to register fonts contained within a single or list of directory paths. The "recursive" attribute can be specified to recursively add fonts from all sub directories.</li>
- <li>The fonts "auto-detect" tag can be used to automatically register fonts that are found to be installed on the native operating system.</li>
<li>Fonts registered with "font" tag configurations override fonts found by means of "directory" tag definitions.</li>
<li>Fonts found as a result of a "directory" tag configuration override fonts found as a result of the "auto-detect" tag being specified.</li>
- <li>
- If relative URLs are specified, they are evaluated relative to the value of the
- "font-base" setting. If there is no "font-base" setting, the fonts are evaluated
- relative to the base directory.
+ <li>The fonts "auto-detect" tag can be used to automatically register fonts that are found to be installed on the native operating system.
+ <ul>
+ <li>On Unix platforms the autodetect feature looks in java user.home + "/.fonts", "/usr/local/fonts", "/usr/share/fonts" and "/usr/X11R6/lib/X11/fonts" for fonts it is able to use.</li>
+ <li>On Mac platforms the autodetect feature looks in java user.home + "/Library/Fonts/, "/Library/Fonts/", "/System/Library/Fonts/" and "/Network/Library/Fonts/" for fonts it is able to use.</li>
+ <li>On Windows platforms the autodetect feature attempts to determine the Windows fonts directory (usually C:\WINDOWS\FONTS) and also the existence of a PSFONTS directory for fonts it is able to use.</li>
+ </ul>
</li>
</ul>
<!--note>Cocoon users will need to setup the config, see FOPSerializer for more information.</note-->
@@ -328,4 +327,4 @@
</section>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/site/deploy/fop/0.94/graphics.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/graphics.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/graphics.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/graphics.html Mon Oct 15 12:26:16 2007
@@ -177,7 +177,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: xmlgraphics/site/deploy/fop/0.94/graphics.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/graphics.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/graphics.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/graphics.pdf Mon Oct 15 12:26:16 2007
@@ -1120,8 +1120,8 @@
142 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
143 0 obj
@@ -1134,15 +1134,15 @@
144 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F6
+/BaseFont /Times-Italic
/Encoding /WinAnsiEncoding >>
endobj
145 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
146 0 obj
@@ -1155,8 +1155,8 @@
147 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F6
-/BaseFont /Times-Italic
+/Name /F2
+/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
148 0 obj
@@ -1180,7 +1180,7 @@
endobj
3 0 obj
<<
-/Font << /F1 142 0 R /F5 143 0 R /F3 144 0 R /F2 145 0 R /F9 146 0 R /F6 147 0 R /F7 148 0 R >>
+/Font << /F3 142 0 R /F5 143 0 R /F1 145 0 R /F6 144 0 R /F9 146 0 R /F2 147 0 R /F7 148 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -1465,11 +1465,11 @@
0000037177 00000 n
0000037405 00000 n
0000037582 00000 n
-0000037691 00000 n
-0000037802 00000 n
-0000037916 00000 n
-0000038033 00000 n
-0000038140 00000 n
+0000037696 00000 n
+0000037807 00000 n
+0000037919 00000 n
+0000038028 00000 n
+0000038135 00000 n
0000038252 00000 n
trailer
<<
Modified: xmlgraphics/site/deploy/fop/0.94/graphics.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/graphics.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/graphics.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/graphics.xml Mon Oct 15 12:26:16 2007
@@ -395,4 +395,4 @@
</p>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/site/deploy/fop/0.94/hyphenation.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/hyphenation.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/hyphenation.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/hyphenation.html Mon Oct 15 12:26:16 2007
@@ -177,7 +177,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: xmlgraphics/site/deploy/fop/0.94/hyphenation.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/hyphenation.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/hyphenation.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/hyphenation.pdf Mon Oct 15 12:26:16 2007
@@ -507,8 +507,8 @@
63 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
64 0 obj
@@ -521,15 +521,15 @@
65 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F6
+/BaseFont /Times-Italic
/Encoding /WinAnsiEncoding >>
endobj
66 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
67 0 obj
@@ -542,8 +542,8 @@
68 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F6
-/BaseFont /Times-Italic
+/Name /F2
+/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
69 0 obj
@@ -567,7 +567,7 @@
endobj
3 0 obj
<<
-/Font << /F1 63 0 R /F5 64 0 R /F3 65 0 R /F2 66 0 R /F9 67 0 R /F6 68 0 R /F7 69 0 R >>
+/Font << /F3 63 0 R /F5 64 0 R /F1 66 0 R /F6 65 0 R /F9 67 0 R /F2 68 0 R /F7 69 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -677,11 +677,11 @@
0000020543 00000 n
0000020870 00000 n
0000021081 00000 n
-0000021189 00000 n
-0000021299 00000 n
-0000021412 00000 n
-0000021528 00000 n
-0000021634 00000 n
+0000021194 00000 n
+0000021304 00000 n
+0000021415 00000 n
+0000021523 00000 n
+0000021629 00000 n
0000021745 00000 n
trailer
<<
Modified: xmlgraphics/site/deploy/fop/0.94/hyphenation.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/hyphenation.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/hyphenation.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/hyphenation.xml Mon Oct 15 12:26:16 2007
@@ -231,4 +231,4 @@
hyphenation.</p>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/site/deploy/fop/0.94/index.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/index.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/index.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/index.html Mon Oct 15 12:26:16 2007
@@ -180,7 +180,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: xmlgraphics/site/deploy/fop/0.94/index.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/index.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/index.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/index.pdf Mon Oct 15 12:26:16 2007
@@ -198,8 +198,8 @@
29 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
30 0 obj
@@ -212,8 +212,8 @@
31 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
32 0 obj
@@ -244,7 +244,7 @@
endobj
3 0 obj
<<
-/Font << /F1 29 0 R /F5 30 0 R /F3 31 0 R /F2 32 0 R /F7 33 0 R >>
+/Font << /F3 29 0 R /F5 30 0 R /F1 31 0 R /F2 32 0 R /F7 33 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -302,8 +302,8 @@
0000004481 00000 n
0000004781 00000 n
0000004921 00000 n
-0000005029 00000 n
-0000005139 00000 n
+0000005034 00000 n
+0000005144 00000 n
0000005252 00000 n
0000005368 00000 n
trailer
Modified: xmlgraphics/site/deploy/fop/0.94/index.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/index.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/index.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/index.xml Mon Oct 15 12:26:16 2007
@@ -47,4 +47,4 @@
</p>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/site/deploy/fop/0.94/intermediate.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/intermediate.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/intermediate.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/intermediate.html Mon Oct 15 12:26:16 2007
@@ -177,7 +177,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: xmlgraphics/site/deploy/fop/0.94/intermediate.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/intermediate.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/intermediate.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/intermediate.pdf Mon Oct 15 12:26:16 2007
@@ -337,8 +337,8 @@
46 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
47 0 obj
@@ -351,22 +351,22 @@
48 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
49 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F9
+/BaseFont /Courier
/Encoding /WinAnsiEncoding >>
endobj
50 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F9
-/BaseFont /Courier
+/Name /F2
+/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
51 0 obj
@@ -390,7 +390,7 @@
endobj
3 0 obj
<<
-/Font << /F1 46 0 R /F5 47 0 R /F3 48 0 R /F2 49 0 R /F9 50 0 R /F7 51 0 R >>
+/Font << /F3 46 0 R /F5 47 0 R /F1 48 0 R /F9 49 0 R /F2 50 0 R /F7 51 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -477,10 +477,10 @@
0000012313 00000 n
0000012542 00000 n
0000012715 00000 n
-0000012823 00000 n
-0000012933 00000 n
+0000012828 00000 n
+0000012938 00000 n
0000013046 00000 n
-0000013162 00000 n
+0000013152 00000 n
0000013268 00000 n
trailer
<<
Modified: xmlgraphics/site/deploy/fop/0.94/intermediate.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/intermediate.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/intermediate.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/intermediate.xml Mon Oct 15 12:26:16 2007
@@ -140,4 +140,4 @@
</section>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/site/deploy/fop/0.94/knownissues_overview.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/knownissues_overview.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/knownissues_overview.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/knownissues_overview.html Mon Oct 15 12:26:16 2007
@@ -177,7 +177,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: xmlgraphics/site/deploy/fop/0.94/knownissues_overview.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/knownissues_overview.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/knownissues_overview.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/knownissues_overview.pdf Mon Oct 15 12:26:16 2007
@@ -458,8 +458,8 @@
60 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
61 0 obj
@@ -472,22 +472,22 @@
62 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F6
+/BaseFont /Times-Italic
/Encoding /WinAnsiEncoding >>
endobj
63 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
64 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F6
-/BaseFont /Times-Italic
+/Name /F2
+/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
65 0 obj
@@ -511,7 +511,7 @@
endobj
3 0 obj
<<
-/Font << /F1 60 0 R /F5 61 0 R /F3 62 0 R /F2 63 0 R /F6 64 0 R /F7 65 0 R >>
+/Font << /F3 60 0 R /F5 61 0 R /F1 63 0 R /F6 62 0 R /F2 64 0 R /F7 65 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -606,10 +606,10 @@
0000019046 00000 n
0000019239 00000 n
0000019447 00000 n
-0000019555 00000 n
-0000019665 00000 n
-0000019778 00000 n
-0000019894 00000 n
+0000019560 00000 n
+0000019670 00000 n
+0000019781 00000 n
+0000019889 00000 n
0000020005 00000 n
trailer
<<
Modified: xmlgraphics/site/deploy/fop/0.94/knownissues_overview.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/knownissues_overview.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/knownissues_overview.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/knownissues_overview.xml Mon Oct 15 12:26:16 2007
@@ -63,4 +63,4 @@
</section>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/site/deploy/fop/0.94/output.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/output.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/output.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/output.html Mon Oct 15 12:26:16 2007
@@ -177,7 +177,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: xmlgraphics/site/deploy/fop/0.94/output.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/output.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/output.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/output.pdf Mon Oct 15 12:26:16 2007
@@ -1597,8 +1597,8 @@
214 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
215 0 obj
@@ -1611,15 +1611,15 @@
216 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F6
+/BaseFont /Times-Italic
/Encoding /WinAnsiEncoding >>
endobj
217 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
218 0 obj
@@ -1632,8 +1632,8 @@
219 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F6
-/BaseFont /Times-Italic
+/Name /F2
+/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
220 0 obj
@@ -1657,7 +1657,7 @@
endobj
3 0 obj
<<
-/Font << /F1 214 0 R /F5 215 0 R /F3 216 0 R /F2 217 0 R /F9 218 0 R /F6 219 0 R /F7 220 0 R >>
+/Font << /F3 214 0 R /F5 215 0 R /F1 217 0 R /F6 216 0 R /F9 218 0 R /F2 219 0 R /F7 220 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -2110,11 +2110,11 @@
0000060128 00000 n
0000060256 00000 n
0000060409 00000 n
-0000060518 00000 n
-0000060629 00000 n
-0000060743 00000 n
-0000060860 00000 n
-0000060967 00000 n
+0000060523 00000 n
+0000060634 00000 n
+0000060746 00000 n
+0000060855 00000 n
+0000060962 00000 n
0000061079 00000 n
trailer
<<
Modified: xmlgraphics/site/deploy/fop/0.94/output.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/output.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/output.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/output.xml Mon Oct 15 12:26:16 2007
@@ -796,4 +796,4 @@
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/site/deploy/fop/0.94/pdfa.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/pdfa.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/pdfa.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/pdfa.html Mon Oct 15 12:26:16 2007
@@ -177,7 +177,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: xmlgraphics/site/deploy/fop/0.94/pdfa.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/pdfa.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/pdfa.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/pdfa.pdf Mon Oct 15 12:26:16 2007
@@ -362,8 +362,8 @@
51 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
52 0 obj
@@ -376,22 +376,22 @@
53 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
54 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F9
+/BaseFont /Courier
/Encoding /WinAnsiEncoding >>
endobj
55 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F9
-/BaseFont /Courier
+/Name /F2
+/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
56 0 obj
@@ -415,7 +415,7 @@
endobj
3 0 obj
<<
-/Font << /F1 51 0 R /F5 52 0 R /F3 53 0 R /F2 54 0 R /F9 55 0 R /F7 56 0 R >>
+/Font << /F3 51 0 R /F5 52 0 R /F1 53 0 R /F9 54 0 R /F2 55 0 R /F7 56 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -519,10 +519,10 @@
0000011622 00000 n
0000011876 00000 n
0000012064 00000 n
-0000012172 00000 n
-0000012282 00000 n
+0000012177 00000 n
+0000012287 00000 n
0000012395 00000 n
-0000012511 00000 n
+0000012501 00000 n
0000012617 00000 n
trailer
<<
Modified: xmlgraphics/site/deploy/fop/0.94/pdfa.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/pdfa.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/pdfa.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/pdfa.xml Mon Oct 15 12:26:16 2007
@@ -153,4 +153,4 @@
</p>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/site/deploy/fop/0.94/pdfencryption.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/pdfencryption.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/pdfencryption.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/pdfencryption.html Mon Oct 15 12:26:16 2007
@@ -177,7 +177,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: xmlgraphics/site/deploy/fop/0.94/pdfencryption.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/pdfencryption.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/pdfencryption.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/pdfencryption.pdf Mon Oct 15 12:26:16 2007
@@ -336,8 +336,8 @@
46 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
47 0 obj
@@ -350,22 +350,22 @@
48 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
49 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F9
+/BaseFont /Courier
/Encoding /WinAnsiEncoding >>
endobj
50 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F9
-/BaseFont /Courier
+/Name /F2
+/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
51 0 obj
@@ -389,7 +389,7 @@
endobj
3 0 obj
<<
-/Font << /F1 46 0 R /F5 47 0 R /F3 48 0 R /F2 49 0 R /F9 50 0 R /F7 51 0 R >>
+/Font << /F3 46 0 R /F5 47 0 R /F1 48 0 R /F9 49 0 R /F2 50 0 R /F7 51 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -476,10 +476,10 @@
0000012910 00000 n
0000013082 00000 n
0000013339 00000 n
-0000013447 00000 n
-0000013557 00000 n
+0000013452 00000 n
+0000013562 00000 n
0000013670 00000 n
-0000013786 00000 n
+0000013776 00000 n
0000013892 00000 n
trailer
<<
Modified: xmlgraphics/site/deploy/fop/0.94/pdfencryption.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/pdfencryption.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/pdfencryption.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/pdfencryption.xml Mon Oct 15 12:26:16 2007
@@ -220,4 +220,4 @@
</p>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/site/deploy/fop/0.94/pdfx.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/pdfx.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/pdfx.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/pdfx.html Mon Oct 15 12:26:16 2007
@@ -177,7 +177,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: xmlgraphics/site/deploy/fop/0.94/pdfx.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/pdfx.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/pdfx.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/pdfx.pdf Mon Oct 15 12:26:16 2007
@@ -287,8 +287,8 @@
42 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
43 0 obj
@@ -301,22 +301,22 @@
44 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
45 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F9
+/BaseFont /Courier
/Encoding /WinAnsiEncoding >>
endobj
46 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F9
-/BaseFont /Courier
+/Name /F2
+/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
47 0 obj
@@ -340,7 +340,7 @@
endobj
3 0 obj
<<
-/Font << /F1 42 0 R /F5 43 0 R /F3 44 0 R /F2 45 0 R /F9 46 0 R /F7 47 0 R >>
+/Font << /F3 42 0 R /F5 43 0 R /F1 44 0 R /F9 45 0 R /F2 46 0 R /F7 47 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -429,10 +429,10 @@
0000009395 00000 n
0000009588 00000 n
0000009828 00000 n
-0000009936 00000 n
-0000010046 00000 n
+0000009941 00000 n
+0000010051 00000 n
0000010159 00000 n
-0000010275 00000 n
+0000010265 00000 n
0000010381 00000 n
trailer
<<
Modified: xmlgraphics/site/deploy/fop/0.94/pdfx.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/pdfx.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/pdfx.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/pdfx.xml Mon Oct 15 12:26:16 2007
@@ -130,4 +130,4 @@
</p>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/site/deploy/fop/0.94/releaseNotes_0.94.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/releaseNotes_0.94.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/releaseNotes_0.94.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/releaseNotes_0.94.html Mon Oct 15 12:26:16 2007
@@ -177,7 +177,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: xmlgraphics/site/deploy/fop/0.94/releaseNotes_0.94.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/releaseNotes_0.94.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/releaseNotes_0.94.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/releaseNotes_0.94.pdf Mon Oct 15 12:26:16 2007
@@ -156,8 +156,8 @@
24 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
25 0 obj
@@ -170,8 +170,8 @@
26 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
27 0 obj
@@ -202,7 +202,7 @@
endobj
3 0 obj
<<
-/Font << /F1 24 0 R /F5 25 0 R /F3 26 0 R /F2 27 0 R /F7 28 0 R >>
+/Font << /F3 24 0 R /F5 25 0 R /F1 26 0 R /F2 27 0 R /F7 28 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -249,8 +249,8 @@
0000003733 00000 n
0000004016 00000 n
0000004263 00000 n
-0000004371 00000 n
-0000004481 00000 n
+0000004376 00000 n
+0000004486 00000 n
0000004594 00000 n
0000004710 00000 n
trailer
Modified: xmlgraphics/site/deploy/fop/0.94/releaseNotes_0.94.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/releaseNotes_0.94.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/releaseNotes_0.94.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/releaseNotes_0.94.xml Mon Oct 15 12:26:16 2007
@@ -9,4 +9,4 @@
Add support for named destinations in PDF.
(JB)</li><li><icon alt="add" src="../images/add.jpg"/>
Added support for UAX#14 type line breaking. Support does not extend across nested fo:inline elements.
- (MM)</li></ul></section></section></body></document>
\ No newline at end of file
+ (MM)</li></ul></section></section></body></document>
Modified: xmlgraphics/site/deploy/fop/0.94/running.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/running.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/running.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/running.html Mon Oct 15 12:26:16 2007
@@ -177,7 +177,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: xmlgraphics/site/deploy/fop/0.94/running.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/running.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/running.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/running.pdf Mon Oct 15 12:26:16 2007
@@ -782,8 +782,8 @@
97 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
98 0 obj
@@ -796,15 +796,15 @@
99 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F6
+/BaseFont /Times-Italic
/Encoding /WinAnsiEncoding >>
endobj
100 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
101 0 obj
@@ -817,8 +817,8 @@
102 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F6
-/BaseFont /Times-Italic
+/Name /F2
+/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
103 0 obj
@@ -842,7 +842,7 @@
endobj
3 0 obj
<<
-/Font << /F1 97 0 R /F5 98 0 R /F3 99 0 R /F2 100 0 R /F9 101 0 R /F6 102 0 R /F7 103 0 R >>
+/Font << /F3 97 0 R /F5 98 0 R /F1 100 0 R /F6 99 0 R /F9 101 0 R /F2 102 0 R /F7 103 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -1022,11 +1022,11 @@
0000028986 00000 n
0000029163 00000 n
0000029303 00000 n
-0000029411 00000 n
-0000029521 00000 n
-0000029634 00000 n
-0000029751 00000 n
-0000029858 00000 n
+0000029416 00000 n
+0000029526 00000 n
+0000029637 00000 n
+0000029746 00000 n
+0000029853 00000 n
0000029970 00000 n
trailer
<<
Modified: xmlgraphics/site/deploy/fop/0.94/running.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/running.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/running.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/running.xml Mon Oct 15 12:26:16 2007
@@ -341,4 +341,4 @@
<p>If you have problems running FOP, please see the <link href="../gethelp.html">"How to get Help" page</link>.</p>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/site/deploy/fop/0.94/servlets.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/servlets.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/servlets.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/servlets.html Mon Oct 15 12:26:16 2007
@@ -177,7 +177,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
Modified: xmlgraphics/site/deploy/fop/0.94/servlets.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/servlets.pdf?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/servlets.pdf (original)
+++ xmlgraphics/site/deploy/fop/0.94/servlets.pdf Mon Oct 15 12:26:16 2007
@@ -634,8 +634,8 @@
86 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
87 0 obj
@@ -648,15 +648,15 @@
88 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F6
+/BaseFont /Times-Italic
/Encoding /WinAnsiEncoding >>
endobj
89 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F1
+/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
90 0 obj
@@ -669,8 +669,8 @@
91 0 obj
<< /Type /Font
/Subtype /Type1
-/Name /F6
-/BaseFont /Times-Italic
+/Name /F2
+/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
92 0 obj
@@ -694,7 +694,7 @@
endobj
3 0 obj
<<
-/Font << /F1 86 0 R /F5 87 0 R /F3 88 0 R /F2 89 0 R /F9 90 0 R /F6 91 0 R /F7 92 0 R >>
+/Font << /F3 86 0 R /F5 87 0 R /F1 89 0 R /F6 88 0 R /F9 90 0 R /F2 91 0 R /F7 92 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
@@ -869,11 +869,11 @@
0000023742 00000 n
0000023918 00000 n
0000024163 00000 n
-0000024271 00000 n
-0000024381 00000 n
-0000024494 00000 n
-0000024610 00000 n
-0000024716 00000 n
+0000024276 00000 n
+0000024386 00000 n
+0000024497 00000 n
+0000024605 00000 n
+0000024711 00000 n
0000024827 00000 n
trailer
<<
Modified: xmlgraphics/site/deploy/fop/0.94/servlets.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/servlets.xml?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/servlets.xml (original)
+++ xmlgraphics/site/deploy/fop/0.94/servlets.xml Mon Oct 15 12:26:16 2007
@@ -319,4 +319,4 @@
</p>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: xmlgraphics/site/deploy/fop/0.94/upgrading.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/0.94/upgrading.html?rev=584858&r1=584857&r2=584858&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/0.94/upgrading.html (original)
+++ xmlgraphics/site/deploy/fop/0.94/upgrading.html Mon Oct 15 12:26:16 2007
@@ -177,7 +177,7 @@
|alternative credits
+-->
<div id="credit2">
-<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a>
+<a href="http://apachecon.com/2007/US/"><img border="0" title="ApacheCon US 2007 (Atlanta)" alt="ApacheCon US 2007 (Atlanta) - logo" src="http://www.apache.org/ads/ApacheCon/2007-usa-125x125.png" style="width: 125px;height: 125px;"></a><a href="http://www.ossummit.com/"><img border="0" title="OS Summit Asia 2007" alt="OS Summit Asia 2007 - logo" src="http://www.ossummit.com/ads/ossummit_button_3.jpg" style="width: 125px;height: 125px;"></a>
</div>
</div>
<!--+
---------------------------------------------------------------------
Apache XML Graphics Project URL: http://xmlgraphics.apache.org/
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org