Minor changes to version number, for comments in the Normalizer utility

class, and one change to the MarcPermissiveStreamReader

README.textile

@@ -35,10 +35,9 @@ _Crosswalking: Processing MARC in XML Environments with MARC4J_ is a concise boo
 
 h2. Download
 
-New! Latest release (MARC4J 2.5RC1):
+New! Latest release (MARC4J 2.6.0):
 
-* "marc4j-2.5RC1.jar":http://github.com/marc4j/marc4j/blob/master/releases/marc4j_2.5RC1.jar
-* "marc4j-2.5.1-beta.jar":http://github.com/marc4j/marc4j/blob/master/releases/marc4j-2.5.1.beta.jar
+* "marc4j-2.6.0.jar":https://github.com/marc4j/marc4j/blob/master/releases/marc4j-2.6.0.jar
 
 Check here for changes.
 

build.properties

@@ -7,6 +7,8 @@ build.test-classes.dir=${build.dir}/test-classes
 build.generated-src.dir=generated-src
 dist.dir=dist
 apidoc.dir=${build.dir}/apidoc
-version=2.5.1-beta
+specversion=2.6
+implversion=0
+version=${specversion}.${implversion}
 project.name=marc4j
 jar.name=${project.name}-${version}.jar

build.xml

@@ -103,7 +103,7 @@
 			<manifest>
 			    <section name="org/marc4j">
 			      <attribute name="Specification-Title" value="marc4j"/>
-			      <attribute name="Specification-Version" value="2.5"/> 
+			      <attribute name="Specification-Version" value="${specversion}"/> 
 			      <attribute name="Specification-Vendor" value="org.marc4j"/> 
 
 			      <attribute name="Implementation-Title" value="marc4j"/>

ivy.xml

@@ -7,7 +7,7 @@
 
     <dependencies>
         <dependency org="junit" name="junit" rev="4.11+" conf="test->default"/>
-        <dependency org="com.ibm.icu" name="icu4j" rev="50+"/>
+<!--    <dependency org="com.ibm.icu" name="icu4j" rev="50+"/> 	 -->   
         <dependency org="org.slf4j" name="slf4j-api" rev="1.7+"/>
         <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7+" conf="test->default"/>
     </dependencies>

src/org/marc4j/MarcPermissiveStreamReader.java

@@ -137,7 +137,7 @@ public class MarcPermissiveStreamReader implements MarcReader {
 
     private ErrorHandler errors;
     static String validSubfieldCodes = "abcdefghijklmnopqrstuvwxyz0123456789";
-
+    static String upperCaseSubfieldsProperty = "org.marc4j.MarcPermissiveStreamReader.upperCaseSubfields";
     /**
      * Constructs an instance with the specified input stream with possible additional functionality
      * being enabled by setting permissive and/or convertToUTF8 to true.
@@ -1094,10 +1094,17 @@ else if (permissive && validSubfieldCodes.indexOf(code) == -1)
                 {
                     if (code >= 'A' && code <= 'Z')
                     { 
-                        code = Character.toLowerCase(code);    
-                        errors.addError(ErrorHandler.MINOR_ERROR, 
+                        if ( Boolean.parseBoolean(System.getProperty(upperCaseSubfieldsProperty, "false")) == false)
+                        {
+                            code = Character.toLowerCase(code);    
+                            errors.addError(ErrorHandler.MINOR_ERROR, 
                                         "Subfield tag is an invalid uppercase character, changing it to lower case.");
-                    }
+                        }
+                        else // the System Property org.marc4j.MarcPermissiveStreamReader.upperCaseSubfields is defined to allow upperCaseSubfields
+                        {
+                            // therefore do nothing and be happy
+                        }
+                    }
                     else if (code > 0x7f)
                     { 
                         code = data[0];    

src/org/marc4j/util/Normalizer.java

@@ -3,6 +3,19 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+/**
+ * 
+ * @author rh9ec
+ *
+ * This class is a shim interface to handle the normalization of unicode characters.
+ * This functionality is available in java 1.6+ and newer, via the java.text.Normalizer class.
+ * If for some reason that class is not available, this code will attempt to fall back to using either the 
+ * class   com.ibm.icu.text.Normalizer   from the icu4j library or to using the 
+ * class   com.solrmarc.icu.text.Normalizer   which is based on (an older version) of the preceding 
+ *                                            and which is included as a part of SolrMarc.
+ * Since Java 1.6 is now officially "end-of-lifed" it should be a reasonable assumption that users are 
+ * not using a version of java that is even older than that, and this shim interface class can be deprecated.
+ */
 
 public class Normalizer
 {