From 4b646ab9a12d60ad263e1a4b80d63b011fb6b581 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars@erlang.org>
Date: Mon, 14 Jan 2013 12:21:07 +0100
Subject: [erl_docgen] Fix pdf indentation bug for tagged lists

---
 lib/erl_docgen/priv/xsl/db_pdf.xsl | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/erl_docgen/priv/xsl/db_pdf.xsl b/lib/erl_docgen/priv/xsl/db_pdf.xsl
index 7de5af2a49..c846bdbf34 100644
--- a/lib/erl_docgen/priv/xsl/db_pdf.xsl
+++ b/lib/erl_docgen/priv/xsl/db_pdf.xsl
@@ -1102,11 +1102,13 @@
 
   <xsl:template match="taglist/item">
     <xsl:param name="partnum"/>
-    <fo:block xsl:use-attribute-sets="tagitem">
-      <xsl:apply-templates>
-        <xsl:with-param name="partnum" select="$partnum"/>
-      </xsl:apply-templates>
-    </fo:block>
+    <fo:block-container>
+      <fo:block xsl:use-attribute-sets="tagitem">
+	<xsl:apply-templates>
+	  <xsl:with-param name="partnum" select="$partnum"/>
+	</xsl:apply-templates>
+      </fo:block>
+    </fo:block-container>
   </xsl:template>
 
 
-- 
cgit v1.2.3


From 14e9c6fbdafc870016a3f586168d689859701274 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars@erlang.org>
Date: Mon, 14 Jan 2013 12:23:08 +0100
Subject: [erl_docgen] Fix dtd error for type_desc tag

---
 lib/erl_docgen/priv/dtd/common.refs.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/erl_docgen/priv/dtd/common.refs.dtd b/lib/erl_docgen/priv/dtd/common.refs.dtd
index c1237766e1..73a3501071 100644
--- a/lib/erl_docgen/priv/dtd/common.refs.dtd
+++ b/lib/erl_docgen/priv/dtd/common.refs.dtd
@@ -26,7 +26,7 @@
 
 <!ELEMENT description         (%block;|quote|br|marker|warning|note)* >
 <!ELEMENT funcs               (func)+ >
-<!ELEMENT func                (name+,type_desc+,fsummary,type?,desc?) >
+<!ELEMENT func                (name+,type_desc*,fsummary,type?,desc?) >
 <!-- ELEMENT name is defined in each ref dtd -->
 <!ELEMENT fsummary            (#PCDATA|c|em)* >
 <!ELEMENT type                (v,d?)+ >
-- 
cgit v1.2.3


From 29fcde84ea712308452a990b5baa2fd688f0c860 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars@erlang.org>
Date: Tue, 15 Jan 2013 12:06:28 +0100
Subject: [erl_docgen] Add xmllint target for the documentation and fix some
 DTD errors

---
 lib/erl_docgen/priv/dtd/common.refs.dtd | 5 ++++-
 lib/erl_docgen/priv/dtd/erlref.dtd      | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/erl_docgen/priv/dtd/common.refs.dtd b/lib/erl_docgen/priv/dtd/common.refs.dtd
index 73a3501071..93592607df 100644
--- a/lib/erl_docgen/priv/dtd/common.refs.dtd
+++ b/lib/erl_docgen/priv/dtd/common.refs.dtd
@@ -29,7 +29,9 @@
 <!ELEMENT func                (name+,type_desc*,fsummary,type?,desc?) >
 <!-- ELEMENT name is defined in each ref dtd -->
 <!ELEMENT fsummary            (#PCDATA|c|em)* >
-<!ELEMENT type                (v,d?)+ >
+<!ELEMENT type                (v,d?)* >
+<!ATTLIST type                 variable CDATA #IMPLIED
+                               name_i CDATA #IMPLIED>
 <!ELEMENT v                   (#PCDATA) >
 <!ELEMENT d                   (#PCDATA|c|em)* >
 <!ELEMENT desc                (%block;|quote|br|marker|warning|note|anno)* >
@@ -41,3 +43,4 @@
 <!ELEMENT datatypes           (datatype)+ >
 <!ELEMENT datatype            (name+,desc?) >
 <!ELEMENT type_desc           (#PCDATA) >
+<!ATTLIST type_desc            variable CDATA #REQUIRED>
diff --git a/lib/erl_docgen/priv/dtd/erlref.dtd b/lib/erl_docgen/priv/dtd/erlref.dtd
index 9905086ff4..0cc5cfa06d 100644
--- a/lib/erl_docgen/priv/dtd/erlref.dtd
+++ b/lib/erl_docgen/priv/dtd/erlref.dtd
@@ -29,3 +29,6 @@
 <!-- `name' is used in common.refs.dtd and must therefore 
       be defined in each *ref. dtd -->
 <!ELEMENT name                (#PCDATA) >
+<!ATTLIST name                 name CDATA #IMPLIED
+                               arity CDATA #IMPLIED
+	                       clause_i CDATA #IMPLIED>
-- 
cgit v1.2.3


From 0126d85216b4d99d2f0679c9524bc09b971d06a7 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars@erlang.org>
Date: Fri, 18 Jan 2013 12:57:22 +0100
Subject: [erl_docgen] Update vsn.mk

---
 lib/erl_docgen/vsn.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index 2599dc0ff7..a2262198dc 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1,2 +1 @@
-ERL_DOCGEN_VSN = 0.3.3
-
+ERL_DOCGEN_VSN = 0.3.4
-- 
cgit v1.2.3