summaryrefslogtreecommitdiff
path: root/src/bytecode
diff options
context:
space:
mode:
Diffstat (limited to 'src/bytecode')
-rw-r--r--src/bytecode/bytecode.h169
-rw-r--r--src/bytecode/opcodes.h8
2 files changed, 93 insertions, 84 deletions
diff --git a/src/bytecode/bytecode.h b/src/bytecode/bytecode.h
index e773613..a0810e2 100644
--- a/src/bytecode/bytecode.h
+++ b/src/bytecode/bytecode.h
@@ -22,82 +22,99 @@ typedef enum opcode {
OP_BACKGROUND_REPEAT = 0x005,
OP_BORDER_COLLAPSE = 0x006,
OP_BORDER_SPACING = 0x007,
- OP_BORDER_TRBL_COLOR = 0x008,
- OP_BORDER_TRBL_STYLE = 0x009,
- OP_BORDER_TRBL_WIDTH = 0x00a,
- OP_BOTTOM = 0x00b,
- OP_CAPTION_SIDE = 0x00c,
- OP_CLEAR = 0x00d,
- OP_CLIP = 0x00e,
- OP_COLOR = 0x00f,
- OP_CONTENT = 0x010,
- OP_COUNTER_INCREMENT = 0x011,
- OP_COUNTER_RESET = 0x012,
- OP_CUE_AFTER = 0x013,
- OP_CUE_BEFORE = 0x014,
- OP_CURSOR = 0x015,
- OP_DIRECTION = 0x016,
- OP_DISPLAY = 0x017,
- OP_ELEVATION = 0x018,
- OP_EMPTY_CELLS = 0x019,
- OP_FLOAT = 0x01a,
- OP_FONT_FAMILY = 0x01b,
- OP_FONT_SIZE = 0x01c,
- OP_FONT_STYLE = 0x01d,
- OP_FONT_VARIANT = 0x01e,
- OP_FONT_WEIGHT = 0x01f,
- OP_HEIGHT = 0x020,
- OP_LEFT = 0x021,
- OP_LETTER_SPACING = 0x022,
- OP_LINE_HEIGHT = 0x023,
- OP_LIST_STYLE_IMAGE = 0x024,
- OP_LIST_STYLE_POSITION = 0x025,
- OP_LIST_STYLE_TYPE = 0x026,
- OP_MARGIN_TRBL = 0x027,
- OP_MAX_HEIGHT = 0x028,
- OP_MAX_WIDTH = 0x029,
- OP_MIN_HEIGHT = 0x02a,
- OP_MIN_WIDTH = 0x02b,
- OP_ORPHANS = 0x02c,
- OP_OUTLINE_COLOR = 0x02d,
- OP_OUTLINE_STYLE = 0x02e,
- OP_OUTLINE_WIDTH = 0x02f,
- OP_OVERFLOW = 0x030,
- OP_PADDING_TRBL = 0x031,
- OP_PAGE_BREAK_AFTER = 0x032,
- OP_PAGE_BREAK_BEFORE = 0x033,
- OP_PAGE_BREAK_INSIDE = 0x034,
- OP_PAUSE_AFTER = 0x035,
- OP_PAUSE_BEFORE = 0x036,
- OP_PITCH_RANGE = 0x037,
- OP_PITCH = 0x038,
- OP_PLAY_DURING = 0x039,
- OP_POSITION = 0x03a,
- OP_QUOTES = 0x03b,
- OP_RICHNESS = 0x03c,
- OP_RIGHT = 0x03d,
- OP_SPEAK_HEADER = 0x03e,
- OP_SPEAK_NUMERAL = 0x03f,
- OP_SPEAK_PUNCTUATION = 0x040,
- OP_SPEAK = 0x041,
- OP_SPEECH_RATE = 0x042,
- OP_STRESS = 0x043,
- OP_TABLE_LAYOUT = 0x044,
- OP_TEXT_ALIGN = 0x045,
- OP_TEXT_DECORATION = 0x046,
- OP_TEXT_INDENT = 0x047,
- OP_TEXT_TRANSFORM = 0x048,
- OP_TOP = 0x049,
- OP_UNICODE_BIDI = 0x04a,
- OP_VERTICAL_ALIGN = 0x04b,
- OP_VISIBILITY = 0x04c,
- OP_VOICE_FAMILY = 0x04d,
- OP_VOLUME = 0x04e,
- OP_WHITE_SPACE = 0x04f,
- OP_WIDOWS = 0x050,
- OP_WIDTH = 0x051,
- OP_WORD_SPACING = 0x052,
- OP_Z_INDEX = 0x053,
+ OP_BORDER_TOP_COLOR = 0x008,
+ OP_BORDER_RIGHT_COLOR = 0x009,
+ OP_BORDER_BOTTOM_COLOR = 0x00a,
+ OP_BORDER_LEFT_COLOR = 0x00b,
+ OP_BORDER_TOP_STYLE = 0x00c,
+ OP_BORDER_RIGHT_STYLE = 0x00d,
+ OP_BORDER_BOTTOM_STYLE = 0x00e,
+ OP_BORDER_LEFT_STYLE = 0x00f,
+ OP_BORDER_TOP_WIDTH = 0x010,
+ OP_BORDER_RIGHT_WIDTH = 0x011,
+ OP_BORDER_BOTTOM_WIDTH = 0x012,
+ OP_BORDER_LEFT_WIDTH = 0x013,
+ OP_BOTTOM = 0x014,
+ OP_CAPTION_SIDE = 0x015,
+ OP_CLEAR = 0x016,
+ OP_CLIP = 0x017,
+ OP_COLOR = 0x018,
+ OP_CONTENT = 0x019,
+ OP_COUNTER_INCREMENT = 0x01a,
+ OP_COUNTER_RESET = 0x01b,
+ OP_CUE_AFTER = 0x01c,
+ OP_CUE_BEFORE = 0x01d,
+ OP_CURSOR = 0x01e,
+ OP_DIRECTION = 0x01f,
+ OP_DISPLAY = 0x020,
+ OP_ELEVATION = 0x021,
+ OP_EMPTY_CELLS = 0x022,
+ OP_FLOAT = 0x023,
+ OP_FONT_FAMILY = 0x024,
+ OP_FONT_SIZE = 0x025,
+ OP_FONT_STYLE = 0x026,
+ OP_FONT_VARIANT = 0x027,
+ OP_FONT_WEIGHT = 0x028,
+ OP_HEIGHT = 0x029,
+ OP_LEFT = 0x02a,
+ OP_LETTER_SPACING = 0x02b,
+ OP_LINE_HEIGHT = 0x02c,
+ OP_LIST_STYLE_IMAGE = 0x02d,
+ OP_LIST_STYLE_POSITION = 0x02e,
+ OP_LIST_STYLE_TYPE = 0x02f,
+ OP_MARGIN_TOP = 0x030,
+ OP_MARGIN_RIGHT = 0x031,
+ OP_MARGIN_BOTTOM = 0x032,
+ OP_MARGIN_LEFT = 0x033,
+ OP_MAX_HEIGHT = 0x034,
+ OP_MAX_WIDTH = 0x035,
+ OP_MIN_HEIGHT = 0x036,
+ OP_MIN_WIDTH = 0x037,
+ OP_ORPHANS = 0x038,
+ OP_OUTLINE_COLOR = 0x039,
+ OP_OUTLINE_STYLE = 0x03a,
+ OP_OUTLINE_WIDTH = 0x03b,
+ OP_OVERFLOW = 0x03c,
+ OP_PADDING_TOP = 0x03d,
+ OP_PADDING_RIGHT = 0x03e,
+ OP_PADDING_BOTTOM = 0x03f,
+ OP_PADDING_LEFT = 0x040,
+ OP_PAGE_BREAK_AFTER = 0x041,
+ OP_PAGE_BREAK_BEFORE = 0x042,
+ OP_PAGE_BREAK_INSIDE = 0x043,
+ OP_PAUSE_AFTER = 0x044,
+ OP_PAUSE_BEFORE = 0x045,
+ OP_PITCH_RANGE = 0x046,
+ OP_PITCH = 0x047,
+ OP_PLAY_DURING = 0x048,
+ OP_POSITION = 0x049,
+ OP_QUOTES = 0x04a,
+ OP_RICHNESS = 0x04b,
+ OP_RIGHT = 0x04c,
+ OP_SPEAK_HEADER = 0x04d,
+ OP_SPEAK_NUMERAL = 0x04e,
+ OP_SPEAK_PUNCTUATION = 0x04f,
+ OP_SPEAK = 0x050,
+ OP_SPEECH_RATE = 0x051,
+ OP_STRESS = 0x052,
+ OP_TABLE_LAYOUT = 0x053,
+ OP_TEXT_ALIGN = 0x054,
+ OP_TEXT_DECORATION = 0x055,
+ OP_TEXT_INDENT = 0x056,
+ OP_TEXT_TRANSFORM = 0x057,
+ OP_TOP = 0x058,
+ OP_UNICODE_BIDI = 0x059,
+ OP_VERTICAL_ALIGN = 0x05a,
+ OP_VISIBILITY = 0x05b,
+ OP_VOICE_FAMILY = 0x05c,
+ OP_VOLUME = 0x05d,
+ OP_WHITE_SPACE = 0x05e,
+ OP_WIDOWS = 0x05f,
+ OP_WIDTH = 0x060,
+ OP_WORD_SPACING = 0x061,
+ OP_Z_INDEX = 0x062,
+
+ N_OPCODES = OP_Z_INDEX + 1
} opcode;
enum flag {
diff --git a/src/bytecode/opcodes.h b/src/bytecode/opcodes.h
index f82d129..eb68c48 100644
--- a/src/bytecode/opcodes.h
+++ b/src/bytecode/opcodes.h
@@ -10,13 +10,6 @@
#include <inttypes.h>
-enum side {
- SIDE_TOP = 0x0000,
- SIDE_RIGHT = 0x0100,
- SIDE_BOTTOM = 0x0200,
- SIDE_LEFT = 0x0300,
-};
-
enum op_azimuth {
AZIMUTH_ANGLE = 0x0080,
@@ -103,7 +96,6 @@ enum op_border_width {
BORDER_WIDTH_THICK = 0x0002,
};
-/** \todo merge top, right, left, bottom into one opcode and use side bits? */
enum op_bottom {
BOTTOM_SET = 0x0080,
BOTTOM_AUTO = 0x0000,