Upgrade Doxygen configuration files for Doxygen 1.8.1, fix broken stylesheet and footer HTML, add explicit spacing into documentation code fragments to prevent Doxygen from removing empty lines in the output.

3 files changed, 86 insertions, 37 deletions

diff --git a/LUFA/DoxygenPages/SoftwareBootloaderJump.txt b/LUFA/DoxygenPages/SoftwareBootloaderJump.txt
index 1fad85fb7..09de9234d 100644
--- a/LUFA/DoxygenPages/SoftwareBootloaderJump.txt
+++ b/LUFA/DoxygenPages/SoftwareBootloaderJump.txt
@@ -25,15 +25,15 @@
  *  #include <avr/wdt.h>
  *  #include <avr/io.h>
  *  #include <util/delay.h>
- *
+ *  
  *  #include <LUFA/Common/Common.h>
  *  #include <LUFA/Drivers/USB/USB.h>
- *
+ *  
  *  uint32_t Boot_Key ATTR_NO_INIT;
- *
+ *  
  *  #define MAGIC_BOOT_KEY            0xDC42ACCA
  *  #define BOOTLOADER_START_ADDRESS  (FLASH_SIZE_BYTES - BOOTLOADER_SEC_SIZE_BYTES)
- *
+ *  
  *  void Bootloader_Jump_Check(void) ATTR_INIT_SECTION(3);
  *  void Bootloader_Jump_Check(void)
  *  {
@@ -44,18 +44,18 @@
  *          ((void (*)(void))BOOTLOADER_START_ADDRESS)();
  *      }
  *  }
- *
+ *  
  *  void Jump_To_Bootloader(void)
  *  {
  *      // If USB is used, detach from the bus and reset it
  *      USB_Disable();
- *
+ *      
  *      // Disable all interrupts
  *      cli();
- *
+ *      
  *      // Wait two seconds for the USB detachment to register on the host
  *      Delay_MS(2000);
- *
+ *      
  *      // Set the bootloader key to the magic value and force a reset
  *      Boot_Key = MAGIC_BOOT_KEY;
  *      wdt_enable(WDTO_250MS);
diff --git a/LUFA/DoxygenPages/Style/Footer.htm b/LUFA/DoxygenPages/Style/Footer.htm
index 70bce5313..a72c5bdd2 100644
--- a/LUFA/DoxygenPages/Style/Footer.htm
+++ b/LUFA/DoxygenPages/Style/Footer.htm
@@ -1,15 +1,35 @@
 <!--BEGIN GENERATE_TREEVIEW-->
-			<span style="margin-right: 20px; float: right;">
+	<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+		<ul>
+			<li class="footer" style="float:left !important;">
+				$generatedby
+				<a href="http://www.doxygen.org/index.html">
+					<img class="footer" src="$relpath$doxygen.png" alt="doxygen"/>
+				</a>
+				$doxygenversion
+			</li>
+
+			<li class="footer">
 				<a href="http://www.lufa-lib.org" title="LUFA Project Page">LUFA Project Page</a> | <a href="http://www.lufa-lib.org/support" title="LUFA Support List">Support Mailing List</a> | <a href="http://www.lufa-lib.org/donate" title="Donate to Support LUFA">Donate</a> | <a href="http://www.fourwalledcubicle.com" title="Four Walled Cubicle Website">Four Walled Cubicle</a> - LUFA, the Lightweight USB Framework for AVRs
-			</span>
+			</li>
 		</ul>
 	</div>
 <!--END GENERATE_TREEVIEW-->
 <!--BEGIN !GENERATE_TREEVIEW-->
 		<hr class="footer"/>
-		<span style="margin-right: 20px; float: right;">
-			<a href="http://www.lufa-lib.org" title="LUFA Project Page">LUFA Project Page</a> | <a href="http://www.lufa-lib.org/support" title="LUFA Support List">Support Mailing List</a> | <a href="http://www.lufa-lib.org/donate" title="Donate to Support LUFA">Donate</a> | <a href="http://www.fourwalledcubicle.com" title="Four Walled Cubicle Website">Four Walled Cubicle</a> - LUFA, the Lightweight USB Framework for AVRs
-		</span>
+		<div class="footer">
+			<span style="float: left;">
+				$generatedby
+				<a href="http://www.doxygen.org/index.html">
+					<img class="footer" src="$relpath$doxygen.png" alt="doxygen"/>
+				</a>
+				$doxygenversion
+			</span>
+
+			<span style="margin-right: 20px; float: right;">
+				<a href="http://www.lufa-lib.org" title="LUFA Project Page">LUFA Project Page</a> | <a href="http://www.lufa-lib.org/support" title="LUFA Support List">Support Mailing List</a> | <a href="http://www.lufa-lib.org/donate" title="Donate to Support LUFA">Donate</a> | <a href="http://www.fourwalledcubicle.com" title="Four Walled Cubicle Website">Four Walled Cubicle</a> - LUFA, the Lightweight USB Framework for AVRs
+			</span>
+		</div>
 <!--END !GENERATE_TREEVIEW-->
 	</body>
 </html>
\ No newline at end of file
diff --git a/LUFA/DoxygenPages/Style/Style.css b/LUFA/DoxygenPages/Style/Style.css
index 3bff51e78..b64f9de83 100644
--- a/LUFA/DoxygenPages/Style/Style.css
+++ b/LUFA/DoxygenPages/Style/Style.css
@@ -43,14 +43,11 @@
 		overflow:inherit;

 		width:auto !important;

 	}

-

-	pre.fragment

+	

+	.fragment

 	{

-		overflow:visible;

-		text-wrap:unrestricted;

-		white-space:pre-wrap;

-		word-wrap:break-word;

-	}

+		background-color: #FFFFFF !important;

+	}	

 }

 

 body,table,div,p,dl

@@ -81,9 +78,8 @@ div.contents table.memberdecls,.paramname
 

 h1

 {

-	font-size:30px;

+	font-size:25px;

 	margin-bottom:10px;

-	padding:0 0 20px;

 }

 

 h2

@@ -228,22 +224,55 @@ dl.el
 	margin-left:-1cm;

 }

 

-.fragment

-{

-	font-family:monospace, fixed;

-	font-size:105%;

+pre.fragment {

+        border: 1px solid #C4CFE5;

+        background-color: #FBFCFD;

+        padding: 4px 6px;

+        margin: 4px 8px 4px 2px;

+        overflow: auto;

+        word-wrap: break-word;

+        font-size:  9pt;

+        line-height: 125%;

+        font-family: monospace, fixed;

+        font-size: 105%;

 }

 

-pre.fragment

-{

-	background-color:#F8F8F8;

-	border:1px solid #C1CEE8;

-	font-size:10pt;

-	line-height:125%;

-	margin:4px 8px 4px 20px;

-	overflow:auto;

-	padding:4px 6px;

-	word-wrap:break-word;

+div.fragment {

+	padding: 4px;

+	margin: 4px;

+	background-color: #FBFCFD;

+	border: 1px solid #C4CFE5;

+}

+

+div.line {

+	font-family: monospace, fixed;

+	font-size: 13px;

+	line-height: 1.0;

+	text-wrap: unrestricted;

+	white-space: -moz-pre-wrap; /* Moz */

+	white-space: -pre-wrap;     /* Opera 4-6 */

+	white-space: -o-pre-wrap;   /* Opera 7 */

+	white-space: pre-wrap;      /* CSS3  */

+	word-wrap: break-word;      /* IE 5.5+ */

+	text-indent: -53px;

+	padding-left: 53px;

+	padding-bottom: 0px;

+	margin: 0px;

+}

+

+span.lineno {

+	padding-right: 4px;

+	text-align: right;

+	border-right: 2px solid #0F0;

+	background-color: #E8E8E8;

+	white-space: pre;

+}

+span.lineno a {

+	background-color: #D8D8D8;

+}

+

+span.lineno a:hover {

+	background-color: #C8C8C8;

 }

 

 div.ah

@@ -1090,4 +1119,4 @@ div.toc li.level3
 div.toc li.level4

 {

 	margin-left:45px;

-}
\ No newline at end of file
+}