[Checkins] SVN: z3c.rml/trunk/ Add encName to registerCidFonts.
Stephen Richter
cvs-admin at zope.org
Thu Dec 20 05:47:50 UTC 2012
Log message for revision 128800:
Add encName to registerCidFonts.
Changed:
U z3c.rml/trunk/CHANGES.txt
U z3c.rml/trunk/RML-DIFFERENCES.txt
U z3c.rml/trunk/src/z3c/rml/document.py
U z3c.rml/trunk/src/z3c/rml/tests/expected/tag-registerCidFont.pdf
U z3c.rml/trunk/src/z3c/rml/tests/input/tag-registerCidFont.rml
-=-
Modified: z3c.rml/trunk/CHANGES.txt
===================================================================
--- z3c.rml/trunk/CHANGES.txt 2012-12-20 05:17:26 UTC (rev 128799)
+++ z3c.rml/trunk/CHANGES.txt 2012-12-20 05:47:50 UTC (rev 128800)
@@ -42,6 +42,8 @@
* 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.
Modified: z3c.rml/trunk/RML-DIFFERENCES.txt
===================================================================
--- z3c.rml/trunk/RML-DIFFERENCES.txt 2012-12-20 05:17:26 UTC (rev 128799)
+++ z3c.rml/trunk/RML-DIFFERENCES.txt 2012-12-20 05:47:50 UTC (rev 128800)
@@ -113,8 +113,6 @@
- registerCidFont: +encName
-- registerFontFamily (pdfmetrics.registerFontFamily())
-
- setFontSize (plain canvas op)
- log
Modified: z3c.rml/trunk/src/z3c/rml/document.py
===================================================================
--- z3c.rml/trunk/src/z3c/rml/document.py 2012-12-20 05:17:26 UTC (rev 128799)
+++ z3c.rml/trunk/src/z3c/rml/document.py 2012-12-20 05:47:50 UTC (rev 128800)
@@ -143,12 +143,21 @@
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)
Modified: z3c.rml/trunk/src/z3c/rml/tests/expected/tag-registerCidFont.pdf
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/expected/tag-registerCidFont.pdf 2012-12-20 05:17:26 UTC (rev 128799)
+++ z3c.rml/trunk/src/z3c/rml/tests/expected/tag-registerCidFont.pdf 2012-12-20 05:47:50 UTC (rev 128800)
@@ -291,7 +291,7 @@
% 'R6': class PDFInfo
6 0 obj
<< /Author (\(anonymous\))
- /CreationDate (D:20121217140300+05'00')
+ /CreationDate (D:20121220004523+05'00')
/Creator (\(unspecified\))
/Keywords ()
/Producer (ReportLab PDF Library - www.reportlab.com)
@@ -310,9 +310,9 @@
% page stream
<< /Filter [ /ASCII85Decode
/FlateDecode ]
- /Length 185 >>
+ /Length 200 >>
stream
-Gar'"]*\U*$q:&Eq1i1SkaL,KDCoU7,6UE%:38a'7/t#@*5k/V!]QVh_Ot)fk%+TPNqK![!l';g1\^u4O5UrYIp!XN[:BS2YFYBaos+VJJ6.T$CA;FJaU"N==('Ojo!/2Wfeoi'AXS5uM^Ea\O]6Ns-e_Il1JM#-+VXAcIYTT1B?/SZi=0GA.M)~>endstream
+Gb!$=]a@(\$qBtXhr,MS[-":R]sFZ$M\$GnS*1%7,5V:k[>9J1!0Rmapi8>&Wl8hH7UTe0DAb"0$TNkHgL4UKh7_im<r/IDa,DWbckNm:[K*_NA+6X1pd8 at Y%i[$#&?0[27K)'jkFs[?o-,_S1t/R_jEa`cd$b/"dTEmB$5$'B=4jUBm9BV]b:*\XoFH9;mKqMU99K~>endstream
endobj
% 'R9': class PDFOutlines
9 0 obj
@@ -330,15 +330,15 @@
0000002770 00000 n
0000003039 00000 n
0000003144 00000 n
-0000003471 00000 n
+0000003486 00000 n
trailer
<< /ID
% ReportLab generated PDF document -- digest (http://www.reportlab.com)
- [(\2514PW\375b\346M\037u\307 \354\014_\254) (\2514PW\375b\346M\037u\307 \354\014_\254)]
+ [(\(H\034\005*\356\310m\004\220\254\206\030\343%\225) (\(H\034\005*\356\310m\004\220\254\206\030\343%\225)]
/Info 6 0 R
/Root 5 0 R
/Size 10 >>
startxref
-3522
+3537
%%EOF
Modified: z3c.rml/trunk/src/z3c/rml/tests/input/tag-registerCidFont.rml
===================================================================
--- z3c.rml/trunk/src/z3c/rml/tests/input/tag-registerCidFont.rml 2012-12-20 05:17:26 UTC (rev 128799)
+++ z3c.rml/trunk/src/z3c/rml/tests/input/tag-registerCidFont.rml 2012-12-20 05:47:50 UTC (rev 128800)
@@ -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>
More information about the checkins
mailing list