mathtype 0.0.8 → 0.1.0

data/lib/{records → records5}/char.rb

@@ -14,7 +14,7 @@
 
 require_relative "snapshot"
 
-module Mathtype
+module Mathtype5
   class RecordEmbell < BinData::Record; end
   class RecordChar < BinData::Record
     include Snapshot
@@ -24,11 +24,11 @@ module Mathtype
     endian :little
     int8 :options
 
-    nudge :nudge, onlyif: lambda { options & OPTIONS["mtefOPT_NUDGE"] > 0 }
+    record_nudge :nudge, onlyif: lambda { options & OPTIONS["mtefOPT_NUDGE"] > 0 }
 
     int8 :_typeface
 
-    int16 :_mt_code_value, onlyif: (lambda do
+    mtef16 :_mt_code_value, onlyif: (lambda do
       options & OPTIONS["mtefOPT_CHAR_ENC_NO_MTCODE"] == 0
     end)
 
@@ -47,7 +47,7 @@ module Mathtype
       char_enc_char_8 = options & OPTIONS["mtefOPT_CHAR_ENC_CHAR_8"] > 0
       char_enc_char_16 = options & OPTIONS["mtefOPT_CHAR_ENC_CHAR_16"] > 0
 
-      return true if char_enc_char_8 || char_enc_char_16
+      char_enc_char_8 || char_enc_char_16
     end
 
     choice :font_position,
@@ -55,7 +55,7 @@ module Mathtype
         onlyif: font_position_present do
 
       uint8 8
-      uint16 16
+      mtef16 16
     end
 
     array :embellishment_list,
@@ -65,13 +65,7 @@ module Mathtype
     end
 
     def mt_code_value
-      mt_code = if _mt_code_value < 0
-        65536 + _mt_code_value # Two's complement
-      else
-        _mt_code_value
-      end
-
-      sprintf("0x%04X", mt_code)
+      sprintf("0x%04X", _mt_code_value)
     end
 
     def typeface

data/lib/{records → records5}/color.rb

@@ -6,7 +6,7 @@
 # equation records (until the next COLOR record) have the color defined by the
 # indicated COLOR_DEF record.
 
-module Mathtype
+module Mathtype5
   class RecordColor < BinData::Record
     int8 :color_def_index
   end

data/lib/{records → records5}/color_def.rb

@@ -11,23 +11,23 @@
 # absence of the color and 1000 is a fully saturated color. So, an RGB color
 # definition for black has all three components at 0.
 
-module Mathtype
+module Mathtype5
   class RecordColorDef < BinData::Record
     endian :little
 
     int8 :options
 
     struct :rgb, onlyif: lambda { options & OPTIONS["mtefCOLOR_CMYK"] == 0 } do
-      int16 :r
-      int16 :g
-      int16 :b
+      mtef16 :r
+      mtef16 :g
+      mtef16 :b
     end
 
     struct :cmyk, onlyif: lambda { options & OPTIONS["mtefCOLOR_CMYK"] > 0} do
-      int16 :c
-      int16 :m
-      int16 :y
-      int16 :k
+      mtef16 :c
+      mtef16 :m
+      mtef16 :y
+      mtef16 :k
     end
 
     stringz :color_name, onlyif: (lambda do

data/lib/{records → records5}/embell.rb

@@ -46,7 +46,7 @@ require_relative "snapshot"
 # 36  embU_R1ARROW  under right arrow (1 barb)
 # 37  embU_L1ARROW  under left arrow (1 barb)
 
-module Mathtype
+module Mathtype5
   class RecordEmbell < BinData::Record
     include Snapshot
     EXPOSED_IN_SNAPSHOT = %i(options nudge embell)
@@ -92,7 +92,7 @@ module Mathtype
 
     int8 :options
 
-    nudge :nudge, onlyif: lambda { options & OPTIONS["mtefOPT_NUDGE"] > 0 }
+    record_nudge :nudge, onlyif: lambda { options & OPTIONS["mtefOPT_NUDGE"] > 0 }
 
     int8 :_embell
 

data/lib/{records → records5}/encoding_def.rb

@@ -15,7 +15,7 @@
 # to have an index of 5. See Extending MathType's Font and Character Information
 # and MathType's Character Encodings for more information on font encodings.
 
-module Mathtype
+module Mathtype5
   class RecordEncodingDef < BinData::Record
     stringz :name
   end

data/lib/{records → records5}/eqn_prefs.rb

@@ -13,13 +13,12 @@
 # If the array is longer than expected, the extra values must be skipped to stay
 # in sync with the MTEF stream.
 
-module Mathtype
+module Mathtype5
   class Entry < BinData::Record
     bit4 :unit
     array :nibbles, read_until: lambda { element == 0xF } do
       bit4
     end
-    resume_byte_alignment
   end
 
   class RecordEqnPrefs < BinData::Record
@@ -40,5 +39,6 @@ module Mathtype
       int8 :font_def
       int8 :font_style, onlyif: lambda { font_def != 0x00 }
     end
+    resume_byte_alignment
   end
 end

data/lib/{records → records5}/font_def.rb

@@ -6,7 +6,7 @@
 # This record associates an font encoding with a font name. See Definition
 # records.
 
-module Mathtype
+module Mathtype5
   class RecordFontDef < BinData::Record
     uint8 :enc_def_index
     stringz :font_name

data/lib/{records → records5}/font_style_def.rb

@@ -5,7 +5,7 @@
 # [char_style] character style bits
 # This record associates a character style with a font. See Definition records.
 
-module Mathtype
+module Mathtype5
   class RecordFontStyleDef < BinData::Record
     uint8 :font_def_index
 

data/lib/{records → records5}/future.rb

@@ -6,7 +6,7 @@
 # might be handy if all records had such a length value, it will only be present
 # on future expansion records (i.e. those with record types >= 100).
 
-module Mathtype
+module Mathtype5
   class RecordFuture < BinData::Record
     uint8 :skip
     skip length: :skip

data/lib/{records → records5}/line.rb

@@ -9,15 +9,15 @@
 # The line spacing value, if present, is the distance between the baseline of
 # this line and the line above it.
 
-module Mathtype
+module Mathtype5
   class NamedRecord < BinData::Record; end
   class RecordLine < BinData::Record
     endian :little
     int8 :options
 
-    nudge :nudge, onlyif: lambda { options & OPTIONS["mtefOPT_NUDGE"] > 0 }
+    record_nudge :nudge, onlyif: lambda { options & OPTIONS["mtefOPT_NUDGE"] > 0 }
 
-    int16 :line_spacing, onlyif: (lambda do
+    mtef16 :line_spacing, onlyif: (lambda do
       options & OPTIONS["mtefOPT_LINE_LSPACE"] > 0
     end)
 

data/lib/{records → records5}/matrix.rb

@@ -21,14 +21,14 @@ require_relative "snapshot"
 # (0 for none, 1 for solid, 2 for dashed, or 3 for dotted). Similarly for the
 # column partition lines.
 
-module Mathtype
+module Mathtype5
   class RecordMatrix < BinData::Record
     include Snapshot
     EXPOSED_IN_SNAPSHOT = %i(options nudge valign h_just v_just rows cols
       row_parts col_parts object_list)
     int8 :options
 
-    nudge :nudge, onlyif: lambda { options & OPTIONS["mtefOPT_NUDGE"] > 0 }
+    record_nudge :nudge, onlyif: lambda { options & OPTIONS["mtefOPT_NUDGE"] > 0 }
 
     int8 :_valign
     int8 :_h_just
@@ -36,10 +36,14 @@ module Mathtype
     int8 :rows
     int8 :cols
 
+    bit :_realign_rows, nbits: lambda { realign(rows) }
+
     array :row_parts, initial_length: lambda { rows + 1 } do
       bit nbits: 2
     end
 
+    bit :_realign_cols, nbits: lambda { realign(cols) }
+
     array :col_parts, initial_length: lambda { cols + 1 } do
       bit nbits: 2
     end
@@ -53,11 +57,15 @@ module Mathtype
     end
 
     def h_just
-      HALIGN[_h_just + 1]
+      HALIGN[_h_just]
     end
 
     def v_just
       VALIGN[_v_just]
     end
+    def realign (nparts)
+      offset = (((nparts +  1) * 2) % 8)
+      return offset == 0 ? 0 : (8 - offset)
+    end
   end
 end

data/lib/records5/mtef.rb

@@ -0,0 +1,129 @@
+require_relative "line"
+require_relative "embell"
+require_relative "char"
+require_relative "pile"
+require_relative "tmpl"
+require_relative "eqn_prefs"
+require_relative "font_def"
+require_relative "font_style_def"
+require_relative "matrix"
+require_relative "encoding_def"
+require_relative "embell"
+require_relative "size"
+require_relative "color"
+require_relative "color_def"
+require_relative "future"
+
+module Mathtype5
+  class RecordEnd < Mathtype::RecordEnd; end
+  class RecordNudge < Mathtype::RecordNudge; end
+  class RecordRuler < Mathtype::RecordRuler; end
+  class RecordNudge < Mathtype::RecordNudge; end
+  class RecordFull < Mathtype::RecordFull; end
+  class RecordSub < Mathtype::RecordSub; end
+  class RecordSub2 < Mathtype::RecordSub2; end
+  class RecordSym < Mathtype::RecordSym; end
+  class RecordSubsym < Mathtype::RecordSubsym; end
+
+  HALIGN = Mathtype::HALIGN
+  VALIGN = Mathtype::VALIGN
+
+  RECORD_NAMES = {
+    0 => "end",
+    1 => "slot",
+    2 => "char",
+    3 => "tmpl",
+    4 => "pile",
+    5 => "matrix",
+    6 => "embell",
+    7 => "ruler",
+    8 => "font_style_def",
+    9 => "size",
+    10 => "full",
+    11 => "sub",
+    12 => "sub2",
+    13 => "sym",
+    14 => "subsym",
+    15 => "color",
+    16 => "color_def",
+    17 => "font_def",
+    18 => "eqn_prefs",
+    19 => "encoding_def",
+    100 => "future"
+  }
+
+  OPTIONS = {
+    # value => symbol                     # description
+    # Option flag values for all equation structure records:
+    "mtefOPT_NUDGE" => 0x08,              # nudge values follow tag
+    # Option flag values for CHAR records:
+    "mtefOPT_CHAR_EMBELL" => 0x01,        # character is followed by an embellishment list
+    "mtefOPT_CHAR_FUNC_START" => 0x02,    # character starts a function (sin, cos, etc.)
+    "mtefOPT_CHAR_ENC_CHAR_8" => 0x04,    # character is written with an 8-bit encoded value
+    "mtefOPT_CHAR_ENC_CHAR_16" => 0x10,   # character is written with an 16-bit encoded value
+    "mtefOPT_CHAR_ENC_NO_MTCODE" => 0x20, # character is written without an 16-bit MTCode value
+    # Option flag values for LINE records:
+    "mtefOPT_LINE_NULL" => 0x01,          # line is a placeholder only (i.e. not displayed)
+    "mtefOPT_LINE_LSPACE" => 0x04,        # line spacing value follows tag
+    # Option flag values for LINE and PILE records:
+    "mtefOPT_LP_RULER" => 0x02,           # RULER record follows LINE or PILE record
+    # Option flag values for COLOR_DEF records:
+    "mtefCOLOR_CMYK" => 0x01,             # color model is CMYK, else RGB
+    "mtefCOLOR_SPOT" => 0x02,             # color is a spot color, else a process color
+    "mtefCOLOR_NAME" => 0x04,             # color has a name, else no name
+  }
+
+  ## Payload is the most important class to understand.
+  ## This abstraction allows recursive formats.
+  ## eg. lists can contain lists can contain lists.
+
+  class Payload < BinData::Choice
+    opt = {:_options => :options}
+    record_end 0 # end is a reserved keyword
+    record_line 1
+    record_char 2
+    record_tmpl 3
+    record_pile 4
+    record_matrix 5
+    record_embell 6
+    record_ruler 7
+    record_font_style_def 8
+    record_size 9
+    record_full 10
+    record_sub 11
+    record_sub2 12
+    record_sym 13
+    record_subsym 14
+    record_color 15
+    record_color_def 16
+    record_font_def 17
+    record_eqn_prefs 18
+    record_encoding_def 19
+    record_future 100
+  end
+
+  class NamedRecord < BinData::Record
+    int8 :record_type
+    payload :payload, :onlyif => :not_end_tag?, :selection => :record_type, :options => :record_options
+
+    def not_end_tag?
+      record_type != 0
+    end
+  end
+
+  class Equation < Mathtype::Equation
+    EXPOSED_IN_SNAPSHOT = %i(mtef_version platform product product_version
+      product_subversion application_key equation_options equation)
+
+    stringz :application_key
+    uint8 :_equation_options
+
+    def equation_options
+      _equation_options == 1 ? "inline" : "block"
+    end
+
+    array :equation, read_until: lambda { element.record_type == 0 } do
+      named_record
+    end
+  end
+end

data/lib/{records → records5}/pile.rb

@@ -12,14 +12,14 @@ require_relative "snapshot"
 # [[RULER record]] if mtefOPT_LP_RULER is set
 # [object list] list of lines contained by the pile
 
-module Mathtype
+module Mathtype5
   class RecordPile < BinData::Record
     include Snapshot
     EXPOSED_IN_SNAPSHOT = %i(options halign valign object_list)
 
     int8 :options
 
-    nudge :nudge, onlyif: lambda { options & OPTIONS["mtefOPT_NUDGE"] > 0 }
+    record_nudge :nudge, onlyif: lambda { options & OPTIONS["mtefOPT_NUDGE"] > 0 }
 
     int8 :_halign
     int8 :_valign

data/lib/{records → records5}/size.rb

@@ -23,7 +23,7 @@ require_relative "snapshot"
 # Simple typesizes, without a delta value, are written using the records
 # described in the next section.
 
-module Mathtype
+module Mathtype5
   class RecordSize < BinData::Record
     include Snapshot
     EXPOSED_IN_SNAPSHOT = %i(lsize dsize point_size)
@@ -31,25 +31,27 @@ module Mathtype
     endian :little
     int8 :_size_select
 
-    uint16 :_point_size, onlyif: lambda { _size_select == 101 }
+    mtef16 :_point_size, onlyif: lambda { _size_select == 101 }
     uint8 :_lsize_large_delta, onlyif: lambda { _size_select == 100 }
 
     uint8 :_dsize, onlyif: lambda { _size_select != 100 && _size_select != 101 }
-    uint16 :_dsize_large, onlyif: lambda { _size_select == 100 }
+    mtef16 :_dsize_large, onlyif: lambda { _size_select == 100 }
 
     def dsize
+      __dsize = nil
       case _size_select
       when 100
         if _dsize_large > 255
-          (_dsize_large - (256 << 8)) / 32
+         __dsize = -(_dsize_large.getlow)
         else
-          _dsize_large / 32
+         __dsize = _dsize_large
         end
       when 101
-        nil
+        __dsize = nil
       else
-        (_dsize - 128) / 32 # in 32nds of a point
+        __dsize = (_dsize - 128) # in 32nds of a point
       end
+      __dsize / 32
     end
 
     def lsize

data/lib/records5/snapshot.rb

@@ -0,0 +1,19 @@
+require "bindata"
+
+module Mathtype5
+  module Snapshot
+    def snapshot
+      snapshot = BinData::Record::Snapshot.new
+      exposed = self.class.const_get(:EXPOSED_IN_SNAPSHOT)
+      exposed.each do |name|
+        obj = find_obj_for_name(name)
+        if obj
+          snapshot[name] = obj.snapshot if include_obj?(obj)
+        else
+          snapshot[name] = self.send(name)
+        end
+      end
+      snapshot
+    end
+  end
+end