r1387@bean:  ser | 2007-10-01 22:05:11 -0400
  r1332@bean:  ser | 2007-07-28 09:15:15 -0400
   r1314@bean (orig r1267):  ser | 2007-07-28 08:41:05 -0400
   Branched for bug fixes

 r1388@bean:  ser | 2007-10-01 22:05:13 -0400
  r1333@bean:  ser | 2007-07-28 09:15:16 -0400
   r1322@bean (orig r1270):  ser | 2007-07-28 08:48:55 -0400
    r1320@bean (orig r1268):  ser | 2007-07-28 08:47:01 -0400
     r1318@bean:  ser | 2007-07-28 08:42:24 -0400
     Fixes a bug in the pretty printer related to an incomplete refactoring.

 r1389@bean:  ser | 2007-10-01 22:05:15 -0400
  r1334@bean:  ser | 2007-07-28 09:15:17 -0400
   r1328@bean (orig r1273):  ser | 2007-07-28 09:00:30 -0400
    r1309@bean (orig r1263):  ser | 2007-07-27 22:51:06 -0400
     r1303@bean:  ser | 2007-07-27 22:33:00 -0400
     Merge code cleanups

 r1390@bean:  ser | 2007-10-01 22:05:16 -0400
  r1335@bean:  ser | 2007-07-28 09:15:18 -0400
   r1329@bean (orig r1274):  ser | 2007-07-28 09:00:34 -0400
    r1326@bean (orig r1271):  ser | 2007-07-28 08:59:48 -0400
     r1324@bean:  ser | 2007-07-28 08:53:23 -0400
     Fixes another bug related to the formatting code refactoring in 3.1.7

 r1399@bean:  ser | 2007-10-01 22:05:35 -0400
  r1375@bean:  ser | 2007-10-01 22:01:48 -0400
   r1341@bean (orig r12845):  ser | 2007-07-25 09:03:38 -0400
   Indentation fix.

 r1400@bean:  ser | 2007-10-01 22:05:37 -0400
  r1376@bean:  ser | 2007-10-01 22:01:50 -0400
   r1342@bean (orig r12846):  nobu | 2007-07-25 17:18:55 -0400
   * lib/rexml/formatters/*.rb: set properties.

 r1402@bean:  ser | 2007-10-01 22:05:40 -0400
  r1378@bean:  ser | 2007-10-01 22:01:52 -0400
   r1358@bean (orig r12883):  nobu | 2007-08-06 04:36:31 -0400
   * lib/rexml/encodings/{ISO-8859-15,CP-1252}.rb: fixed invalid syntax.

 r1403@bean:  ser | 2007-10-01 22:05:41 -0400
  r1379@bean:  ser | 2007-10-01 22:02:23 -0400
   r1359@bean (orig r13096):  nobu | 2007-08-18 02:03:45 -0400
   * lib/rexml/rexml.rb: removed doubled constant.

 r1404@bean:  ser | 2007-10-01 22:05:44 -0400
  r1380@bean:  ser | 2007-10-01 22:02:24 -0400
   r1360@bean (orig r13097):  nobu | 2007-08-18 02:12:48 -0400
   * lib/rexml/rexml.rb: added encoding.
3 files changed, 86 insertions(+), 86 deletions(-)

M src/rexml/encodings/CP-1252.rb
M src/rexml/encodings/ISO-8859-15.rb
M src/rexml/rexml.rb
M src/rexml/encodings/CP-1252.rb +55 -55
@@ 17,35 17,35 @@ module REXML
       array_utf8.each do |num|
         case num
           # shortcut first bunch basic characters
-        when 0..0xFF: array_enc << num
+        when 0..0xFF; array_enc << num
           # characters added compared to iso-8859-1
-        when 0x20AC: array_enc << 0x80 # 0xe2 0x82 0xac
-        when 0x201A: array_enc << 0x82 # 0xe2 0x82 0x9a
-        when 0x0192: array_enc << 0x83 # 0xc6 0x92
-        when 0x201E: array_enc << 0x84 # 0xe2 0x82 0x9e
-        when 0x2026: array_enc << 0x85 # 0xe2 0x80 0xa6
-        when 0x2020: array_enc << 0x86 # 0xe2 0x80 0xa0
-        when 0x2021: array_enc << 0x87 # 0xe2 0x80 0xa1
-        when 0x02C6: array_enc << 0x88 # 0xcb 0x86
-        when 0x2030: array_enc << 0x89 # 0xe2 0x80 0xb0
-        when 0x0160: array_enc << 0x8A # 0xc5 0xa0
-        when 0x2039: array_enc << 0x8B # 0xe2 0x80 0xb9
-        when 0x0152: array_enc << 0x8C # 0xc5 0x92
-        when 0x017D: array_enc << 0x8E # 0xc5 0xbd
-        when 0x2018: array_enc << 0x91 # 0xe2 0x80 0x98
-        when 0x2019: array_enc << 0x92 # 0xe2 0x80 0x99
-        when 0x201C: array_enc << 0x93 # 0xe2 0x80 0x9c
-        when 0x201D: array_enc << 0x94 # 0xe2 0x80 0x9d
-        when 0x2022: array_enc << 0x95 # 0xe2 0x80 0xa2
-        when 0x2013: array_enc << 0x96 # 0xe2 0x80 0x93
-        when 0x2014: array_enc << 0x97 # 0xe2 0x80 0x94
-        when 0x02DC: array_enc << 0x98 # 0xcb 0x9c
-        when 0x2122: array_enc << 0x99 # 0xe2 0x84 0xa2
-        when 0x0161: array_enc << 0x9A # 0xc5 0xa1
-        when 0x203A: array_enc << 0x9B # 0xe2 0x80 0xba
-        when 0x0152: array_enc << 0x9C # 0xc5 0x93
-        when 0x017E: array_enc << 0x9E # 0xc5 0xbe
-        when 0x0178: array_enc << 0x9F # 0xc5 0xb8
+        when 0x20AC; array_enc << 0x80 # 0xe2 0x82 0xac
+        when 0x201A; array_enc << 0x82 # 0xe2 0x82 0x9a
+        when 0x0192; array_enc << 0x83 # 0xc6 0x92
+        when 0x201E; array_enc << 0x84 # 0xe2 0x82 0x9e
+        when 0x2026; array_enc << 0x85 # 0xe2 0x80 0xa6
+        when 0x2020; array_enc << 0x86 # 0xe2 0x80 0xa0
+        when 0x2021; array_enc << 0x87 # 0xe2 0x80 0xa1
+        when 0x02C6; array_enc << 0x88 # 0xcb 0x86
+        when 0x2030; array_enc << 0x89 # 0xe2 0x80 0xb0
+        when 0x0160; array_enc << 0x8A # 0xc5 0xa0
+        when 0x2039; array_enc << 0x8B # 0xe2 0x80 0xb9
+        when 0x0152; array_enc << 0x8C # 0xc5 0x92
+        when 0x017D; array_enc << 0x8E # 0xc5 0xbd
+        when 0x2018; array_enc << 0x91 # 0xe2 0x80 0x98
+        when 0x2019; array_enc << 0x92 # 0xe2 0x80 0x99
+        when 0x201C; array_enc << 0x93 # 0xe2 0x80 0x9c
+        when 0x201D; array_enc << 0x94 # 0xe2 0x80 0x9d
+        when 0x2022; array_enc << 0x95 # 0xe2 0x80 0xa2
+        when 0x2013; array_enc << 0x96 # 0xe2 0x80 0x93
+        when 0x2014; array_enc << 0x97 # 0xe2 0x80 0x94
+        when 0x02DC; array_enc << 0x98 # 0xcb 0x9c
+        when 0x2122; array_enc << 0x99 # 0xe2 0x84 0xa2
+        when 0x0161; array_enc << 0x9A # 0xc5 0xa1
+        when 0x203A; array_enc << 0x9B # 0xe2 0x80 0xba
+        when 0x0152; array_enc << 0x9C # 0xc5 0x93
+        when 0x017E; array_enc << 0x9E # 0xc5 0xbe
+        when 0x0178; array_enc << 0x9F # 0xc5 0xb8
         else
           # all remaining basic characters can be used directly
           if num <= 0xFF

          
@@ 66,33 66,33 @@ module REXML
       array_latin9.each do |num|
         case num
           # characters that added compared to iso-8859-1
-        when 0x80: array_enc << 0x20AC # 0xe2 0x82 0xac
-        when 0x82: array_enc << 0x201A # 0xe2 0x82 0x9a
-        when 0x83: array_enc << 0x0192 # 0xc6 0x92
-        when 0x84: array_enc << 0x201E # 0xe2 0x82 0x9e
-        when 0x85: array_enc << 0x2026 # 0xe2 0x80 0xa6
-        when 0x86: array_enc << 0x2020 # 0xe2 0x80 0xa0
-        when 0x87: array_enc << 0x2021 # 0xe2 0x80 0xa1
-        when 0x88: array_enc << 0x02C6 # 0xcb 0x86
-        when 0x89: array_enc << 0x2030 # 0xe2 0x80 0xb0
-        when 0x8A: array_enc << 0x0160 # 0xc5 0xa0
-        when 0x8B: array_enc << 0x2039 # 0xe2 0x80 0xb9
-        when 0x8C: array_enc << 0x0152 # 0xc5 0x92
-        when 0x8E: array_enc << 0x017D # 0xc5 0xbd
-        when 0x91: array_enc << 0x2018 # 0xe2 0x80 0x98
-        when 0x92: array_enc << 0x2019 # 0xe2 0x80 0x99
-        when 0x93: array_enc << 0x201C # 0xe2 0x80 0x9c
-        when 0x94: array_enc << 0x201D # 0xe2 0x80 0x9d
-        when 0x95: array_enc << 0x2022 # 0xe2 0x80 0xa2
-        when 0x96: array_enc << 0x2013 # 0xe2 0x80 0x93
-        when 0x97: array_enc << 0x2014 # 0xe2 0x80 0x94
-        when 0x98: array_enc << 0x02DC # 0xcb 0x9c
-        when 0x99: array_enc << 0x2122 # 0xe2 0x84 0xa2
-        when 0x9A: array_enc << 0x0161 # 0xc5 0xa1
-        when 0x9B: array_enc << 0x203A # 0xe2 0x80 0xba
-        when 0x9C: array_enc << 0x0152 # 0xc5 0x93
-        when 0x9E: array_enc << 0x017E # 0xc5 0xbe
-        when 0x9F: array_enc << 0x0178 # 0xc5 0xb8
+        when 0x80; array_enc << 0x20AC # 0xe2 0x82 0xac
+        when 0x82; array_enc << 0x201A # 0xe2 0x82 0x9a
+        when 0x83; array_enc << 0x0192 # 0xc6 0x92
+        when 0x84; array_enc << 0x201E # 0xe2 0x82 0x9e
+        when 0x85; array_enc << 0x2026 # 0xe2 0x80 0xa6
+        when 0x86; array_enc << 0x2020 # 0xe2 0x80 0xa0
+        when 0x87; array_enc << 0x2021 # 0xe2 0x80 0xa1
+        when 0x88; array_enc << 0x02C6 # 0xcb 0x86
+        when 0x89; array_enc << 0x2030 # 0xe2 0x80 0xb0
+        when 0x8A; array_enc << 0x0160 # 0xc5 0xa0
+        when 0x8B; array_enc << 0x2039 # 0xe2 0x80 0xb9
+        when 0x8C; array_enc << 0x0152 # 0xc5 0x92
+        when 0x8E; array_enc << 0x017D # 0xc5 0xbd
+        when 0x91; array_enc << 0x2018 # 0xe2 0x80 0x98
+        when 0x92; array_enc << 0x2019 # 0xe2 0x80 0x99
+        when 0x93; array_enc << 0x201C # 0xe2 0x80 0x9c
+        when 0x94; array_enc << 0x201D # 0xe2 0x80 0x9d
+        when 0x95; array_enc << 0x2022 # 0xe2 0x80 0xa2
+        when 0x96; array_enc << 0x2013 # 0xe2 0x80 0x93
+        when 0x97; array_enc << 0x2014 # 0xe2 0x80 0x94
+        when 0x98; array_enc << 0x02DC # 0xcb 0x9c
+        when 0x99; array_enc << 0x2122 # 0xe2 0x84 0xa2
+        when 0x9A; array_enc << 0x0161 # 0xc5 0xa1
+        when 0x9B; array_enc << 0x203A # 0xe2 0x80 0xba
+        when 0x9C; array_enc << 0x0152 # 0xc5 0x93
+        when 0x9E; array_enc << 0x017E # 0xc5 0xbe
+        when 0x9F; array_enc << 0x0178 # 0xc5 0xb8
         else
           array_enc << num
         end

          
M src/rexml/encodings/ISO-8859-15.rb +25 -25
@@ 15,25 15,25 @@ module REXML
       array_utf8.each do |num|
         case num
           # shortcut first bunch basic characters
-        when 0..0xA3: array_enc << num
+        when 0..0xA3; array_enc << num
           # characters removed compared to iso-8859-1
-        when 0xA4: array_enc << '&#164;'
-        when 0xA6: array_enc << '&#166;'
-        when 0xA8: array_enc << '&#168;'
-        when 0xB4: array_enc << '&#180;'
-        when 0xB8: array_enc << '&#184;'
-        when 0xBC: array_enc << '&#188;'
-        when 0xBD: array_enc << '&#189;'
-        when 0xBE: array_enc << '&#190;'
+        when 0xA4; array_enc << '&#164;'
+        when 0xA6; array_enc << '&#166;'
+        when 0xA8; array_enc << '&#168;'
+        when 0xB4; array_enc << '&#180;'
+        when 0xB8; array_enc << '&#184;'
+        when 0xBC; array_enc << '&#188;'
+        when 0xBD; array_enc << '&#189;'
+        when 0xBE; array_enc << '&#190;'
           # characters added compared to iso-8859-1
-        when 0x20AC: array_enc << 0xA4 # 0xe2 0x82 0xac
-        when 0x0160: array_enc << 0xA6 # 0xc5 0xa0
-        when 0x0161: array_enc << 0xA8 # 0xc5 0xa1
-        when 0x017D: array_enc << 0xB4 # 0xc5 0xbd
-        when 0x017E: array_enc << 0xB8 # 0xc5 0xbe
-        when 0x0152: array_enc << 0xBC # 0xc5 0x92
-        when 0x0153: array_enc << 0xBD # 0xc5 0x93
-        when 0x0178: array_enc << 0xBE # 0xc5 0xb8
+        when 0x20AC; array_enc << 0xA4 # 0xe2 0x82 0xac
+        when 0x0160; array_enc << 0xA6 # 0xc5 0xa0
+        when 0x0161; array_enc << 0xA8 # 0xc5 0xa1
+        when 0x017D; array_enc << 0xB4 # 0xc5 0xbd
+        when 0x017E; array_enc << 0xB8 # 0xc5 0xbe
+        when 0x0152; array_enc << 0xBC # 0xc5 0x92
+        when 0x0153; array_enc << 0xBD # 0xc5 0x93
+        when 0x0178; array_enc << 0xBE # 0xc5 0xb8
         else
           # all remaining basic characters can be used directly
           if num <= 0xFF

          
@@ 54,14 54,14 @@ module REXML
       array_latin9.each do |num|
         case num
           # characters that differ compared to iso-8859-1
-        when 0xA4: array_enc << 0x20AC
-        when 0xA6: array_enc << 0x0160
-        when 0xA8: array_enc << 0x0161
-        when 0xB4: array_enc << 0x017D
-        when 0xB8: array_enc << 0x017E
-        when 0xBC: array_enc << 0x0152
-        when 0xBD: array_enc << 0x0153
-        when 0xBE: array_enc << 0x0178
+        when 0xA4; array_enc << 0x20AC
+        when 0xA6; array_enc << 0x0160
+        when 0xA8; array_enc << 0x0161
+        when 0xB4; array_enc << 0x017D
+        when 0xB8; array_enc << 0x017E
+        when 0xBC; array_enc << 0x0152
+        when 0xBD; array_enc << 0x0153
+        when 0xBE; array_enc << 0x0178
         else
           array_enc << num
         end

          
M src/rexml/rexml.rb +6 -6
@@ 1,3 1,4 @@ 
+# -*- encoding: utf-8 -*-
 # REXML is an XML toolkit for Ruby[http://www.ruby-lang.org], in Ruby.
 #
 # REXML is a _pure_ Ruby, XML 1.0 conforming,

          
@@ 10,9 11,8 @@ 
 #
 # Main page:: http://www.germane-software.com/software/rexml
 # Author:: Sean Russell <serATgermaneHYPHENsoftwareDOTcom>
-# Version:: @ANT_VERSION@
-# Date:: @ANT_DATE@
-# Revision:: $Revision$
+# Version:: 3.1.7.2
+# Date:: 2007/275
 # 
 # This API documentation can be downloaded from the REXML home page, or can
 # be accessed online[http://www.germane-software.com/software/rexml_doc]

          
@@ 21,9 21,9 @@ 
 # or can be accessed 
 # online[http://www.germane-software.com/software/rexml/docs/tutorial.html]
 module REXML
-  COPYRIGHT = "Copyright \xC2\xA9 2001-2006 Sean Russell <ser@germane-software.com>"
-  DATE = "@ANT_DATE@"
-  VERSION = "@ANT_VERSION@"
+  COPYRIGHT = "Copyright © 2001-2007 Sean Russell <ser@germane-software.com>"
+  DATE = "2007/275"
+  VERSION = "3.1.7.2"
   REVISION = "$Revision$".gsub(/\$Revision:|\$/,'').strip
 
   Copyright = COPYRIGHT