Trac #148: Use same hilighting technique also for documentation.
diff --git a/org.jacoco.doc/docroot/doc/.resources/doc.css b/org.jacoco.doc/docroot/doc/.resources/doc.css
index d38bf8c..3e62c59 100644
--- a/org.jacoco.doc/docroot/doc/.resources/doc.css
+++ b/org.jacoco.doc/docroot/doc/.resources/doc.css
@@ -122,10 +122,15 @@
font-family:monospace;
}
-pre.source span.nr {
- color:#c0c0c0;
- border-right:#d6d3ce 1px solid;
- padding-right:2pt;
+pre.source ol {
+ margin-bottom: 0px;
+ margin-top: 0px;
+}
+
+pre.source li {
+ border-left: 1px solid #D6D3CE;
+ color: #A0A0A0;
+ padding-left: 0px;
}
pre.source span.fc {
diff --git a/org.jacoco.doc/docroot/doc/ant.html b/org.jacoco.doc/docroot/doc/ant.html
index d271ab1..f028b5f 100644
--- a/org.jacoco.doc/docroot/doc/ant.html
+++ b/org.jacoco.doc/docroot/doc/ant.html
@@ -65,16 +65,16 @@
<code>taskdef</code> declaration:
</p>
-<pre class="source lang-xml">
-<span class="nr"> 1</span><project name="Example" xmlns:jacoco="antlib:org.jacoco.ant">
-<span class="nr"> 2</span>
-<span class="nr"> 3</span> <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
-<span class="nr"> 4</span> <classpath path="<i>path_to_jacoco</i>/lib/jacocoant.jar"/>
-<span class="nr"> 5</span> </taskdef>
-<span class="nr"> 6</span>
-<span class="nr"> 7</span> ...
-<span class="nr"> 8</span>
-<span class="nr"> 9</span></project>
+<pre class="source lang-xml linenums">
+<project name="Example" xmlns:jacoco="antlib:org.jacoco.ant">
+
+ <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
+ <classpath path="<i>path_to_jacoco</i>/lib/jacocoant.jar"/>
+ </taskdef>
+
+ ...
+
+</project>
</pre>
<p>
@@ -96,24 +96,24 @@
following examples:
</p>
-<pre class="source lang-xml">
-<span class="nr"> 1</span><jacoco:coverage>
-<span class="nr"> 2</span> <java classname="org.jacoco.examples.HelloJaCoCo" fork="true">
-<span class="nr"> 3</span> <classpath>
-<span class="nr"> 4</span> <pathelement location="./bin"/>
-<span class="nr"> 5</span> </classpath>
-<span class="nr"> 6</span> </java>
-<span class="nr"> 7</span></jacoco:coverage>
-<span class="nr"> 8</span>
-<span class="nr"> 9</span>
-<span class="nr"> 10</span><jacoco:coverage>
-<span class="nr"> 11</span> <junit fork="true" forkmode="once">
-<span class="nr"> 12</span> <test name="org.jacoco.examples.HelloJaCoCoTest"/>
-<span class="nr"> 13</span> <classpath>
-<span class="nr"> 14</span> <pathelement location="./bin"/>
-<span class="nr"> 15</span> </classpath>
-<span class="nr"> 16</span> </junit>
-<span class="nr"> 17</span></jacoco:coverage>
+<pre class="source lang-xml linenums">
+<jacoco:coverage>
+ <java classname="org.jacoco.examples.HelloJaCoCo" fork="true">
+ <classpath>
+ <pathelement location="./bin"/>
+ </classpath>
+ </java>
+</jacoco:coverage>
+
+
+<jacoco:coverage>
+ <junit fork="true" forkmode="once">
+ <test name="org.jacoco.examples.HelloJaCoCoTest"/>
+ <classpath>
+ <pathelement location="./bin"/>
+ </classpath>
+ </junit>
+</jacoco:coverage>
</pre>
<p>
@@ -260,8 +260,8 @@
as a Java VM parameter:
</p>
-<pre class="source lang-xml">
-<span class="nr"> 1</span><jacoco:agent property="agentvmparam"/>
+<pre class="source lang-xml linenums">
+<jacoco:agent property="agentvmparam"/>
</pre>
<p>
@@ -303,8 +303,8 @@
stopping it. For example:
</p>
-<pre class="source lang-xml">
-<span class="nr"> 1</span><jacoco:dump address="server.example.com" reset="true" destfile="remote.exec"/>
+<pre class="source lang-xml linenums">
+<jacoco:dump address="server.example.com" reset="true" destfile="remote.exec"/>
</pre>
<p>
@@ -377,10 +377,10 @@
into a single data store.
</p>
-<pre class="source lang-xml">
-<span class="nr"> 1</span><jacoco:merge destfile="merged.exec">
-<span class="nr"> 2</span> <fileset dir="executionData" includes="*.exec"/>
-<span class="nr"> 3</span></jacoco:merge>
+<pre class="source lang-xml linenums">
+<jacoco:merge destfile="merged.exec">
+ <fileset dir="executionData" includes="*.exec"/>
+</jacoco:merge>
</pre>
<p>
@@ -414,25 +414,25 @@
input data, additional ones specify the output formats:
</p>
-<pre class="source lang-xml">
-<span class="nr"> 1</span><jacoco:report>
-<span class="nr"> 2</span>
-<span class="nr"> 3</span> <executiondata>
-<span class="nr"> 4</span> <file file="jacoco.exec"/>
-<span class="nr"> 5</span> </executiondata>
-<span class="nr"> 6</span>
-<span class="nr"> 7</span> <structure name="Example Project">
-<span class="nr"> 8</span> <classfiles>
-<span class="nr"> 9</span> <fileset dir="classes"/>
-<span class="nr"> 10</span> </classfiles>
-<span class="nr"> 11</span> <sourcefiles encoding="UTF-8">
-<span class="nr"> 12</span> <fileset dir="src"/>
-<span class="nr"> 13</span> </sourcefiles>
-<span class="nr"> 14</span> </structure>
-<span class="nr"> 15</span>
-<span class="nr"> 16</span> <html destdir="report"/>
-<span class="nr"> 17</span>
-<span class="nr"> 18</span></jacoco:report>
+<pre class="source lang-xml linenums">
+<jacoco:report>
+
+ <executiondata>
+ <file file="jacoco.exec"/>
+ </executiondata>
+
+ <structure name="Example Project">
+ <classfiles>
+ <fileset dir="classes"/>
+ </classfiles>
+ <sourcefiles encoding="UTF-8">
+ <fileset dir="src"/>
+ </sourcefiles>
+ </structure>
+
+ <html destdir="report"/>
+
+</jacoco:report>
</pre>
<p>
@@ -477,12 +477,12 @@
possible and allows to narrow the scope of the report, for example:
</p>
-<pre class="source lang-xml">
-<span class="nr"> 1</span><classfiles>
-<span class="nr"> 2</span> <fileset dir="classes">
-<span class="nr"> 3</span> <include name="org/jacoco/examples/important/**/*.class" />
-<span class="nr"> 4</span> </fileset>
-<span class="nr"> 5</span></classfiles>
+<pre class="source lang-xml linenums">
+<classfiles>
+ <fileset dir="classes">
+ <include name="org/jacoco/examples/important/**/*.class"/>
+ </fileset>
+</classfiles>
</pre>
<p class="hint">
@@ -499,28 +499,28 @@
be specified separately. For example:
</p>
-<pre class="source lang-xml">
-<span class="nr"> 1</span><structure name="Example Project">
-<span class="nr"> 2</span> <group name="Server">
-<span class="nr"> 3</span> <classfiles>
-<span class="nr"> 4</span> <fileset dir="${workspace.dir}/org.jacoco.example.server/classes"/>
-<span class="nr"> 5</span> </classfiles>
-<span class="nr"> 6</span> <sourcefiles>
-<span class="nr"> 7</span> <fileset dir="${workspace.dir}/org.jacoco.example.server/src"/>
-<span class="nr"> 8</span> </sourcefiles>
-<span class="nr"> 9</span> </group>
-<span class="nr"> 10</span> <group name="Client">
-<span class="nr"> 11</span> <classfiles>
-<span class="nr"> 12</span> <fileset dir="${workspace.dir}/org.jacoco.example.client/classes"/>
-<span class="nr"> 13</span> </classfiles>
-<span class="nr"> 14</span> <sourcefiles>
-<span class="nr"> 15</span> <fileset dir="${workspace.dir}/org.jacoco.example.client/src"/>
-<span class="nr"> 16</span> </sourcefiles>
-<span class="nr"> 17</span> </group>
-<span class="nr"> 18</span>
-<span class="nr"> 19</span> ...
-<span class="nr"> 20</span>
-<span class="nr"> 21</span></structure>
+<pre class="source lang-xml linenums">
+<structure name="Example Project">
+ <group name="Server">
+ <classfiles>
+ <fileset dir="${workspace.dir}/org.jacoco.example.server/classes"/>
+ </classfiles>
+ <sourcefiles>
+ <fileset dir="${workspace.dir}/org.jacoco.example.server/src"/>
+ </sourcefiles>
+ </group>
+ <group name="Client">
+ <classfiles>
+ <fileset dir="${workspace.dir}/org.jacoco.example.client/classes"/>
+ </classfiles>
+ <sourcefiles>
+ <fileset dir="${workspace.dir}/org.jacoco.example.client/src"/>
+ </sourcefiles>
+ </group>
+
+ ...
+
+</structure>
</pre>
<p>
diff --git a/org.jacoco.doc/docroot/doc/build.html b/org.jacoco.doc/docroot/doc/build.html
index 90f30c9..da97ccf 100644
--- a/org.jacoco.doc/docroot/doc/build.html
+++ b/org.jacoco.doc/docroot/doc/build.html
@@ -4,10 +4,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<link rel="stylesheet" href=".resources/doc.css" charset="ISO-8859-1" type="text/css" />
+ <link rel="stylesheet" href="../coverage/.resources/prettify.css" charset="ISO-8859-1" type="text/css" />
<link rel="shortcut icon" href=".resources/report.gif" type="image/gif" />
+ <script type="text/javascript" src="../coverage/.resources/prettify.js"></script>
<title>JaCoCo - Build</title>
</head>
-<body>
+<body onload="prettyPrint()">
<div class="breadcrumb">
<a href="../index.html" class="el_report">JaCoCo</a> >
@@ -229,11 +231,11 @@
definition from the dependencies, for example:
</p>
-<pre class="source">
-<span class="nr"> 1</span><path id="dependencies">
-<span class="nr"> 2</span> <path refid="bundle-org.jacoco.core"/>
-<span class="nr"> 3</span> <path refid="bundle-org.objectweb.asm"/>
-<span class="nr"> 4</span></path>
+<pre class="source linenums">
+<path id="dependencies">
+ <path refid="bundle-org.jacoco.core"/>
+ <path refid="bundle-org.objectweb.asm"/>
+</path>
</pre>
<p>
diff --git a/org.jacoco.doc/docroot/doc/changes.html b/org.jacoco.doc/docroot/doc/changes.html
index 125ff57..27d78e6 100644
--- a/org.jacoco.doc/docroot/doc/changes.html
+++ b/org.jacoco.doc/docroot/doc/changes.html
@@ -36,7 +36,8 @@
<ul>
<li>API documentation cleanup (Track #140).</li>
<li>Removed obsolete examples from documentation (Trac #141).</li>
- <li>Added reporting API example (Trac #146)</li>
+ <li>Added reporting API example (Trac #146).</li>
+ <li>Reduced file size of HTML report source pages (Trac #148).</li>
</ul>
<h3>API Changes</h3>
diff --git a/org.jacoco.doc/docroot/doc/flow.html b/org.jacoco.doc/docroot/doc/flow.html
index 04fffea..e07eca3 100644
--- a/org.jacoco.doc/docroot/doc/flow.html
+++ b/org.jacoco.doc/docroot/doc/flow.html
@@ -40,16 +40,16 @@
single branching point:
</p>
-<pre class="source lang-java">
-<span class="nr"> 1</span>public static void example() {
-<span class="nr"> 2</span> a();
-<span class="nr"> 3</span> if (cond()) {
-<span class="nr"> 4</span> b();
-<span class="nr"> 5</span> } else {
-<span class="nr"> 6</span> c();
-<span class="nr"> 7</span> }
-<span class="nr"> 8</span> d();
-<span class="nr"> 9</span>}
+<pre class="source lang-java linenums">
+public static void example() {
+ a();
+ if (cond()) {
+ b();
+ } else {
+ c();
+ }
+ d();
+}
</pre>
<p>
@@ -62,16 +62,16 @@
(also the ASM API uses such symbolic labels):
</p>
-<pre class="source">
-<span class="nr"> </span>public static example()V
-<span class="nr"> </span> INVOKESTATIC a()V
-<span class="nr"> </span> INVOKESTATIC cond()Z
-<span class="nr"> </span> IFEQ L1
-<span class="nr"> </span> INVOKESTATIC b()V
-<span class="nr"> </span> GOTO L2
-<span class="nr"> L1:</span> INVOKESTATIC c()V
-<span class="nr"> L2:</span> INVOKESTATIC d()V
-<span class="nr"> </span> RETURN
+<pre class="source linenums">
+public static example()V
+ INVOKESTATIC a()V
+ INVOKESTATIC cond()Z
+ IFEQ L1
+ INVOKESTATIC b()V
+ GOTO L2
+ INVOKESTATIC c()V
+ INVOKESTATIC d()V
+ RETURN
</pre>
<p>
diff --git a/org.jacoco.doc/docroot/doc/implementation.html b/org.jacoco.doc/docroot/doc/implementation.html
index 693c0f9..b9306ce 100644
--- a/org.jacoco.doc/docroot/doc/implementation.html
+++ b/org.jacoco.doc/docroot/doc/implementation.html
@@ -168,17 +168,17 @@
</p>
-<pre class="source lang-java">
-<span class="nr"> 1</span>Object access = ... // Retrieve instance
-<span class="nr"> 2</span>
-<span class="nr"> 3</span>Object[] args = new Object[3];
-<span class="nr"> 4</span>args[0] = Long.valueOf(8060044182221863588); // class id
-<span class="nr"> 5</span>args[1] = "com/example/MyClass"; // class name
-<span class="nr"> 6</span>args[2] = Integer.valueOf(24); // probe count
-<span class="nr"> 7</span>
-<span class="nr"> 8</span>access.equals(args);
-<span class="nr"> 9</span>
-<span class="nr"> 10</span>boolean[] probes = (boolean[]) args[0];
+<pre class="source lang-java linenums">
+Object access = ... // Retrieve instance
+
+Object[] args = new Object[3];
+args[0] = Long.valueOf(8060044182221863588); // class id
+args[1] = "com/example/MyClass"; // class name
+args[2] = Integer.valueOf(24); // probe count
+
+access.equals(args);
+
+boolean[] probes = (boolean[]) args[0];
</pre>
<p>