Index: trunk/doc/developer/lihata_format/comm_concrete.lht =================================================================== --- trunk/doc/developer/lihata_format/comm_concrete.lht (revision 4293) +++ trunk/doc/developer/lihata_format/comm_concrete.lht (revision 4294) @@ -17,8 +17,9 @@ sy:line.ID = {/lht_tree_doc/comm/line.ID} sy:arc.ID = {/lht_tree_doc/comm/arc.ID} sy:polygon.ID = {/lht_tree_doc/comm/polygon.ID} + sy:text.ID = {/lht_tree_doc/comm/text.ID} sy:connection.ID = {/lht_tree_doc/comm/connection.ID} - ha:obj.ID = { valtype=none; desc={list of any concrete object }} + sy:pen.NAME = {/lht_tree_doc/comm/pen.NAME} } } sy:attrib@dup = {/lht_tree_doc/comm/attrib} @@ -117,4 +118,37 @@ } } + ha:text.ID { + type=ha + desc { Drawing object: straight line } + li:children { + ha:text = { valtype=string; desc={text string (or dyntext template)}} + ha:x1 = { valtype=coord; desc={lower left x coord of text box }} + ha:y1 = { valtype=coord; desc={lower left y coord of text box }} + ha:x2 = { valtype=coord; desc={upper right corner of untrasformed box; present only if text size is bbox-specified }} + ha:y2 = { valtype=coord; desc={upper right corner of untrasformed box; present only if text size is bbox-specified }} + ha:rot = { valtype=angle; desc={rotaition around x1;y1 }} + ha:halign = { valtype=halign; desc={horizontal alignment }} + ha:dyntext = { valtype=bool; desc={if text string is a dyntext template }} + ha:stroke = { valtype=pen; desc={pen to use }} + ha:lock = { valtype=bool; desc={object is locked }} + ha:floater = { valtype=bool; desc={"group lock" doesn't apply }} + } + } + + ha:pen.NAME { + type=ha + desc { Logical object: a named pen used for drawing; names are unique within a group } + li:children { + ha:shape = { valtype=shape; desc={pen tip shape)}} + ha:size = { valtype=coord; desc={diameter or side length}} + ha:color = { valtype=color; desc={ink color }} + ha:font_height = { valtype=coord; desc={height of text font for non-bbox-defined text}} + ha:font_family = { valtype=string; desc={family hint for the font selector}} + ha:font_style = { valtype=string; desc={style hint for the font selector}} + ha:dash = { valtype=hex4; desc={dash pattern }} + ha:dash_period = { valtype=coord; desc={dash pattern length}} + } + } + }} Index: trunk/doc/developer/lihata_format/types.lht =================================================================== --- trunk/doc/developer/lihata_format/types.lht (revision 4293) +++ trunk/doc/developer/lihata_format/types.lht (revision 4294) @@ -19,6 +19,10 @@ sometimes signed. } +hex4 { + 4 digits of hexadecimal numbers (0-9, a-f, A-F) +} + bool { Single digit boolean value: 0 means false, 1 means true. } @@ -27,6 +31,18 @@ Name of a pen defined in a parent group. } +halign { + One of: left, center, right, word_justify, justify. +} + +shape { + One of: round, square. +} + +color { + #rrggbb +} + minuid { An unique ID as generated by libminuid (24 ASCII characters). }