[BACK]Return to mandoc.3 CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mandoc.3 between version 1.36 and 1.37

version 1.36, 2016/01/08 17:48:09 version 1.37, 2016/07/07 19:19:01
Line 20 
Line 20 
 .Os  .Os
 .Sh NAME  .Sh NAME
 .Nm mandoc ,  .Nm mandoc ,
 .Nm man_deroff ,  .Nm deroff ,
 .Nm man_meta ,  .Nm mandocmsg ,
 .Nm man_mparse ,  .Nm man_mparse ,
 .Nm man_node ,  .Nm man_validate ,
 .Nm mdoc_deroff ,  .Nm mdoc_validate ,
 .Nm mdoc_meta ,  
 .Nm mdoc_node ,  
 .Nm mparse_alloc ,  .Nm mparse_alloc ,
 .Nm mparse_free ,  .Nm mparse_free ,
 .Nm mparse_getkeep ,  .Nm mparse_getkeep ,
Line 91 
Line 89 
 .Ft void  .Ft void
 .Fo mparse_result  .Fo mparse_result
 .Fa "struct mparse *parse"  .Fa "struct mparse *parse"
 .Fa "struct mdoc **mdoc"  .Fa "struct roff_man **man"
 .Fa "struct man **man"  
 .Fa "char **sodest"  .Fa "char **sodest"
 .Fc  .Fc
 .Ft "const char *"  .Ft "const char *"
Line 103 
Line 100 
 .Fo mparse_strlevel  .Fo mparse_strlevel
 .Fa "enum mandoclevel"  .Fa "enum mandoclevel"
 .Fc  .Fc
 .In sys/types.h  .In roff.h
 .In mandoc.h  
 .In mdoc.h  
 .Ft void  .Ft void
 .Fo mdoc_deroff  .Fo deroff
 .Fa "char **dest"  .Fa "char **dest"
 .Fa "const struct mdoc_node *node"  .Fa "const struct roff_node *node"
 .Fc  .Fc
 .Ft "const struct mdoc_meta *"  .In sys/types.h
 .Fo mdoc_meta  .In mandoc.h
 .Fa "const struct mdoc *mdoc"  .In mdoc.h
 .Fc  
 .Ft "const struct mdoc_node *"  
 .Fo mdoc_node  
 .Fa "const struct mdoc *mdoc"  
 .Fc  
 .Vt extern const char * const * mdoc_argnames;  .Vt extern const char * const * mdoc_argnames;
 .Vt extern const char * const * mdoc_macronames;  .Vt extern const char * const * mdoc_macronames;
   .Ft void
   .Fo mdoc_validate
   .Fa "struct roff_man *mdoc"
   .Fc
 .In sys/types.h  .In sys/types.h
 .In mandoc.h  .In mandoc.h
 .In man.h  .In man.h
 .Ft void  .Vt extern const char * const * man_macronames;
 .Fo man_deroff  
 .Fa "char **dest"  
 .Fa "const struct man_node *node"  
 .Fc  
 .Ft "const struct man_meta *"  
 .Fo man_meta  
 .Fa "const struct man *man"  
 .Fc  
 .Ft "const struct mparse *"  .Ft "const struct mparse *"
 .Fo man_mparse  .Fo man_mparse
 .Fa "const struct man *man"  .Fa "const struct roff_man *man"
 .Fc  .Fc
 .Ft "const struct man_node *"  .Ft void
 .Fo man_node  .Fo man_validate
 .Fa "const struct man *man"  .Fa "struct roff_man *man"
 .Fc  .Fc
 .Vt extern const char * const * man_macronames;  
 .Sh DESCRIPTION  .Sh DESCRIPTION
 The  The
 .Nm mandoc  .Nm mandoc
Line 182  close it with
Line 167  close it with
 retrieve the syntax tree with  retrieve the syntax tree with
 .Fn mparse_result ;  .Fn mparse_result ;
 .It  .It
 iterate over parse nodes with  depending on whether the
 .Fn mdoc_node  .Fa macroset
   member of the returned
   .Vt struct roff_man
   is
   .Dv MACROSET_MDOC
 or  or
 .Fn man_node ;  .Dv MACROSET_MAN ,
   validate it with
   .Fn mdoc_validate
   or
   .Fn man_validate ,
   respectively;
 .It  .It
   iterate over parse nodes with starting from the
   .Fa first
   member of the returned
   .Vt struct roff_man ;
   .It
 free all allocated memory with  free all allocated memory with
 .Fn mparse_free  .Fn mparse_free
 and  and
 .Xr mchars_free 3 ,  .Xr mchars_free 3 ,
 or invoke  or invoke
 .Fn mparse_reset  .Fn mparse_reset
 and parse new files.  and go back to step 2 to parse new files.
 .El  .El
 .Sh REFERENCE  .Sh REFERENCE
 This section documents the functions, types, and variables available  This section documents the functions, types, and variables available
Line 211  An error or warning message during parsing.
Line 210  An error or warning message during parsing.
 A classification of an  A classification of an
 .Vt "enum mandocerr"  .Vt "enum mandocerr"
 as regards system operation.  as regards system operation.
   See the DIAGNOSTICS section in
   .Xr mandoc 1
   regarding the meanings of the levels.
 .It Vt "struct mparse"  .It Vt "struct mparse"
 An opaque pointer to a running parse sequence.  An opaque pointer to a running parse sequence.
 Created with  Created with
Line 226  messages emitted by the parser.
Line 228  messages emitted by the parser.
 .El  .El
 .Ss Functions  .Ss Functions
 .Bl -ohang  .Bl -ohang
 .It Fn man_deroff  .It Fn deroff
 Obtain a text-only representation of a  Obtain a text-only representation of a
 .Vt struct man_node ,  .Vt struct roff_node ,
 including text contained in its child nodes.  including text contained in its child nodes.
 To be used on children of the pointer returned from  To be used on children of the
 .Fn man_node .  .Fa first
   member of
   .Vt struct roff_man .
 When it is no longer needed, the pointer returned from  When it is no longer needed, the pointer returned from
 .Fn man_deroff  .Fn deroff
 can be passed to  can be passed to
 .Xr free 3 .  .Xr free 3 .
 .It Fn man_meta  
 Obtain the meta-data of a successful  
 .Xr man 7  
 parse.  
 This may only be used on a pointer returned by  
 .Fn mparse_result .  
 Declared in  
 .In man.h ,  
 implemented in  
 .Pa man.c .  
 .It Fn man_mparse  .It Fn man_mparse
 Get the parser used for the current output.  Get the parser used for the current output.
 Declared in  Declared in
 .In man.h ,  .In man.h ,
 implemented in  implemented in
 .Pa man.c .  .Pa man.c .
 .It Fn man_node  .It Fn man_validate
 Obtain the root node of a successful  Validate the
 .Xr man 7  .Dv MACROSET_MAN
 parse.  parse tree obtained with
 This may only be used on a pointer returned by  
 .Fn mparse_result .  .Fn mparse_result .
 Declared in  Declared in
 .In man.h ,  .In man.h ,
 implemented in  implemented in
 .Pa man.c .  .Pa man.c .
 .It Fn mdoc_deroff  .It Fn mdoc_validate
 Obtain a text-only representation of a  Validate the
 .Vt struct mdoc_node ,  .Dv MACROSET_MDOC
 including text contained in its child nodes.  parse tree obtained with
 To be used on children of the pointer returned from  
 .Fn mdoc_node .  
 When it is no longer needed, the pointer returned from  
 .Fn mdoc_deroff  
 can be passed to  
 .Xr free 3 .  
 .It Fn mdoc_meta  
 Obtain the meta-data of a successful  
 .Xr mdoc  
 parse.  
 This may only be used on a pointer returned by  
 .Fn mparse_result .  .Fn mparse_result .
 Declared in  Declared in
 .In mdoc.h ,  .In mdoc.h ,
 implemented in  implemented in
 .Pa mdoc.c .  .Pa mdoc.c .
 .It Fn mdoc_node  
 Obtain the root node of a successful  
 .Xr mdoc  
 parse.  
 This may only be used on a pointer returned by  
 .Fn mparse_result .  
 Declared in  
 .In mdoc.h ,  
 implemented in  
 .Pa mdoc.c .  
 .It Fn mparse_alloc  .It Fn mparse_alloc
 Allocate a parser.  Allocate a parser.
 The arguments have the following effect:  The arguments have the following effect:
Line 335  A callback function to handle errors and warnings.
Line 307  A callback function to handle errors and warnings.
 See  See
 .Pa main.c  .Pa main.c
 for an example.  for an example.
   If printing of error messages is not desired,
   .Dv NULL
   may be passed.
 .It Ar defos  .It Ar defos
 A default string for the  A default string for the
 .Xr mdoc 7  .Xr mdoc 7
Line 343  macro, overriding the
Line 318  macro, overriding the
 .Dv OSNAME  .Dv OSNAME
 preprocessor definition and the results of  preprocessor definition and the results of
 .Xr uname 3 .  .Xr uname 3 .
   Passing
   .Dv NULL
   sets no default.
 .El  .El
 .Pp  .Pp
 The same parser may be used for multiple files so long as  The same parser may be used for multiple files so long as
Line 421  implemented in
Line 399  implemented in
 .Pa read.c .  .Pa read.c .
 .It Fn mparse_result  .It Fn mparse_result
 Obtain the result of a parse.  Obtain the result of a parse.
 One of the three pointers will be filled in.  One of the two pointers will be filled in.
 Declared in  Declared in
 .In mandoc.h ,  .In mandoc.h ,
 implemented in  implemented in
Line 442  implemented in
Line 420  implemented in
 .Ss Variables  .Ss Variables
 .Bl -ohang  .Bl -ohang
 .It Va man_macronames  .It Va man_macronames
 The string representation of a man macro as indexed by  The string representation of a
   .Xr man 7
   macro as indexed by
 .Vt "enum mant" .  .Vt "enum mant" .
 .It Va mdoc_argnames  .It Va mdoc_argnames
 The string representation of a mdoc macro argument as indexed by  The string representation of an
   .Xr mdoc 7
   macro argument as indexed by
 .Vt "enum mdocargt" .  .Vt "enum mdocargt" .
 .It Va mdoc_macronames  .It Va mdoc_macronames
 The string representation of a mdoc macro as indexed by  The string representation of an
   .Xr mdoc 7
   macro as indexed by
 .Vt "enum mdoct" .  .Vt "enum mdoct" .
 .El  .El
 .Sh IMPLEMENTATION NOTES  .Sh IMPLEMENTATION NOTES
Line 492  This AST is governed by the ontological rules dictated
Line 476  This AST is governed by the ontological rules dictated
 and derives its terminology accordingly.  and derives its terminology accordingly.
 .Pp  .Pp
 The AST is composed of  The AST is composed of
 .Vt struct man_node  .Vt struct roff_node
 nodes with element, root and text types as declared by the  nodes with element, root and text types as declared by the
 .Va type  .Va type
 field.  field.
 Each node also provides its parse point (the  Each node also provides its parse point (the
 .Va line ,  .Va line ,
 .Va sec ,  .Va pos ,
 and  and
 .Va pos  .Va sec
 fields), its position in the tree (the  fields), its position in the tree (the
 .Va parent ,  .Va parent ,
 .Va child ,  .Va child ,
Line 544  are described simply as
Line 528  are described simply as
 .Qq elements .  .Qq elements .
 .Pp  .Pp
 The AST is composed of  The AST is composed of
 .Vt struct mdoc_node  .Vt struct roff_node
 nodes with block, head, body, element, root and text types as declared  nodes with block, head, body, element, root and text types as declared
 by the  by the
 .Va type  .Va type
 field.  field.
 Each node also provides its parse point (the  Each node also provides its parse point (the
 .Va line ,  .Va line ,
 .Va sec ,  .Va pos ,
 and  and
 .Va pos  .Va sec
 fields), its position in the tree (the  fields), its position in the tree (the
 .Va parent ,  .Va parent ,
 .Va child ,  .Va child ,
Line 670  consistent across troff implementations, especially wh
Line 654  consistent across troff implementations, especially wh
 levels of badly-nested blocks.  levels of badly-nested blocks.
 .Sh SEE ALSO  .Sh SEE ALSO
 .Xr mandoc 1 ,  .Xr mandoc 1 ,
   .Xr man.cgi 3 ,
 .Xr mandoc_escape 3 ,  .Xr mandoc_escape 3 ,
   .Xr mandoc_headers 3 ,
 .Xr mandoc_malloc 3 ,  .Xr mandoc_malloc 3 ,
   .Xr mansearch 3 ,
 .Xr mchars_alloc 3 ,  .Xr mchars_alloc 3 ,
   .Xr tbl 3 ,
 .Xr eqn 7 ,  .Xr eqn 7 ,
 .Xr man 7 ,  .Xr man 7 ,
 .Xr mandoc_char 7 ,  .Xr mandoc_char 7 ,
Line 680  levels of badly-nested blocks.
Line 668  levels of badly-nested blocks.
 .Xr roff 7 ,  .Xr roff 7 ,
 .Xr tbl 7  .Xr tbl 7
 .Sh AUTHORS  .Sh AUTHORS
   .An -nosplit
 The  The
 .Nm  .Nm
 library was written by  library was written by
 .An Kristaps Dzonsons Aq Mt kristaps@bsd.lv .  .An Kristaps Dzonsons Aq Mt kristaps@bsd.lv
   and is maintained by
   .An Ingo Schwarze Aq Mt schwarze@openbsd.org .

Legend:
Removed from v.1.36  
changed lines
  Added in v.1.37

CVSweb