From 4e53ce0e53a74750a2d70b8c5c582211d7963e4b Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars@erlang.org>
Date: Wed, 23 Feb 2011 09:55:24 +0100
Subject: Subsections below level 2 where not handled correct when generating
 html and pdf.

---
 lib/erl_docgen/doc/src/notes.xml      | 27 +++++++++++++++++++++------
 lib/erl_docgen/priv/xsl/db_html.xsl   |  8 +++-----
 lib/erl_docgen/priv/xsl/db_pdf.xsl    | 20 ++++++++++++++++++--
 lib/erl_docgen/vsn.mk                 |  3 ++-
 system/doc/top/src/erl_html_tools.erl | 14 +++++++-------
 5 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index c7a7926c40..7c8a2c8208 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -29,7 +29,22 @@
     <file>notes.xml</file>
   </header>
   <p>This document describes the changes made to the erl_docgen application.</p>
-    <section><title>Erl_Docgen 0.2.3</title>
+
+  <section><title>erl_docgen 0.2.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	  <p>Subsections below level 2 where not handled correct when generating html and pdf.</p>
+          <p>
+	    Own Id: OTP-90730</p>
+        </item>
+      </list>
+    </section>
+
+  </section>
+
+  <section><title>erl_docgen 0.2.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
@@ -56,9 +71,9 @@
       </list>
     </section>
 
-</section>
+  </section>
 
-<section><title>Erl_Docgen 0.2.2</title>
+  <section><title>erl_docgen 0.2.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
@@ -71,9 +86,9 @@
       </list>
     </section>
 
-</section>
+  </section>
 
-<section><title>erl_docgen 0.2.1</title>
+  <section><title>erl_docgen 0.2.1</title>
 
 	<section><title>Fixed Bugs and Malfunctions</title>
 	  <list>
diff --git a/lib/erl_docgen/priv/xsl/db_html.xsl b/lib/erl_docgen/priv/xsl/db_html.xsl
index 732560e303..c6375ea621 100644
--- a/lib/erl_docgen/priv/xsl/db_html.xsl
+++ b/lib/erl_docgen/priv/xsl/db_html.xsl
@@ -3,7 +3,7 @@
      #
      # %CopyrightBegin%
      #
-     # Copyright Ericsson AB 2009-2010. All Rights Reserved.
+     # Copyright Ericsson AB 2009-2011. All Rights Reserved.
      #
      # The contents of this file are subject to the Erlang Public License,
      # Version 1.1, (the "License"); you may not use this file except in
@@ -556,8 +556,8 @@
     </xsl:apply-templates>
   </xsl:template>
 
-  <!-- Chapter/Subsection -->
-  <xsl:template match="chapter/section/section">
+  <!-- Subsections lvl 3 and ... -->
+  <xsl:template match="section/section">
     <xsl:param name="chapnum"/>
     <xsl:param name="sectnum"/>
     <h4>
@@ -569,8 +569,6 @@
     </xsl:apply-templates>
   </xsl:template>
 
-
-
   <!-- *ref/Section -->
   <xsl:template match="erlref/section|cref/section|comref/section|fileref/section|appref/section">
     <xsl:param name="chapnum"/>
diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl
index 1e80c360b8..f500cd3fee 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl
@@ -3,7 +3,7 @@
      #
      # %CopyrightBegin%
      #
-     # Copyright Ericsson AB 2009-2010. All Rights Reserved.
+     # Copyright Ericsson AB 2009-2011. All Rights Reserved.
      #
      # The contents of this file are subject to the Erlang Public License,
      # Version 1.1, (the "License"); you may not use this file except in
@@ -827,7 +827,7 @@
 
   </xsl:template>
 
-  <!--  Chapter/Subsection -->
+  <!--  Chapter/Subsection  -->
   <xsl:template match="chapter/section/section">
     <xsl:param name="partnum"/>
     <xsl:param name="chapnum"/>
@@ -844,6 +844,22 @@
   </xsl:template>
 
 
+  <!--  Subsection below level 2 -->
+  <xsl:template match="section/section/section">
+    <xsl:param name="partnum"/>
+    <xsl:param name="chapnum"/>
+    <xsl:param name="sectnum"/>
+    <fo:block xsl:use-attribute-sets="h5" id="{generate-id(title)}">
+      <!-- xsl:value-of select="$partnum"/>.<xsl:value-of select="$chapnum"/>.<xsl:value-of select="$sectnum"/>.<xsl:number/ -->
+      <xsl:value-of select="title"/>
+    </fo:block>
+    <xsl:apply-templates>
+      <xsl:with-param name="partnum" select="$partnum"/>
+      <xsl:with-param name="chapnum" select="$chapnum"/>
+      <xsl:with-param name="sectnum" select="$sectnum"/>
+    </xsl:apply-templates>
+  </xsl:template>
+
 
   <!-- *ref/Section -->
   <xsl:template match="erlref/section|comref/section|cref/section|fileref/section|appref/section">
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index fb0f5ca0cd..29585d8520 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1 +1,2 @@
-ERL_DOCGEN_VSN = 0.2.3
+ERL_DOCGEN_VSN = 0.2.4
+
diff --git a/system/doc/top/src/erl_html_tools.erl b/system/doc/top/src/erl_html_tools.erl
index 599268804e..bb6a9a9f0a 100644
--- a/system/doc/top/src/erl_html_tools.erl
+++ b/system/doc/top/src/erl_html_tools.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2009-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -134,10 +134,10 @@ subst_file(Group, OutFile, Template, Info) ->
 		    file:write(Stream, Text),
 		    file:close(Stream);
 		Error ->
-		    error("Can't write to file ~s: ~w", [OutFile,Error])
+		    local_error("Can't write to file ~s: ~w", [OutFile,Error])
 	    end;
 	Error ->
-	    error("Can't write to file ~s: ~w", [OutFile,Error])
+	    local_error("Can't write to file ~s: ~w", [OutFile,Error])
     end.
 
 
@@ -156,7 +156,7 @@ find_templates([SearchPath | SearchPaths], AllSearchPaths) ->
 	    Result
     end;
 find_templates([], AllSearchPaths) ->
-    error("No templates found in ~p",[AllSearchPaths]).
+    local_error("No templates found in ~p",[AllSearchPaths]).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -269,7 +269,7 @@ find_application_infos([{App, Vsn, AppPath, IndexURL} | Paths]) ->
 				 string:substr(G0,N+1)}
 			end;
 		    false ->
-			error("No group given",[])
+			local_error("No group given",[])
 		end,
 	    Text =
 		case lists:keysearch("short", 1, Db) of
@@ -427,7 +427,7 @@ subst_applinks_1([{G, Heading}|Gs], Info0, Group) ->
     end;
 subst_applinks_1([], [], _) -> [];
 subst_applinks_1([], Info, _) ->
-    error("Info left: ~p\n", [Info]),
+    local_error("Info left: ~p\n", [Info]),
     [].
 
 html_applinks([{Name,[{_,_,URL,_}|_]}|AppNames]) ->
@@ -669,7 +669,7 @@ sub_repl([], _Fun, Acc, S, Pos) -> {string:substr(S, Pos+1), Acc}.
 % Error and warnings
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-error(Format, Args) ->
+local_error(Format, Args) ->
     io:format("ERROR: " ++ Format ++ "\n", Args),
     exit(1).
 
-- 
cgit v1.2.3