lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r881216 - in /lucene/java/branches/lucene_3_0: ./ contrib/ contrib/highlighter/src/test/ src/site/changes/ src/test/org/apache/lucene/analysis/ src/test/org/apache/lucene/document/ src/test/org/apache/lucene/index/
Date Tue, 17 Nov 2009 09:45:02 GMT
Author: uschindler
Date: Tue Nov 17 09:45:02 2009
New Revision: 881216

URL: http://svn.apache.org/viewvc?rev=881216&view=rev
Log:
LUCENE-2077: changes-to-html: better handling of bulleted lists in CHANGES.txt

Modified:
    lucene/java/branches/lucene_3_0/   (props changed)
    lucene/java/branches/lucene_3_0/CHANGES.txt
    lucene/java/branches/lucene_3_0/contrib/   (props changed)
    lucene/java/branches/lucene_3_0/contrib/CHANGES.txt   (props changed)
    lucene/java/branches/lucene_3_0/contrib/highlighter/src/test/   (props changed)
    lucene/java/branches/lucene_3_0/src/site/changes/ChangesFancyStyle.css
    lucene/java/branches/lucene_3_0/src/site/changes/ChangesFixedWidthStyle.css
    lucene/java/branches/lucene_3_0/src/site/changes/ChangesSimpleStyle.css
    lucene/java/branches/lucene_3_0/src/site/changes/changes2html.pl
    lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
  (props changed)
    lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestDateTools.java
  (props changed)
    lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestNumberTools.java
  (props changed)
    lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
  (props changed)

Propchange: lucene/java/branches/lucene_3_0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 17 09:45:02 2009
@@ -1,3 +1,4 @@
 /lucene/java/branches/lucene_2_4:748824
 /lucene/java/branches/lucene_2_9:817269-818600,825998,829134,829881,831036
 /lucene/java/branches/lucene_2_9_back_compat_tests:818601-821336
+/lucene/java/trunk:881213

Modified: lucene/java/branches/lucene_3_0/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/CHANGES.txt?rev=881216&r1=881215&r2=881216&view=diff
==============================================================================
--- lucene/java/branches/lucene_3_0/CHANGES.txt (original)
+++ lucene/java/branches/lucene_3_0/CHANGES.txt Tue Nov 17 09:45:02 2009
@@ -74,7 +74,7 @@
   (Uwe Schindler, Robert Muir, Karl Wettin, Paul Elschot, Kay Kay, Shai Erera)
 
 * Generify Lucene API:
-  <code>
+
   - TokenStream/AttributeSource: Now addAttribute()/getAttribute() return an
     instance of the requested attribute interface and no cast needed anymore.
   - NumericRangeQuery, NumericRangeFilter, and FieldCacheRangeFilter
@@ -89,14 +89,13 @@
   - MapOfSets
   - o.a.l.util.cache package
   - lot's of internal APIs of IndexWriter
- </code>
  (Uwe Schindler, Michael Busch, Kay Kay, Robert Muir, Adriano Crestani)
   
 * LUCENE-1944, LUCENE-1856, LUCENE-1957, LUCENE-1960, LUCENE-1961,
   LUCENE-1968, LUCENE-1970, LUCENE-1946, LUCENE-1971, LUCENE-1975,
   LUCENE-1972, LUCENE-1978, LUCENE-944, LUCENE-1979, LUCENE-1973, LUCENE-2011:
   Remove deprecated methods/constructors/classes:
-  <code>
+
   - All String/File directory paths in IndexReader /
     IndexSearcher / IndexWriter.
   - Remove FSDirectory.getDirectory()
@@ -121,7 +120,6 @@
   - Remove BoostingTermQuery.
   - Remove MultiValueSource.
   - Remove Scorer.explain(int).
-  </code>
   ...and some other minor ones (Uwe Schindler, Michael Busch, Mark Miller)
   
 * LUCENE-1925: Make IndexSearcher's subReaders and docStarts members

Propchange: lucene/java/branches/lucene_3_0/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 17 09:45:02 2009
@@ -1,3 +1,4 @@
 /lucene/java/branches/lucene_2_4/contrib:748824
 /lucene/java/branches/lucene_2_9/contrib:817269-818600,825998,829134,829816,829881,831036
 /lucene/java/branches/lucene_2_9_back_compat_tests/contrib:818601-821336
+/lucene/java/trunk/contrib:881213

Propchange: lucene/java/branches/lucene_3_0/contrib/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 17 09:45:02 2009
@@ -1,3 +1,4 @@
 /lucene/java/branches/lucene_2_4/contrib/CHANGES.txt:748824
 /lucene/java/branches/lucene_2_9/contrib/CHANGES.txt:817269-818600,825998,826775,829134,829816,829881,831036
 /lucene/java/branches/lucene_2_9_back_compat_tests/contrib/CHANGES.txt:818601-821336
+/lucene/java/trunk/contrib/CHANGES.txt:881213

Propchange: lucene/java/branches/lucene_3_0/contrib/highlighter/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 17 09:45:02 2009
@@ -1,3 +1,4 @@
 /lucene/java/branches/lucene_2_4/contrib/highlighter/src/test:748824
 /lucene/java/branches/lucene_2_9/contrib/highlighter/src/test:817269-818600,825998,826775,829134,829816,829881,831036
 /lucene/java/branches/lucene_2_9_back_compat_tests/contrib/highlighter/src/test:818601-821336
+/lucene/java/trunk/contrib/highlighter/src/test:881213

Modified: lucene/java/branches/lucene_3_0/src/site/changes/ChangesFancyStyle.css
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/src/site/changes/ChangesFancyStyle.css?rev=881216&r1=881215&r2=881216&view=diff
==============================================================================
--- lucene/java/branches/lucene_3_0/src/site/changes/ChangesFancyStyle.css (original)
+++ lucene/java/branches/lucene_3_0/src/site/changes/ChangesFancyStyle.css Tue Nov 17 09:45:02
2009
@@ -24,6 +24,11 @@
   color: purple; 
 }
 
+li.bulleted-list {
+  margin-top: 0.25em;
+  margin-bottom: 0.25em;
+}
+
 li {
   margin-top: 1em;
   margin-bottom: 1em;

Modified: lucene/java/branches/lucene_3_0/src/site/changes/ChangesFixedWidthStyle.css
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/src/site/changes/ChangesFixedWidthStyle.css?rev=881216&r1=881215&r2=881216&view=diff
==============================================================================
--- lucene/java/branches/lucene_3_0/src/site/changes/ChangesFixedWidthStyle.css (original)
+++ lucene/java/branches/lucene_3_0/src/site/changes/ChangesFixedWidthStyle.css Tue Nov 17
09:45:02 2009
@@ -26,6 +26,11 @@
   color: purple; 
 }
 
+li.bulleted-list {
+  margin-top: 0.25em;
+  margin-bottom: 0.25em;
+}
+
 li {
   margin-top: 1em;
   margin-bottom: 1em;

Modified: lucene/java/branches/lucene_3_0/src/site/changes/ChangesSimpleStyle.css
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/src/site/changes/ChangesSimpleStyle.css?rev=881216&r1=881215&r2=881216&view=diff
==============================================================================
--- lucene/java/branches/lucene_3_0/src/site/changes/ChangesSimpleStyle.css (original)
+++ lucene/java/branches/lucene_3_0/src/site/changes/ChangesSimpleStyle.css Tue Nov 17 09:45:02
2009
@@ -1,3 +1,8 @@
+li.bulleted-list {
+  margin-top: 0.25em;
+  margin-bottom: 0.25em;
+}
+
 li {
   margin-top: 1em;
   margin-bottom: 1em;

Modified: lucene/java/branches/lucene_3_0/src/site/changes/changes2html.pl
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/src/site/changes/changes2html.pl?rev=881216&r1=881215&r2=881216&view=diff
==============================================================================
--- lucene/java/branches/lucene_3_0/src/site/changes/changes2html.pl (original)
+++ lucene/java/branches/lucene_3_0/src/site/changes/changes2html.pl Tue Nov 17 09:45:02 2009
@@ -219,8 +219,12 @@
 
     function collapseAll() {
       var unorderedLists = document.getElementsByTagName("ul");
-      for (var i = 0; i < unorderedLists.length; i++)
-        unorderedLists[i].style.display = "none";
+      for (var i = 0; i < unorderedLists.length; i++) {
+        if (unorderedLists[i].className != 'bulleted-list')
+          unorderedLists[i].style.display = "none";
+        else
+          unorderedLists[i].style.display = "block";
+      }
       var orderedLists = document.getElementsByTagName("ol");
       for (var i = 0; i < orderedLists.length; i++)
         orderedLists[i].style.display = "none"; 
@@ -285,6 +289,7 @@
          */
         if (list.id != '$first_relid.list' 
             && list.id != '$second_relid.list'
+            && list.className != 'bulleted-list'
             && (currentAnchor == ''
                 || ! shouldExpand(currentList, currentAnchor, list.id))) {
           list.style.display = "none";
@@ -392,7 +397,7 @@
       # Put attributions on their own lines.
       # Check for trailing parenthesized attribution with no following period.
       # Exclude things like "(see #3 above)" and "(use the bug number instead of xxxx)" 
-      unless ($item =~ s:\s*(\((?!see #|use the bug number)[^)"]+?\))\s*$:<br /><span
class="attrib">$1</span>:) {
+      unless ($item =~ s:\s*(\((?!see #|use the bug number)[^)"]+?\))\s*$:\n<br /><span
class="attrib">$1</span>:) {
         # If attribution is not found, then look for attribution with a
         # trailing period, but try not to include trailing parenthesized things
         # that are not attributions.
@@ -412,12 +417,45 @@
                       my ($no_parens) = $parenthetical =~ /^\((.*)\)$/s;
                       my @words = grep {/\S/} split /\s+/, $no_parens;
                       if ($no_parens =~ /\b(?:via|updates\s+from)\b/i || scalar(@words) <=
3) {
-                        $subst = "<br /><span class=\"attrib\">$parenthetical</span>";
+                        $subst = "\n<br /><span class=\"attrib\">$parenthetical</span>";
                       }
                     }
                     $subst . $trailing_period_and_or_issue;
                   }ex;
       }
+
+      $item =~ s{(.*?)(<code><pre>.*?</pre></code>)|(.*)}
+                {
+                  my $uncode = undef;
+                  if (defined($2)) {
+                    $uncode = $1 || '';
+                    $uncode =~ s{((?<=\n)[ ]*-.*\n(?:.*\n)*)}
+                                {
+                                  my $bulleted_list = $1;
+                                  $bulleted_list 
+                                    =~ s{(?:(?<=\n)|\A)[ ]*-[ ]*(.*(?:\n|\z)(?:[ ]+[^
-].*(?:\n|\z))*)}
+                                        {<li class="bulleted-list">\n$1</li>\n}g;
+                                  $bulleted_list
+                                    =~ s!(<li.*</li>\n)!<ul class="bulleted-list">\n$1</ul>\n!s;
+                                  $bulleted_list;
+                                }ge;
+                    "$uncode$2";
+                  } else {
+                    $uncode = $3 || '';
+                    $uncode =~ s{((?<=\n)[ ]*-.*\n(?:.*\n)*)}
+                                {
+                                  my $bulleted_list = $1;
+                                  $bulleted_list 
+                                    =~ s{(?:(?<=\n)|\A)[ ]*-[ ]*(.*(?:\n|\z)(?:[ ]+[^
-].*(?:\n|\z))*)}
+                                        {<li class="bulleted-list">\n$1</li>\n}g;
+                                  $bulleted_list
+                                    =~ s!(<li.*</li>\n)!<ul class="bulleted-list">\n$1</ul>\n!s;
+                                  $bulleted_list;
+                                }ge;
+                    $uncode;
+                  }
+                }sge;
+
       $item =~ s:\n{2,}:\n<p/>\n:g;                   # Keep paragraph breaks
       # Link LUCENE-XXX, SOLR-XXX and INFRA-XXX to JIRA
       $item =~ s{(?:${jira_url_prefix})?((?:LUCENE|SOLR|INFRA)-\d+)}

Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 17 09:45:02 2009
@@ -1,2 +1,3 @@
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:825998,829134,829881,831036
+/lucene/java/trunk/src/test/org/apache/lucene/analysis/TestISOLatin1AccentFilter.java:881213

Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestDateTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 17 09:45:02 2009
@@ -1,2 +1,3 @@
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestDateTools.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestDateTools.java:825998,829134,829881,831036
+/lucene/java/trunk/src/test/org/apache/lucene/document/TestDateTools.java:881213

Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/document/TestNumberTools.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 17 09:45:02 2009
@@ -1,2 +1,3 @@
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/document/TestNumberTools.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/document/TestNumberTools.java:825998,829134,829881,831036
+/lucene/java/trunk/src/test/org/apache/lucene/document/TestNumberTools.java:881213

Propchange: lucene/java/branches/lucene_3_0/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 17 09:45:02 2009
@@ -1,2 +1,3 @@
 /lucene/java/branches/lucene_2_4/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:748824
 /lucene/java/branches/lucene_2_9/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:825998,829134,829881,831036
+/lucene/java/trunk/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java:881213



Mime
View raw message