*** empty log message ***

[m17n/libotf.git] / example / otfdump.c

diff --git a/example/otfdump.c b/example/otfdump.c
index f788c55..d9d10dc 100644 (file)
--- a/example/otfdump.c
+++ b/example/otfdump.c
@@ -630,6 +630,9 @@ dump_chain_class_set_list (int indent, OTF_ChainClassSet *set, int count)
     }
 }
 
+
+
+
 \f
 /* GSUB */
 
@@ -697,15 +700,15 @@ dump_lookup_subtable_gsub (int indent, int index, unsigned type,
       if (subtable->Format == 1)
        {
          dump_coverage (indent, NULL, &subtable->Coverage);
-         dump_rule_set_list (indent, subtable->u.context1.SubRuleSet,
-                             subtable->u.context1.SubRuleSetCount); 
+         dump_rule_set_list (indent, subtable->u.context1.RuleSet,
+                             subtable->u.context1.RuleSetCount); 
        }
       else if (subtable->Format == 2)
        {
          dump_coverage (indent, NULL, &subtable->Coverage);
          dump_class_def (indent, NULL, &subtable->u.context2.ClassDef);
-         dump_class_set_list (indent, subtable->u.context2.SubClassSet,
-                              subtable->u.context2.SubClassSetCnt);
+         dump_class_set_list (indent, subtable->u.context2.ClassSet,
+                              subtable->u.context2.ClassSetCnt);
        }
       else if (subtable->Format == 3)
        {
@@ -714,7 +717,7 @@ dump_lookup_subtable_gsub (int indent, int index, unsigned type,
                              subtable->u.context3.GlyphCount);
          dump_lookup_record_list (indent,
                                   subtable->u.context3.LookupRecord,
-                                  subtable->u.context3.SubstCount);
+                                  subtable->u.context3.LookupCount);
        }
       else
        printf (" invalid");
@@ -726,22 +729,22 @@ dump_lookup_subtable_gsub (int indent, int index, unsigned type,
          dump_coverage (indent, NULL, &subtable->Coverage);
          dump_chain_rule_set_list
            (indent,
-            subtable->u.chain_context1.ChainSubRuleSet,
-            subtable->u.chain_context1.ChainSubRuleSetCount);
+            subtable->u.chain_context1.ChainRuleSet,
+            subtable->u.chain_context1.ChainRuleSetCount);
        }
       else if (subtable->Format == 2)
        {
          dump_coverage (indent, NULL, &subtable->Coverage);
          dump_class_def (indent, "BacktrackClassDef",
-                         &subtable->u.chain_context2.Backtrack);
+                         &subtable->u.chain_context2.BacktrackClassDef);
          dump_class_def (indent, "InputClassDef",
-                         &subtable->u.chain_context2.Input);
+                         &subtable->u.chain_context2.InputClassDef);
          dump_class_def (indent, "LookaheadClassDef",
-                         &subtable->u.chain_context2.LookAhead);
+                         &subtable->u.chain_context2.LookaheadClassDef);
          dump_chain_class_set_list
            (indent,
-            subtable->u.chain_context2.ChainSubClassSet,
-            subtable->u.chain_context2.ChainSubClassSetCnt);
+            subtable->u.chain_context2.ChainClassSet,
+            subtable->u.chain_context2.ChainClassSetCnt);
        }
       else if (subtable->Format == 3)
        {
@@ -760,7 +763,7 @@ dump_lookup_subtable_gsub (int indent, int index, unsigned type,
          dump_lookup_record_list
            (indent,
             subtable->u.chain_context3.LookupRecord,
-            subtable->u.chain_context3.SubstCount);
+            subtable->u.chain_context3.LookupCount);
        }
       else
        printf (" invalid");
@@ -911,15 +914,15 @@ dump_lookup_subtable_gpos (int indent, int index, unsigned type,
       if (subtable->Format == 1)
        {
          dump_coverage (indent, NULL, &subtable->Coverage);
-         dump_rule_set_list (indent, subtable->u.context1.PosRuleSet,
-                             subtable->u.context1.PosRuleSetCount); 
+         dump_rule_set_list (indent, subtable->u.context1.RuleSet,
+                             subtable->u.context1.RuleSetCount); 
        }
       else if (subtable->Format == 2)
        {
          dump_coverage (indent, NULL, &subtable->Coverage);
          dump_class_def (indent, NULL, &subtable->u.context2.ClassDef);
-         dump_class_set_list (indent, subtable->u.context2.PosClassSet,
-                              subtable->u.context2.PosClassSetCnt);
+         dump_class_set_list (indent, subtable->u.context2.ClassSet,
+                              subtable->u.context2.ClassSetCnt);
        }
       else if (subtable->Format == 3)
        {
@@ -928,7 +931,7 @@ dump_lookup_subtable_gpos (int indent, int index, unsigned type,
                              subtable->u.context3.GlyphCount);
          dump_lookup_record_list (indent,
                                   subtable->u.context3.LookupRecord,
-                                  subtable->u.context3.PosCount);
+                                  subtable->u.context3.LookupCount);
        }
       else
        printf (" invalid");
@@ -940,22 +943,22 @@ dump_lookup_subtable_gpos (int indent, int index, unsigned type,
          dump_coverage (indent, NULL, &subtable->Coverage);
          dump_chain_rule_set_list
            (indent,
-            subtable->u.chain_context1.ChainPosRuleSet,
-            subtable->u.chain_context1.ChainPosRuleSetCount);
+            subtable->u.chain_context1.ChainRuleSet,
+            subtable->u.chain_context1.ChainRuleSetCount);
        }
       else if (subtable->Format == 2)
        {
          dump_coverage (indent, NULL, &subtable->Coverage);
          dump_class_def (indent, "BacktrackClassDef",
-                         &subtable->u.chain_context2.Backtrack);
+                         &subtable->u.chain_context2.BacktrackClassDef);
          dump_class_def (indent, "InputClassDef",
-                         &subtable->u.chain_context2.Input);
+                         &subtable->u.chain_context2.InputClassDef);
          dump_class_def (indent, "LookaheadClassDef",
-                         &subtable->u.chain_context2.LookAhead);
+                         &subtable->u.chain_context2.LookaheadClassDef);
          dump_chain_class_set_list
            (indent,
-            subtable->u.chain_context2.ChainPosClassSet,
-            subtable->u.chain_context2.ChainPosClassSetCnt);
+            subtable->u.chain_context2.ChainClassSet,
+            subtable->u.chain_context2.ChainClassSetCnt);
        }
       else if (subtable->Format == 3)
        {
@@ -974,7 +977,7 @@ dump_lookup_subtable_gpos (int indent, int index, unsigned type,
          dump_lookup_record_list
            (indent,
             subtable->u.chain_context3.LookupRecord,
-            subtable->u.chain_context3.PosCount);
+            subtable->u.chain_context3.LookupCount);
        }
       else
        printf (" invalid");