Merge branch 'feature/bug_tableofcontents_latex' of https://github.com/albert-github/doxygen into feature/bug_tableofcontents_latex

5 files changed, 23 insertions, 9 deletions

diff --git a/templates/html/doxygen.css b/templates/html/doxygen.css
index 1425dc1..8a1235a 100644
--- a/templates/html/doxygen.css
+++ b/templates/html/doxygen.css
@@ -167,6 +167,14 @@ ul {
   overflow: hidden; /*Fixed: list item bullets overlap floating elements*/
 }
 
+#side-nav ul {
+  overflow: visible; /* reset ul rule for scroll bar in GENERATE_TREEVIEW window */
+}
+
+#main-nav ul {
+  overflow: visible; /* reset ul rule for the navigation bar drop down lists */
+}
+
 .fragment {
   text-align: left;
   direction: ltr;
diff --git a/templates/html/dynsections.js b/templates/html/dynsections.js
index c1ce122..ea0a7b3 100644
--- a/templates/html/dynsections.js
+++ b/templates/html/dynsections.js
@@ -60,7 +60,7 @@ function toggleLevel(level)
       $(this).show();
     } else if (l==level+1) {
       i.removeClass('iconfclosed iconfopen').addClass('iconfclosed');
-      a.html('▶');
+      a.html('►');
       $(this).show();
     } else {
       $(this).hide();
@@ -87,7 +87,7 @@ function toggleFolder(id)
     // replace down arrow by right arrow for current row
     var currentRowSpans = currentRow.find("span");
     currentRowSpans.filter(".iconfopen").removeClass("iconfopen").addClass("iconfclosed");
-    currentRowSpans.filter(".arrow").html('▶');
+    currentRowSpans.filter(".arrow").html('►');
     rows.filter("[id^=row_"+id+"]").hide(); // hide all children
   } else { // we are SHOWING
     // replace right arrow by down arrow for current row
@@ -97,7 +97,7 @@ function toggleFolder(id)
     // replace down arrows by right arrows for child rows
     var childRowsSpans = childRows.find("span");
     childRowsSpans.filter(".iconfopen").removeClass("iconfopen").addClass("iconfclosed");
-    childRowsSpans.filter(".arrow").html('▶');
+    childRowsSpans.filter(".arrow").html('►');
     childRows.show(); //show all children
   }
   updateStripes();
diff --git a/templates/html/htmldirtree.tpl b/templates/html/htmldirtree.tpl
index 6d3ef8c..a6b9b21 100644
--- a/templates/html/htmldirtree.tpl
+++ b/templates/html/htmldirtree.tpl
@@ -20,7 +20,7 @@
   {% else %}
     <span style="width:{{ (node.level)*16 }}px;display:inline-block;">&#160;</span>
     <span id="arr_{{ node.id }}" class="arrow" onclick="toggleFolder('{{ node.id}}')">
-       {%if node.level+1<tree.preferredDepth %}&#9660;{% else %}&#9654;{% endif %}
+       {%if node.level+1<tree.preferredDepth %}&#9660;{% else %}&#9658;{% endif %}
     </span>
   {% endif %}
   {% if node.namespace %}
diff --git a/templates/html/navtree.js b/templates/html/navtree.js
index e310bc9..7ce2935 100644
--- a/templates/html/navtree.js
+++ b/templates/html/navtree.js
@@ -23,7 +23,7 @@
  */
 var navTreeSubIndices = new Array();
 var arrowDown = '&#9660;';
-var arrowRight = '&#9654;';
+var arrowRight = '&#9658;';
 
 function getData(varName)
 {
diff --git a/templates/latex/doxygen.sty b/templates/latex/doxygen.sty
index bee23c5..51e369b 100644
--- a/templates/latex/doxygen.sty
+++ b/templates/latex/doxygen.sty
@@ -97,7 +97,7 @@
 }
 
 % Used by @code ... @endcode
-\newenvironment{DoxyCode}{%
+\newenvironment{DoxyCode}[1]{%
   \par%
   \scriptsize%
   \normalfont\ttfamily%
@@ -106,7 +106,13 @@
   \settowidth{\CodeWidthChar}{?}%
   \settoheight{\CodeHeightChar}{?}%
   \setlength{\parskip}{0ex plus 0ex minus 0ex}%
-  {\lccode`~32 \lowercase{\global\let~}\NiceSpace}\obeyspaces%
+  \ifthenelse{\equal{#1}{0}}
+  {
+    {\lccode`~32 \lowercase{\global\let~}\NiceSpace}\obeyspaces%
+  }
+  {
+    {\lccode`~32 \lowercase{\global\let~}}\obeyspaces%
+  }
 
 }{%
   \normalfont%
@@ -128,8 +134,8 @@
 \fi
 
 % Used by @example, @include, @includelineno and @dontinclude
-\newenvironment{DoxyCodeInclude}{%
-  \DoxyCode%
+\newenvironment{DoxyCodeInclude}[1]{%
+	\DoxyCode{#1}%
 }{%
   \endDoxyCode%
 }