ICU-12769 Added modified javadoc8 stylesheet, and updated build.xml to switch stylesh...

X-SVN-Rev: 39413

diff --git a/.gitattributes b/.gitattributes
index 9321c165fc90a8310594490d6be5933e7d72ab83..8987a7e2ce9bb224390c2c4730c4bc183e89868e 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -553,6 +553,7 @@ icu4j/samples/src/com/ibm/icu/samples/iuc/data/reshello/es.res -text
 icu4j/samples/src/com/ibm/icu/samples/iuc/data/reshello/mt.res -text
 icu4j/samples/src/com/ibm/icu/samples/iuc/data/reshello/res_index.res -text
 icu4j/samples/src/com/ibm/icu/samples/iuc/data/reshello/root.res -text
+icu4j/stylesheet8.css -text
 icu4j/tools/build/icu4j48.api3.gz -text
 icu4j/tools/build/icu4j49.api3.gz -text
 icu4j/tools/build/icu4j50.api3.gz -text

diff --git a/icu4j/build.xml b/icu4j/build.xml
index b252e1cd67af71dfef6b3a50eece8df6f8105ca8..ffe1e69f2c769c840bbbeebfee12fd4068b50de5 100644 (file)
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -82,22 +82,34 @@
         </condition>
     </fail>
 
+    <condition property="is.java6">
+            <contains string="${java.version}" substring="1.6."/>
+    </condition>
+
+    <condition property="is.java7">
+            <contains string="${java.version}" substring="1.7."/>
+    </condition>
+
     <condition property="is.java8">
             <contains string="${java.version}" substring="1.8."/>
     </condition>
 
+    <condition property="is.java9">
+            <contains string="${java.version}" substring="1.9."/>
+    </condition>
+
     <condition property="is.java7.plus">
         <or>
-            <contains string="${java.version}" substring="1.7."/>
-            <contains string="${java.version}" substring="1.8."/>
-            <contains string="${java.version}" substring="1.9."/>
+            <isset property="is.java7"/>
+            <isset property="is.java8"/>
+            <isset property="is.java9"/>
         </or>
     </condition>
 
     <condition property="is.java8.plus">
         <or>
-            <contains string="${java.version}" substring="1.8."/>
-            <contains string="${java.version}" substring="1.9."/>
+            <isset property="is.java8"/>
+            <isset property="is.java9"/>
         </or>
     </condition>
 
@@ -911,9 +923,14 @@
     </target>
 
     <target name="_docsStyleSheet">
-        <condition property="docs.style.sheet" value="stylesheet7.css" else="stylesheet.css">
-            <isset property="is.java7.plus"/>
+        <condition property="docs.style.sheet" value="stylesheet6.css">
+            <isset property="is.java6"/>
+        </condition>
+        <condition property="docs.style.sheet" value="stylesheet7.css">
+            <isset property="is.java7"/>
         </condition>
+        <!-- all other cases -->
+        <property name="docs.style.sheet" value="stylesheet8.css"/>
     </target>
 
     <target name="_docsLintOption" unless="doclint.options">

diff --git a/icu4j/stylesheet.css b/icu4j/stylesheet6.css
similarity index 100%
rename from icu4j/stylesheet.css
rename to icu4j/stylesheet6.css

diff --git a/icu4j/stylesheet8.css b/icu4j/stylesheet8.css
new file mode 100644 (file)
index 0000000..89ea5b1
--- /dev/null
+++ b/icu4j/stylesheet8.css
@@ -0,0 +1,669 @@
+/*\r
+ * © 2016 and later: Unicode, Inc. and others.\r
+ * License & terms of use: http://www.unicode.org/copyright.html#License\r
+ */\r
+/* Javadoc style sheet */\r
+/*\r
+Overall document style\r
+*/\r
+\r
+@import url('resources/fonts/dejavu.css');\r
+\r
+body {\r
+    background-color:#ffffff;\r
+    color:#353833;\r
+    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;\r
+    font-size:14px;\r
+    margin:0;\r
+}\r
+a:link, a:visited {\r
+    text-decoration:none;\r
+    color:#4A6782;\r
+}\r
+a:hover, a:focus {\r
+    text-decoration:none;\r
+    color:#bb7a2a;\r
+}\r
+a:active {\r
+    text-decoration:none;\r
+    color:#4A6782;\r
+}\r
+a[name] {\r
+    color:#353833;\r
+}\r
+a[name]:hover {\r
+    text-decoration:none;\r
+    color:#353833;\r
+}\r
+pre {\r
+    font-family:'DejaVu Sans Mono', monospace;\r
+    font-size:14px;\r
+}\r
+h1 {\r
+    font-size:20px;\r
+}\r
+h2 {\r
+    font-size:18px;\r
+}\r
+h3 {\r
+    font-size:16px;\r
+    font-style:italic;\r
+}\r
+h4 {\r
+    font-size:13px;\r
+}\r
+h5 {\r
+    font-size:12px;\r
+}\r
+h6 {\r
+    font-size:11px;\r
+}\r
+ul {\r
+    list-style-type:disc;\r
+}\r
+code, tt {\r
+    font-family:'DejaVu Sans Mono', monospace;\r
+    font-size:14px;\r
+    padding-top:4px;\r
+    margin-top:8px;\r
+    line-height:1.4em;\r
+}\r
+dt code {\r
+    font-family:'DejaVu Sans Mono', monospace;\r
+    font-size:14px;\r
+    padding-top:4px;\r
+}\r
+table tr td dt code {\r
+    font-family:'DejaVu Sans Mono', monospace;\r
+    font-size:14px;\r
+    vertical-align:top;\r
+    padding-top:4px;\r
+}\r
+sup {\r
+    font-size:8px;\r
+}\r
+/*\r
+Document title and Copyright styles\r
+*/\r
+.clear {\r
+    clear:both;\r
+    height:0px;\r
+    overflow:hidden;\r
+}\r
+.aboutLanguage {\r
+    float:right;\r
+    padding:0px 21px;\r
+    font-size:11px;\r
+    z-index:200;\r
+    margin-top:-9px;\r
+}\r
+.legalCopy {\r
+    margin-left:.5em;\r
+}\r
+.bar a, .bar a:link, .bar a:visited, .bar a:active {\r
+    color:#FFFFFF;\r
+    text-decoration:none;\r
+}\r
+.bar a:hover, .bar a:focus {\r
+    color:#bb7a2a;\r
+}\r
+.tab {\r
+    background-color:#0066FF;\r
+    color:#ffffff;\r
+    padding:8px;\r
+    width:5em;\r
+    font-weight:bold;\r
+}\r
+/*\r
+Navigation bar styles\r
+*/\r
+.bar {\r
+    background-color:#4D7A97;\r
+    color:#FFFFFF;\r
+    padding:.8em .5em .4em .8em;\r
+    height:auto;/*height:1.8em;*/\r
+    font-size:11px;\r
+    margin:0;\r
+}\r
+.topNav {\r
+    background-color:#4D7A97;\r
+    color:#FFFFFF;\r
+    float:left;\r
+    padding:0;\r
+    width:100%;\r
+    clear:right;\r
+    height:2.8em;\r
+    padding-top:10px;\r
+    overflow:hidden;\r
+    font-size:12px; \r
+}\r
+.bottomNav {\r
+    margin-top:10px;\r
+    background-color:#4D7A97;\r
+    color:#FFFFFF;\r
+    float:left;\r
+    padding:0;\r
+    width:100%;\r
+    clear:right;\r
+    height:2.8em;\r
+    padding-top:10px;\r
+    overflow:hidden;\r
+    font-size:12px;\r
+}\r
+.subNav {\r
+    background-color:#dee3e9;\r
+    float:left;\r
+    width:100%;\r
+    overflow:hidden;\r
+    font-size:12px;\r
+}\r
+.subNav div {\r
+    clear:left;\r
+    float:left;\r
+    padding:0 0 5px 6px;\r
+    text-transform:uppercase;\r
+}\r
+ul.navList, ul.subNavList {\r
+    float:left;\r
+    margin:0 25px 0 0;\r
+    padding:0;\r
+}\r
+ul.navList li{\r
+    list-style:none;\r
+    float:left;\r
+    padding: 5px 6px;\r
+    text-transform:uppercase;\r
+}\r
+ul.subNavList li{\r
+    list-style:none;\r
+    float:left;\r
+}\r
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {\r
+    color:#FFFFFF;\r
+    text-decoration:none;\r
+    text-transform:uppercase;\r
+}\r
+.topNav a:hover, .bottomNav a:hover {\r
+    text-decoration:none;\r
+    color:#bb7a2a;\r
+    text-transform:uppercase;\r
+}\r
+.navBarCell1Rev {\r
+    background-color:#F8981D;\r
+    color:#253441;\r
+    margin: auto 5px;\r
+}\r
+.skipNav {\r
+    position:absolute;\r
+    top:auto;\r
+    left:-9999px;\r
+    overflow:hidden;\r
+}\r
+/*\r
+Page header and footer styles\r
+*/\r
+.header, .footer {\r
+    clear:both;\r
+    margin:0 20px;\r
+    padding:5px 0 0 0;\r
+}\r
+.indexHeader {\r
+    margin:10px;\r
+    position:relative;\r
+}\r
+.indexHeader span{\r
+    margin-right:15px;\r
+}\r
+.indexHeader h1 {\r
+    font-size:13px;\r
+}\r
+.title {\r
+    color:#2c4557;\r
+    margin:10px 0;\r
+}\r
+.subTitle {\r
+    margin:5px 0 0 0;\r
+}\r
+.header ul {\r
+    margin:0 0 15px 0;\r
+    padding:0;\r
+}\r
+.footer ul {\r
+    margin:20px 0 5px 0;\r
+}\r
+.header ul li, .footer ul li {\r
+    list-style:none;\r
+    font-size:13px;\r
+}\r
+/*\r
+Heading styles\r
+*/\r
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {\r
+    background-color:#dee3e9;\r
+    border:1px solid #d0d9e0;\r
+    margin:0 0 6px -8px;\r
+    padding:7px 5px;\r
+}\r
+ul.blockList ul.blockList ul.blockList li.blockList h3 {\r
+    background-color:#dee3e9;\r
+    border:1px solid #d0d9e0;\r
+    margin:0 0 6px -8px;\r
+    padding:7px 5px;\r
+}\r
+ul.blockList ul.blockList li.blockList h3 {\r
+    padding:0;\r
+    margin:15px 0;\r
+}\r
+ul.blockList li.blockList h2 {\r
+    padding:0px 0 20px 0;\r
+}\r
+/*\r
+Page layout container styles\r
+*/\r
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {\r
+    clear:both;\r
+    padding:10px 20px;\r
+    position:relative;\r
+}\r
+.indexContainer {\r
+    margin:10px;\r
+    position:relative;\r
+    font-size:12px;\r
+}\r
+.indexContainer h2 {\r
+    font-size:13px;\r
+    padding:0 0 3px 0;\r
+}\r
+.indexContainer ul {\r
+    margin:0;\r
+    padding:0;\r
+}\r
+.indexContainer ul li {\r
+    list-style:none;\r
+    padding-top:2px;\r
+}\r
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {\r
+    font-size:12px;\r
+    font-weight:bold;\r
+    margin:10px 0 0 0;\r
+    color:#4E4E4E;\r
+}\r
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {\r
+    margin:5px 0 10px 0px;\r
+    font-size:14px;\r
+    font-family:'DejaVu Sans Mono',monospace;\r
+}\r
+.serializedFormContainer dl.nameValue dt {\r
+    margin-left:1px;\r
+    font-size:1.1em;\r
+    display:inline;\r
+    font-weight:bold;\r
+}\r
+.serializedFormContainer dl.nameValue dd {\r
+    margin:0 0 0 1px;\r
+    font-size:1.1em;\r
+    display:inline;\r
+}\r
+/*\r
+List styles\r
+*/\r
+ul.horizontal li {\r
+    display:inline;\r
+    font-size:0.9em;\r
+}\r
+ul.inheritance {\r
+    margin:0;\r
+    padding:0;\r
+}\r
+ul.inheritance li {\r
+    display:inline;\r
+    list-style:none;\r
+}\r
+ul.inheritance li ul.inheritance {\r
+    margin-left:15px;\r
+    padding-left:15px;\r
+    padding-top:1px;\r
+}\r
+ul.blockList, ul.blockListLast {\r
+    margin:10px 0 10px 0;\r
+    padding:0;\r
+}\r
+ul.blockList li.blockList, ul.blockListLast li.blockList {\r
+    list-style:none;\r
+    margin-bottom:15px;\r
+    line-height:1.4;\r
+}\r
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {\r
+    padding:0px 20px 5px 10px;\r
+    border:1px solid #ededed; \r
+    background-color:#f8f8f8;\r
+}\r
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {\r
+    padding:0 0 5px 8px;\r
+    background-color:#ffffff;\r
+    border:none;\r
+}\r
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {\r
+    margin-left:0;\r
+    padding-left:0;\r
+    padding-bottom:15px;\r
+    border:none;\r
+}\r
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {\r
+    list-style:none;\r
+    border-bottom:none;\r
+    padding-bottom:0;\r
+}\r
+table tr td dl, table tr td dl dt, table tr td dl dd {\r
+    margin-top:0;\r
+    margin-bottom:1px;\r
+}\r
+/*\r
+Table styles\r
+*/\r
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {\r
+    width:100%;\r
+    border-left:1px solid #EEE; \r
+    border-right:1px solid #EEE; \r
+    border-bottom:1px solid #EEE; \r
+}\r
+.overviewSummary, .memberSummary  {\r
+    padding:0px;\r
+}\r
+.overviewSummary caption, .memberSummary caption, .typeSummary caption,\r
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {\r
+    position:relative;\r
+    text-align:left;\r
+    background-repeat:no-repeat;\r
+    color:#253441;\r
+    font-weight:bold;\r
+    clear:none;\r
+    overflow:hidden;\r
+    padding:0px;\r
+    padding-top:10px;\r
+    padding-left:1px;\r
+    margin:0px;\r
+    white-space:pre;\r
+}\r
+.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,\r
+.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,\r
+.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,\r
+.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,\r
+.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,\r
+.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,\r
+.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,\r
+.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {\r
+    color:#FFFFFF;\r
+}\r
+.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,\r
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {\r
+    white-space:nowrap;\r
+    padding-top:5px;\r
+    padding-left:12px;\r
+    padding-right:12px;\r
+    padding-bottom:7px;\r
+    display:inline-block;\r
+    float:left;\r
+    background-color:#F8981D;\r
+    border: none;\r
+    height:16px;\r
+}\r
+.memberSummary caption span.activeTableTab span {\r
+    white-space:nowrap;\r
+    padding-top:5px;\r
+    padding-left:12px;\r
+    padding-right:12px;\r
+    margin-right:3px;\r
+    display:inline-block;\r
+    float:left;\r
+    background-color:#F8981D;\r
+    height:16px;\r
+}\r
+.memberSummary caption span.tableTab span {\r
+    white-space:nowrap;\r
+    padding-top:5px;\r
+    padding-left:12px;\r
+    padding-right:12px;\r
+    margin-right:3px;\r
+    display:inline-block;\r
+    float:left;\r
+    background-color:#4D7A97;\r
+    height:16px;\r
+}\r
+.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {\r
+    padding-top:0px;\r
+    padding-left:0px;\r
+    padding-right:0px;\r
+    background-image:none;\r
+    float:none;\r
+    display:inline;\r
+}\r
+.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,\r
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {\r
+    display:none;\r
+    width:5px;\r
+    position:relative;\r
+    float:left;\r
+    background-color:#F8981D;\r
+}\r
+.memberSummary .activeTableTab .tabEnd {\r
+    display:none;\r
+    width:5px;\r
+    margin-right:3px;\r
+    position:relative; \r
+    float:left;\r
+    background-color:#F8981D;\r
+}\r
+.memberSummary .tableTab .tabEnd {\r
+    display:none;\r
+    width:5px;\r
+    margin-right:3px;\r
+    position:relative;\r
+    background-color:#4D7A97;\r
+    float:left;\r
+\r
+}\r
+.overviewSummary td, .memberSummary td, .typeSummary td,\r
+.useSummary td, .constantsSummary td, .deprecatedSummary td {\r
+    text-align:left;\r
+    padding:0px 0px 12px 10px;\r
+}\r
+th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,\r
+td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{\r
+    vertical-align:top;\r
+    padding-right:0px;\r
+    padding-top:8px;\r
+    padding-bottom:3px;\r
+}\r
+th.colFirst, th.colLast, th.colOne, .constantsSummary th {\r
+    background:#dee3e9;\r
+    text-align:left;\r
+    padding:8px 3px 3px 7px;\r
+}\r
+td.colFirst, th.colFirst {\r
+    white-space:nowrap;\r
+    font-size:13px;\r
+}\r
+td.colLast, th.colLast {\r
+    font-size:13px;\r
+}\r
+td.colOne, th.colOne {\r
+    font-size:13px;\r
+}\r
+.overviewSummary td.colFirst, .overviewSummary th.colFirst,\r
+.useSummary td.colFirst, .useSummary th.colFirst,\r
+.overviewSummary td.colOne, .overviewSummary th.colOne,\r
+.memberSummary td.colFirst, .memberSummary th.colFirst,\r
+.memberSummary td.colOne, .memberSummary th.colOne,\r
+.typeSummary td.colFirst{\r
+    width:25%;\r
+    vertical-align:top;\r
+}\r
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {\r
+    font-weight:bold;\r
+}\r
+.tableSubHeadingColor {\r
+    background-color:#EEEEFF;\r
+}\r
+.altColor {\r
+    background-color:#FFFFFF;\r
+}\r
+.rowColor {\r
+    background-color:#EEEEEF;\r
+}\r
+/*\r
+Content styles\r
+*/\r
+.description pre {\r
+    margin-top:0;\r
+}\r
+.deprecatedContent {\r
+    margin:0;\r
+    padding:10px 0;\r
+}\r
+.docSummary {\r
+    padding:0;\r
+}\r
+\r
+ul.blockList ul.blockList ul.blockList li.blockList h3 {\r
+    font-style:normal;\r
+}\r
+\r
+div.block {\r
+    font-size:14px;\r
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;\r
+}\r
+\r
+td.colLast div {\r
+    padding-top:0px;\r
+}\r
+\r
+\r
+td.colLast a {\r
+    padding-bottom:3px;\r
+}\r
+/*\r
+Formatting effect styles\r
+*/\r
+.sourceLineNo {\r
+    color:green;\r
+    padding:0 30px 0 0;\r
+}\r
+h1.hidden {\r
+    visibility:hidden;\r
+    overflow:hidden;\r
+    font-size:10px;\r
+}\r
+.block {\r
+    display:block;\r
+    margin:3px 10px 2px 0px;\r
+    color:#474747;\r
+}\r
+.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,\r
+.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,\r
+.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {\r
+    font-weight:bold;\r
+}\r
+.deprecationComment, .emphasizedPhrase, .interfaceName {\r
+    font-style:italic;\r
+}\r
+\r
+div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,\r
+div.block div.block span.interfaceName {\r
+    font-style:normal;\r
+}\r
+\r
+div.contentContainer ul.blockList li.blockList h2{\r
+    padding-bottom:0px;\r
+}\r
+\r
+/* Styles for JCite */\r
+pre.java /* container for citations */\r
+    {\r
+    border-style: solid;\r
+    border-width: 1px;\r
+    border-color: DarkGray;\r
+    margin: 1.5em 1.5em 1.5em 1.5em;\r
+    background-color: cornsilk;\r
+    }\r
+\r
+tt.java /* single cited line in JCite's -tt mode */\r
+    {\r
+    border-style: solid;\r
+    border-width: 1px;\r
+    border-color: DarkGray;\r
+    margin: 1.5em 1.5em 1.5em 1.5em;\r
+    background-color: cornsilk;\r
+    }\r
+\r
+span.j-blk /* block comment */\r
+{\r
+    color: DarkGreen;\r
+}\r
+\r
+span.j-cmt /* line comment */\r
+{\r
+    color: DarkGreen;\r
+}\r
+\r
+span.j-key /* keyword */\r
+{\r
+    /* font-weight:bold; */\r
+    color: Purple;\r
+    font-weight: bold;\r
+}\r
+\r
+span.j-str /* string constants */\r
+{\r
+    color: Blue;\r
+}\r
+\r
+span.j-chr /* char constants */\r
+{\r
+    color: Blue;\r
+}\r
+\r
+span.j-num /* number constants */\r
+{\r
+}\r
+\r
+span.j-sym /* symbols, punctuation */\r
+{\r
+}\r
+\r
+span.j-typ /* primitive types */\r
+{\r
+    color: Purple;\r
+    font-weight: bold;\r
+}\r
+\r
+span.j-jdoc /* javadoc */\r
+{\r
+    color: DarkSlateBlue;\r
+}\r
+\r
+span.j-jdoc-key /* javadoc keyword */\r
+{\r
+    color: MediumSlateBlue;\r
+    font-weight: bold;\r
+}\r
+\r
+span.j-jdoc-html /* javadoc html tag */\r
+{\r
+    color: SlateGray;\r
+}\r
+\r
+span.j-jdoc-link /* javadoc link */\r
+{\r
+    color: Blue;\r
+}\r
+\r
+span.j-undef /* undefined */\r
+{\r
+}\r
+\r
+span.j-hl /* highlight */\r
+{\r
+    text-decoration: none;\r
+    background-color: #FFFFB0;\r
+}\r