[fondue-commits] [SCM] Fondue Font Editor branch, master, updated. 1038b6ec27b5837490d72b369a4396d157922291

[Eugeniy Meshcheryakov]

The following commit has been merged in the master branch:
commit 1038b6ec27b5837490d72b369a4396d157922291
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Wed Apr 2 16:02:14 2008 +0200

    make args to IUP operation compatible to FontForge

diff --git a/data/instructions.xml b/data/instructions.xml
index de5e1b7..4cd9040 100644
--- a/data/instructions.xml
+++ b/data/instructions.xml
@@ -17,10 +17,10 @@
 -->
 <!-- WARNING: content must be sorted! -->
 <instructions>
-    <instruction name="SVTCA" value="0" argbits="1" argtype="IUP"/>
-    <instruction name="SPVTCA" value="2" artgbits="1" argtype="IUP"/>
+    <instruction name="SVTCA" value="0" argbits="1" argtype="SVTCA"/>
+    <instruction name="SPVTCA" value="2" artgbits="1" argtype="SVTCA"/>
     <hole size="1" offset="3"/>
-    <instruction name="SFVTCA" value="4" argbits="1" argtype="IUP"/>
+    <instruction name="SFVTCA" value="4" argbits="1" argtype="SVTCA"/>
     <instruction name="SPVTL" value="6" argbits="1" argtype="SDPVTL"/>
     <instruction name="SFVTL" value="8" argbits="1" argtype="SDPVTL"/>
     <instruction name="SPVFS" value="10"/>
diff --git a/nongui/ttfdecode.cxx b/nongui/ttfdecode.cxx
index 172eed9..fd648ff 100644
--- a/nongui/ttfdecode.cxx
+++ b/nongui/ttfdecode.cxx
@@ -192,11 +192,16 @@ QByteArray TTInstructionsDecoder::decodeGC(quint8 op, quint8 base, const char *i
 	return decodeOneParam(op, base, inst, "orig", "cur");
 }
 
-QByteArray TTInstructionsDecoder::decodeIUP(quint8 op, quint8 base, const char *inst)
+QByteArray TTInstructionsDecoder::decodeSVTCA(quint8 op, quint8 base, const char *inst)
 {
 	return decodeOneParam(op, base, inst, "x-axis", "y-axis");
 }
 
+QByteArray TTInstructionsDecoder::decodeIUP(quint8 op, quint8 base, const char *inst)
+{
+	return decodeOneParam(op, base, inst, "x", "y");
+}
+
 QByteArray TTInstructionsDecoder::decodeMD(quint8 op, quint8 base, const char *inst)
 {
 	return decodeOneParam(op, base, inst, "grid", "orig");
diff --git a/nongui/ttfdecode.h b/nongui/ttfdecode.h
index aa58ceb..129e9c8 100644
--- a/nongui/ttfdecode.h
+++ b/nongui/ttfdecode.h
@@ -38,6 +38,7 @@ private:
 	DecoderFunc decodePUSHW;
 	DecoderFunc decodeNoParams;
 	DecoderFunc decodeGC;
+	DecoderFunc decodeSVTCA;
 	DecoderFunc decodeIUP;
 	DecoderFunc decodeMD;
 	DecoderFunc decodeMDAP;
diff --git a/nongui/ttfencode.cxx b/nongui/ttfencode.cxx
index 7302609..8d207aa 100644
--- a/nongui/ttfencode.cxx
+++ b/nongui/ttfencode.cxx
@@ -140,11 +140,16 @@ bool TTInstructionsEncoder::encodeOneParam(quint8 base, const char *iftrue, cons
 	return putChar(base + diff);
 }
 
-bool TTInstructionsEncoder::encodeIUP(quint8 base)
+bool TTInstructionsEncoder::encodeSVTCA(quint8 base)
 {
 	return encodeOneParam(base, "x-axis", "y-axis");
 }
 
+bool TTInstructionsEncoder::encodeIUP(quint8 base)
+{
+	return encodeOneParam(base, "x", "y");
+}
+
 bool TTInstructionsEncoder::encodeSDPVTL(quint8 base)
 {
 	return encodeOneParam(base, "orthog", "parallel");
diff --git a/nongui/ttfencode.h b/nongui/ttfencode.h
index 59e61db..a016995 100644
--- a/nongui/ttfencode.h
+++ b/nongui/ttfencode.h
@@ -42,6 +42,7 @@ private:
 	typedef bool (EncoderFunc)(quint8 base);
 
 	EncoderFunc encodeNoParams;
+	EncoderFunc encodeSVTCA;
 	EncoderFunc encodeIUP;
 	EncoderFunc encodeSDPVTL;
 	EncoderFunc encodeMDAP;

-- 
Fondue Font Editor