Add encName to registerCidFonts.

zopefoundation · Dec 20, 2012 · 3fed4f5 · 3fed4f5
1 parent acc21c0
commit 3fed4f5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -42,6 +42,8 @@ CHANGES
     * docPara
     * docWhile
 
+- Added ``encName`` attribute to ``registerCidFont`` directive.
+
 - Don't show "doc" namespace in reference snippets.
 
 - Create a list of RML2PDF and z3c.rml differences.

diff --git a/RML-DIFFERENCES.txt b/RML-DIFFERENCES.txt
@@ -113,8 +113,6 @@ naming.
 
 - registerCidFont: +encName
 
-- registerFontFamily (pdfmetrics.registerFontFamily())
-
 - setFontSize (plain canvas op)
 
 - log

diff --git a/src/z3c/rml/document.py b/src/z3c/rml/document.py
@@ -143,12 +143,21 @@ class IRegisterCidFont(interfaces.IRMLDirectiveSignature):
                      u'be previously registered.'),
         required=True)
 
+    encName = attr.String(
+        title=u'Encoding Name',
+        description=(u'The name of the encoding to use for the font.'),
+        required=False)
+
 class RegisterCidFont(directive.RMLDirective):
     signature = IRegisterCidFont
+    attrMapping = {'faceName': 'face', 'encName': 'encoding'}
 
     def process(self):
-        args = self.getAttributeValues(valuesOnly=True)
-        font = cidfonts.UnicodeCIDFont(*args)
+        args = dict(self.getAttributeValues(attrMapping=self.attrMapping))
+        if 'encoding' in args:
+            font = cidfonts.CIDFont(**args)
+        else:
+            font = cidfonts.UnicodeCIDFont(**args)
         pdfmetrics.registerFont(font)
 
 

diff --git a/src/z3c/rml/tests/expected/tag-registerCidFont.pdf b/src/z3c/rml/tests/expected/tag-registerCidFont.pdf
diff --git a/src/z3c/rml/tests/input/tag-registerCidFont.rml b/src/z3c/rml/tests/input/tag-registerCidFont.rml
@@ -6,6 +6,8 @@
     xmlns:doc="http://namespaces.zope.org/rml/doc">
   <docinit>
     <registerCidFont faceName="HeiseiMin-W3" doc:example="" />
+    <registerCidFont faceName="HeiseiMin-W3" encName="90ms-RKSJ-H"
+                     doc:example="" />
   </docinit>
   <template>
     <pageTemplate id="main">
@@ -16,5 +18,8 @@
     <para fontName="HeiseiMin-W3" fontSize="40">
       日本語は難しいですね！
     </para>
+    <para spaceBefore="3cm" fontName="HeiseiMin-W3" fontSize="40">
+      日本語は難しいですね！
+    </para>
   </story>
 </document>