Index: APPS/common/Document/impl/DocBase/DocumentNaarDocBaseDocumentConverter/TagBasedDocument.cls.xml
===================================================================
diff -u -r29059 -r29830
--- APPS/common/Document/impl/DocBase/DocumentNaarDocBaseDocumentConverter/TagBasedDocument.cls.xml	(.../TagBasedDocument.cls.xml)	(revision 29059)
+++ APPS/common/Document/impl/DocBase/DocumentNaarDocBaseDocumentConverter/TagBasedDocument.cls.xml	(.../TagBasedDocument.cls.xml)	(revision 29830)
@@ -72,15 +72,18 @@
 	#dim TagBasedTekst As %String = TagBasedDocumentInhoud.GeefTagBasedTekst().GeefTekst()
 	Set Body=##class(APPS.common.Document.TagBasedDocument.dto.OpgemaakteTekstVeld).%New()
 	Set Body.TagBasedTekst=##class(BL.FOP.Basis.pxTekstHTML).Create("TEKST",TagBasedTekst,"",0,1)
-	Set Body.Layout=..GeefOpgemaakteTekstLayout()
+	Set Body.Layout=..GeefOpgemaakteTekstLayout(TagBasedDocumentInhoud)
 	Quit Body
 ]]></Implementation>
 </Method>
 
 <Method name="GeefOpgemaakteTekstLayout">
+<FormalSpec>TagBasedDocumentInhoud:APPS.common.Document.TagBasedDocumentInhoud</FormalSpec>
 <Private>1</Private>
 <ReturnType>APPS.common.Document.TagBasedDocument.dto.OpgemaakteTekstLayout</ReturnType>
-<Implementation><![CDATA[	Quit ##class(APPS.common.Document.TagBasedDocument.dto.OpgemaakteTekstLayout).%New("24pt",##class(APPS.common.Document.TagBasedDocument.enu.DocBaseFontFamily).VeraSansMono())
+<Implementation><![CDATA[
+	#dim Font As %List = TagBasedDocumentInhoud.GeefFont()
+	Quit ##class(APPS.common.Document.TagBasedDocument.dto.OpgemaakteTekstLayout).%New($LG(Font,1),$LG(Font,2))
 ]]></Implementation>
 </Method>
 </Class>
Index: APPS/common/Document/impl/TagBasedDocumentInhoud.cls.xml
===================================================================
diff -u -r29059 -r29830
--- APPS/common/Document/impl/TagBasedDocumentInhoud.cls.xml	(.../TagBasedDocumentInhoud.cls.xml)	(revision 29059)
+++ APPS/common/Document/impl/TagBasedDocumentInhoud.cls.xml	(.../TagBasedDocumentInhoud.cls.xml)	(revision 29830)
@@ -8,6 +8,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Font">
+<Type>%List</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>Tekst:APPS.common.Document.impl.TagBasedTekst=##class(APPS.common.Document.impl.TagBasedTekst).%New()</FormalSpec>
 <Private>1</Private>
@@ -16,6 +21,7 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..Tekst = Tekst
+	Set ..Font = $ListBuild("24pt",##class(APPS.common.Document.TagBasedDocument.enu.DocBaseFontFamily).VeraSansMono())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -25,6 +31,18 @@
 <Implementation><![CDATA[	quit ..Tekst
 ]]></Implementation>
 </Method>
+
+<Method name="GeefFont">
+<ReturnType>%List</ReturnType>
+<Implementation><![CDATA[	Quit ..Font
+]]></Implementation>
+</Method>
+
+<Method name="ZetFont">
+<FormalSpec>Font:%List</FormalSpec>
+<Implementation><![CDATA[	Set ..Font = Font
+]]></Implementation>
+</Method>
 </Class>