linkparser 1.1.4 → 2.0.0

data/ext/extconf.rb

@@ -16,23 +16,26 @@ $CFLAGS <<  ' ' + `#{pkgconfig} --cflags link-grammar`.chomp
 
 dir_config( 'link-grammar' )
 
-find_library( "link-grammar", "dictionary_create" ) or
+find_library( "link-grammar", "parse_options_create" ) or
 	abort "Could not find Link-Grammar library" +
 	      "(http://www.abisource.com/projects/link-grammar/#download)."
 
 find_header( "link-grammar/link-includes.h" ) or
 	abort "Could not find link-includes.h"
 
-unless have_func( "linkage_is_fat", 'link-grammar/link-includes.h' )
+if have_func( "parse_options_get_screen_width", 'link-grammar/link-includes.h' )
 	$stderr.puts "Your link-grammar library is too old for this binding.",
 	        "Please upgrade to the latest version posted here:",
 	        "  http://www.abisource.com/projects/link-grammar/#download",
 	        "and try again."
-	abort "No linkage_is_fat() in the installed link-grammar."
+	abort "The parse_options_get_screen_width() still defined by the installed link-grammar."
 end
 
+have_func( 'dictionary_create' )
+have_func( 'dictionary_create_lang' )
 have_func( 'parse_options_get_spell_guess' )
 have_func( 'linkage_get_disjunct_str' )
 
+create_header()
 create_makefile( 'linkparser_ext' )
 

data/ext/linkage.c

@@ -1,6 +1,6 @@
 /*
  *  linkage.c - Ruby LinkParser Linkage class
- *  $Id: linkage.c,v 54e4e2ff8899 2010/11/25 00:50:55 ged $
+ *  $Id: linkage.c,v 92228378be38 2015/03/02 16:44:04 ged $
  *
  *  Authors:
  *    * Michael Granger <ged@FaerieMUD.org>
@@ -12,17 +12,14 @@
 #include "linkparser.h"
 
 
-/* --------------------------------------------------
- *  Forward declarations
- * -------------------------------------------------- */
-
-static VALUE rlink_linkage_make_cnode_array( CNode * );
-
-
 /* --------------------------------------------------
  * Macros and constants
  * -------------------------------------------------- */
 
+VALUE display_walls_sym;
+VALUE display_header_sym;
+VALUE max_width_sym;
+
 
 /* --------------------------------------------------
  *	Memory-management functions
@@ -31,13 +28,14 @@ static VALUE rlink_linkage_make_cnode_array( CNode * );
  * Allocation function
  */
 static struct rlink_linkage *
-rlink_linkage_alloc() {
+rlink_linkage_alloc()
+{
 	struct rlink_linkage *ptr = ALLOC( struct rlink_linkage );
 
 	ptr->linkage	= NULL;
 	ptr->sentence	= Qnil;
 
-	debugMsg(( "Initialized an rlink_LINKAGE <%p>", ptr ));
+	rlink_log( "debug", "Initialized an rlink_LINKAGE <%p>", ptr );
 	return ptr;
 }
 
@@ -46,16 +44,11 @@ rlink_linkage_alloc() {
  * GC Mark function
  */
 static void
-rlink_linkage_gc_mark( struct rlink_linkage *ptr ) {
-	debugMsg(( "Marking LinkParser::Linkage %p", ptr ));
-
+rlink_linkage_gc_mark( struct rlink_linkage *ptr )
+{
 	if ( ptr ) {
 		rb_gc_mark( ptr->sentence );
 	}
-
-	else {
-		debugMsg(( "Not marking uninitialized rlink_LINKAGE" ));
-	}
 }
 
 
@@ -63,7 +56,8 @@ rlink_linkage_gc_mark( struct rlink_linkage *ptr ) {
  * GC Free function
  */
 static void
-rlink_linkage_gc_free( struct rlink_linkage *ptr ) {
+rlink_linkage_gc_free( struct rlink_linkage *ptr )
+{
 	if ( ptr ) {
 		linkage_delete( (Linkage)ptr->linkage );
 		ptr->linkage = NULL;
@@ -72,10 +66,6 @@ rlink_linkage_gc_free( struct rlink_linkage *ptr ) {
 		xfree( ptr );
 		ptr = NULL;
 	}
-
-	else {
-		debugMsg(( "Not freeing an uninitialized rlink_LINKAGE" ));
-	}
 }
 
 
@@ -83,7 +73,8 @@ rlink_linkage_gc_free( struct rlink_linkage *ptr ) {
  * Object validity checker. Returns the data pointer.
  */
 static struct rlink_linkage *
-check_linkage(  VALUE	self ) {
+check_linkage( VALUE self )
+{
 	Check_Type( self, T_DATA );
 
     if ( !IsLinkage(self) ) {
@@ -99,7 +90,8 @@ check_linkage(  VALUE	self ) {
  * Fetch the data pointer and check it for sanity.
  */
 static struct rlink_linkage *
-get_linkage(  VALUE self ) {
+get_linkage(  VALUE self )
+{
 	struct rlink_linkage *ptr = check_linkage( self );
 
 	if ( !ptr )
@@ -113,7 +105,8 @@ get_linkage(  VALUE self ) {
  * Publicly-usable linkage-fetcher
  */
 struct rlink_linkage *
-rlink_get_linkage( VALUE self ) {
+rlink_get_linkage( VALUE self )
+{
 	return get_linkage( self );
 }
 
@@ -126,8 +119,9 @@ rlink_get_linkage( VALUE self ) {
  *  Allocate a new LinkParser::Linkage object.
  */
 static VALUE
-rlink_linkage_s_alloc(  VALUE klass ) {
-	debugMsg(( "Wrapping an uninitialized Linkage pointer." ));
+rlink_linkage_s_alloc(  VALUE klass )
+{
+	rlink_log( "debug", "Wrapping an uninitialized Linkage pointer." );
 	return Data_Wrap_Struct( klass, rlink_linkage_gc_mark, rlink_linkage_gc_free, 0 );
 }
 
@@ -187,20 +181,49 @@ rlink_linkage_init( argc, argv, self )
 }
 
 
+// char * linkage_print_diagram(const Linkage linkage, bool display_walls, size_t screen_width);
+// void   linkage_free_diagram(char * str);
+//
+// char * linkage_print_postscript(const Linkage linkage, bool display_walls, bool print_ps_header);
+// void   linkage_free_postscript(char * str);
+//
+// char * linkage_print_links_and_domains(const Linkage linkage);
+// void   linkage_free_links_and_domains(char *str);
+//
+// char * linkage_print_disjuncts(const Linkage linkage);
+// void   linkage_free_disjuncts(char *str);
+
 
 /*
  *  call-seq:
- *     diagram   -> str
+ *     diagram( display_walls: true, max_width: 80 )   -> str
  *
- *  Return a String containing a diagram of the linkage.
+ *  Return a String containing a diagram of the linkage. If +display_walls+ is +true+
+ *  the diagram will include the wall-words and connections to them. Strings longer
+ *  than +max_width+ will be wrapped at that width.
  */
 static VALUE
-rlink_linkage_diagram( VALUE self ) {
+rlink_linkage_diagram( int argc, VALUE *argv, VALUE self )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	char *diagram_cstr;
-	VALUE diagram;
+	bool display_walls = true;
+	size_t screen_width = 80;
+	VALUE opthash = Qnil,
+	      diagram = Qnil;
+
+	rb_scan_args( argc, argv, "0:", &opthash );
+	if ( opthash != Qnil ) {
+		rlink_log_obj( self, "debug", "Got an opthash: %s", RSTRING_PTR(rb_inspect(opthash)) );
+		display_walls = RTEST( rb_hash_lookup2(opthash, display_walls_sym, Qtrue) );
+		if ( rb_hash_lookup(opthash, max_width_sym) != Qnil ) {
+			screen_width = NUM2UINT( rb_hash_lookup(opthash, max_width_sym) );
+		}
+	}
+
+	rlink_log_obj( self, "debug", "Display walls: %d, screen_width: %d", display_walls, screen_width );
 
-	diagram_cstr = linkage_print_diagram( (Linkage)ptr->linkage );
+	diagram_cstr = linkage_print_diagram( (Linkage)ptr->linkage, display_walls, screen_width );
 	diagram = rb_str_new2( diagram_cstr );
 	linkage_free_diagram( diagram_cstr );
 
@@ -210,7 +233,7 @@ rlink_linkage_diagram( VALUE self ) {
 
 /*
  *  call-seq:
- *     postscript_diagram( full_doc=false )   -> str
+ *     postscript_diagram( display_walls: true, display_header: false )   -> str
  *
  *  Returns the macros needed to print out the linkage in a postscript file.
  *  By default, the output is just the set of postscript macros that describe
@@ -218,13 +241,26 @@ rlink_linkage_diagram( VALUE self ) {
  *  is returned.
  */
 static VALUE
-rlink_linkage_print_postscript( VALUE self, VALUE full_doc ) {
+rlink_linkage_print_postscript( int argc, VALUE *argv, VALUE self )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	char *diagram_cstr;
-	VALUE diagram;
+	bool display_walls = true,
+	     display_header = false;
+	VALUE opthash = Qnil,
+	      diagram = Qnil;
+
+	rb_scan_args( argc, argv, "0:", &opthash );
+	if ( opthash != Qnil ) {
+		rlink_log_obj( self, "debug", "Got an opthash: %s", RSTRING_PTR(rb_inspect(opthash)) );
+		display_walls = RTEST( rb_hash_lookup2(opthash, display_walls_sym, Qtrue) );
+		display_header = RTEST( rb_hash_lookup2(opthash, display_header_sym, Qfalse) );
+	}
+
+	rlink_log_obj( self, "debug", "Display walls: %d, display_header: %d", display_walls,
+		display_header );
 
-	diagram_cstr = linkage_print_postscript( (Linkage)ptr->linkage,
-		RTEST(full_doc) ? 1 : 0 );
+	diagram_cstr = linkage_print_postscript( (Linkage)ptr->linkage, display_walls, display_header );
 	diagram = rb_str_new2( diagram_cstr );
 	linkage_free_postscript( diagram_cstr );
 
@@ -254,7 +290,8 @@ rlink_linkage_print_postscript( VALUE self, VALUE full_doc ) {
  *
  */
 static VALUE
-rlink_linkage_links_and_domains( VALUE self ) {
+rlink_linkage_links_and_domains( VALUE self )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	char *diagram_cstr;
 	VALUE diagram;
@@ -267,72 +304,6 @@ rlink_linkage_links_and_domains( VALUE self ) {
 }
 
 
-/*
- * call-seq:
- *    is_fat?   -> true or false
- *
- * Return +true+ if "fat" linkages were enabled when this linkage was parsed. See
- * http://www.abiword.org/projects/link-grammar/dict/coordination.html for more
- * information.
- */
-static VALUE
-rlink_linkage_is_fat_p( VALUE self ) {
-	struct rlink_linkage *ptr = get_linkage( self );
-	return RTEST( linkage_is_fat(ptr->linkage) ) ? Qtrue : Qfalse;
-}
-
-
-
-/*
- *  call-seq:
- *     num_sublinkages   -> fixnum
- *
- *  Return the number of sublinkages for a linkage with conjunctions, 1
- *  otherwise.
- */
-static VALUE
-rlink_linkage_num_sublinkages( VALUE self ) {
-	struct rlink_linkage *ptr = get_linkage( self );
-	return INT2FIX( linkage_get_num_sublinkages((Linkage)ptr->linkage) );
-}
-
-
-/*
- *  call-seq:
- *     current_sublinkage = index   -> true or false
- *
- *  After this call, all operations on the linkage will refer to the index-th
- *  sublinkage. In the case of a linkage without conjunctions, this has no
- *  effect.
- */
-static VALUE
-rlink_linkage_current_sublinkage_eq( VALUE self, VALUE index ) {
-	struct rlink_linkage *ptr = get_linkage( self );
-	int rval = 0;
-
-	rval = linkage_set_current_sublinkage( (Linkage)ptr->linkage, NUM2INT(index) );
-
-	return INT2FIX( rval );
-}
-
-
-/*
- *  call-seq:
- *     current_sublinkage   -> fixnum
- *
- *  Get the index of the current sublinkage.
- */
-static VALUE
-rlink_linkage_current_sublinkage( VALUE self ) {
-	struct rlink_linkage *ptr = get_linkage( self );
-	int rval = 0;
-
-	rval = linkage_get_current_sublinkage( (Linkage)ptr->linkage );
-
-	return INT2FIX( rval );
-}
-
-
 /*
  * num_words
  * --
@@ -341,7 +312,8 @@ rlink_linkage_current_sublinkage( VALUE self ) {
  * sublinkage.
  */
 static VALUE
-rlink_linkage_get_num_words( VALUE self ) {
+rlink_linkage_get_num_words( VALUE self )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	return INT2FIX( linkage_get_num_words((Linkage)ptr->linkage) );
 }
@@ -353,7 +325,8 @@ rlink_linkage_get_num_words( VALUE self ) {
  * The number of links used in the current sublinkage.
  */
 static VALUE
-rlink_linkage_get_num_links( VALUE self ) {
+rlink_linkage_get_num_links( VALUE self )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	return INT2FIX( linkage_get_num_links((Linkage)ptr->linkage) );
 }
@@ -366,7 +339,8 @@ rlink_linkage_get_num_links( VALUE self ) {
  * current sublinkage.
  */
 static VALUE
-rlink_linkage_get_link_lword( VALUE self, VALUE index ) {
+rlink_linkage_get_link_lword( VALUE self, VALUE index )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	int i = NUM2INT( index );
 
@@ -381,7 +355,8 @@ rlink_linkage_get_link_lword( VALUE self, VALUE index ) {
  * current sublinkage.
  */
 static VALUE
-rlink_linkage_get_link_rword( VALUE self, VALUE index ) {
+rlink_linkage_get_link_rword( VALUE self, VALUE index )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	int i = NUM2INT( index );
 
@@ -395,7 +370,8 @@ rlink_linkage_get_link_rword( VALUE self, VALUE index ) {
  * The number of words spanned by the index-th link of the current sublinkage.
  */
 static VALUE
-rlink_linkage_get_link_length( VALUE self, VALUE index ) {
+rlink_linkage_get_link_length( VALUE self, VALUE index )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	int i = NUM2INT( index );
 
@@ -409,7 +385,8 @@ rlink_linkage_get_link_length( VALUE self, VALUE index ) {
  * The "intersection" of the left and right connectors that comprise the link.
  */
 static VALUE
-rlink_linkage_get_link_label( VALUE self, VALUE index ) {
+rlink_linkage_get_link_label( VALUE self, VALUE index )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	int i = NUM2INT( index );
 	const char *label;
@@ -427,7 +404,8 @@ rlink_linkage_get_link_label( VALUE self, VALUE index ) {
  * The label on the left word of the index-th link of the current sublinkage.
  */
 static VALUE
-rlink_linkage_get_link_llabel( VALUE self, VALUE index ) {
+rlink_linkage_get_link_llabel( VALUE self, VALUE index )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	int i = NUM2INT( index );
 	const char *label = NULL;
@@ -444,7 +422,8 @@ rlink_linkage_get_link_llabel( VALUE self, VALUE index ) {
  * The label on the right word of the index-th link of the current sublinkage.
  */
 static VALUE
-rlink_linkage_get_link_rlabel( VALUE self, VALUE index ) {
+rlink_linkage_get_link_rlabel( VALUE self, VALUE index )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	int i = NUM2INT( index );
 	const char *label = NULL;
@@ -470,10 +449,11 @@ rlink_linkage_get_link_rlabel( VALUE self, VALUE index ) {
  *
  */
 static VALUE
-rlink_linkage_get_disjunct_strings( VALUE self ) {
+rlink_linkage_get_disjunct_strings( VALUE self )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	const char *disjunct;
-	int count, i;
+	unsigned long i, count = 0l;
 	VALUE disjuncts_ary;
 
 	count = linkage_get_num_words( (Linkage)ptr->linkage );
@@ -505,7 +485,8 @@ rlink_linkage_get_disjunct_strings( VALUE self ) {
  *
  */
 static VALUE
-rlink_linkage_get_link_num_domains( VALUE self, VALUE index ) {
+rlink_linkage_get_link_num_domains( VALUE self, VALUE index )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	int i = NUM2INT( index );
 	int count = 0;
@@ -522,7 +503,8 @@ rlink_linkage_get_link_num_domains( VALUE self, VALUE index ) {
  *  Returns the names of the domains the index-th link belongs to.
  */
 static VALUE
-rlink_linkage_get_link_domain_names( VALUE self, VALUE index ) {
+rlink_linkage_get_link_domain_names( VALUE self, VALUE index )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	const char **names;
 	int i = NUM2INT( index );
@@ -552,10 +534,11 @@ rlink_linkage_get_link_domain_names( VALUE self, VALUE index ) {
  *  The original spellings can be obtained by calls to Sentence#words.
  */
 static VALUE
-rlink_linkage_get_words( VALUE self ) {
+rlink_linkage_get_words( VALUE self )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	const char **words;
-	int count, i;
+	unsigned long count, i;
 	VALUE words_ary;
 
 	count = linkage_get_num_words( (Linkage)ptr->linkage );
@@ -570,31 +553,6 @@ rlink_linkage_get_words( VALUE self ) {
 }
 
 
-/*
- *  call-seq:
- *     compute_union   -> true or false
- *
- *  If the linkage has a conjunction, combine all of the links occurring in all
- *  sublinkages together -- in effect creating a "master" linkage (which may
- *  have crossing links). The union is created as another sublinkage, thus
- *  increasing the number of sublinkages by one, and is returned by this method.
- *  If the linkage has no conjunctions, computing its union has no effect. This
- *  method returns true if computing its union caused another sublinkage to be
- *  created.
- */
-static VALUE
-rlink_linkage_compute_union( VALUE self ) {
-	struct rlink_linkage *ptr = get_linkage( self );
-	int before, after;
-
-	before = linkage_get_num_sublinkages( (Linkage)ptr->linkage );
-	linkage_compute_union( (Linkage)ptr->linkage );
-	after = linkage_get_num_sublinkages( (Linkage)ptr->linkage );
-
-	return (after > before) ? Qtrue : Qfalse;
-}
-
-
 /*
  *  call-seq:
  *     linkage.unused_word_cost   -> fixnum
@@ -604,7 +562,8 @@ rlink_linkage_compute_union( VALUE self ) {
  *
  */
 static VALUE
-rlink_linkage_unused_word_cost( VALUE self ) {
+rlink_linkage_unused_word_cost( VALUE self )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	int rval;
 
@@ -622,7 +581,8 @@ rlink_linkage_unused_word_cost( VALUE self ) {
  *
  */
 static VALUE
-rlink_linkage_disjunct_cost( VALUE self ) {
+rlink_linkage_disjunct_cost( VALUE self )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	int rval;
 
@@ -632,25 +592,6 @@ rlink_linkage_disjunct_cost( VALUE self ) {
 }
 
 
-/*
- *  call-seq:
- *     linkage.and_cost   -> fixnum
- *
- *  Returns the AND cost of the linkage, which is the difference in length
- *  between and-list elements.
- *
- */
-static VALUE
-rlink_linkage_and_cost( VALUE self ) {
-	struct rlink_linkage *ptr = get_linkage( self );
-	int rval;
-
-	rval = linkage_and_cost( (Linkage)ptr->linkage );
-
-	return INT2FIX( rval );
-}
-
-
 /*
  *  call-seq:
  *     linkage.link_cost   -> fixnum
@@ -661,7 +602,8 @@ rlink_linkage_and_cost( VALUE self ) {
  *
  */
 static VALUE
-rlink_linkage_link_cost( VALUE self ) {
+rlink_linkage_link_cost( VALUE self )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	int rval;
 
@@ -671,65 +613,6 @@ rlink_linkage_link_cost( VALUE self ) {
 }
 
 
-/*
- *  call-seq:
- *     linkage.canonical?   -> true or false
- *
- *  Returns +true+ if the linkage is canonical. The canonical linkage is the
- *  one in which the minimal disjunct that ever occurrs in a position is used
- *  in that position.
- */
-static VALUE
-rlink_linkage_canonical_p( VALUE self ) {
-	struct rlink_linkage *ptr = get_linkage( self );
-	int rval = 0;
-
-	rval = linkage_is_canonical( (Linkage)ptr->linkage );
-
-	return rval ? Qtrue : Qfalse;
-}
-
-
-/*
- *  call-seq:
- *     linkage.improper?   -> true or false
- *
- *  Returns +true+ if the linkage is "improper".
- *  --
- *  :FIXME: Find out what an "improper fat linkage" is.
- *
- */
-static VALUE
-rlink_linkage_improper_p( VALUE self ) {
-	struct rlink_linkage *ptr = get_linkage( self );
-	int rval = 0;
-
-	rval = linkage_is_improper( (Linkage)ptr->linkage );
-
-	return rval ? Qtrue : Qfalse;
-}
-
-
-/*
- *  call-seq:
- *     linkage.has_inconsistent_domains?   -> true or false
- *
- *  Returns +true+ if the linkage has inconsistent domains.
- *  --
- *  :FIXME: Find out what it means that a linkage has inconsistent domains.
- *
- */
-static VALUE
-rlink_linkage_has_inconsistent_domains_p( VALUE self ) {
-	struct rlink_linkage *ptr = get_linkage( self );
-	int rval = 0;
-
-	rval = linkage_has_inconsistent_domains( (Linkage)ptr->linkage );
-
-	return rval ? Qtrue : Qfalse;
-}
-
-
 /*
  *  call-seq:
  *     linkage.violation_name   -> str
@@ -738,7 +621,8 @@ rlink_linkage_has_inconsistent_domains_p( VALUE self ) {
  *  name of the violated rule in the post-process knowledge file.
  */
 static VALUE
-rlink_linkage_get_violation_name( VALUE self ) {
+rlink_linkage_get_violation_name( VALUE self )
+{
 	struct rlink_linkage *ptr = get_linkage( self );
 	const char *violation_name = NULL;
 
@@ -752,133 +636,20 @@ rlink_linkage_get_violation_name( VALUE self ) {
 }
 
 
-/*
- *  call-seq:
- *     linkage.constituent_tree   -> hash
- *
- *  Return the Linkage's constituent tree as a Array of hierarchical "CTree" structs.
- *
- *     sent = dict.parse( "He is a big dog." )
- *     link = sent.linkages.first
- *     ctree = link.constituent_tree
- *     # => [#<struct Struct::LinkParserLinkageCTree label="S",
- *               children=[#<struct Struct::LinkParserLinkageCTree label="NP">, ...],
- *               start=0, end=5>]
- *
- */
-static VALUE
-rlink_linkage_constituent_tree( VALUE self ) {
-	struct rlink_linkage *ptr = get_linkage( self );
-	CNode *ctree = NULL;
-	VALUE rval = Qnil;
-
-	ctree = linkage_constituent_tree( (Linkage)ptr->linkage );
-	rval = rlink_linkage_make_cnode_array( ctree );
-
-	linkage_free_constituent_tree( ctree );
-	return rval;
-}
-
-
-/*
- * Make an Array of LinkParser::Linkage::CTree objects from the specified
- * linked list of CNode *.
- */
-static VALUE
-rlink_linkage_make_cnode_array( CNode *ctree ) {
-	VALUE nodes = rb_ary_new();
-	VALUE rnode;
-	CNode *cnode = ctree;
-
-	/*
-		struct CNode_s {
-		  char  * label;
-		  CNode * child;
-		  CNode * next;
-		  int   start, end;
-		};
-	*/
-	while ( cnode ) {
-		rnode = rb_struct_new( rlink_sLinkageCTree,
-			rb_str_new2( linkage_constituent_node_get_label(cnode) ),
-			Qnil,
-			INT2FIX( linkage_constituent_node_get_start(cnode) ),
-			INT2FIX( linkage_constituent_node_get_end(cnode) )			/* end */
-		  );
-
-		/* Make a node array for any children */
-		rb_struct_aset( rnode, INT2FIX(1),
-			rlink_linkage_make_cnode_array(linkage_constituent_node_get_child(cnode)) );
-
-		rb_ary_push( nodes, rnode );
-		cnode = linkage_constituent_node_get_next( cnode );
-	}
-
-	return nodes;
-}
-
-
-/*
- *  call-seq:
- *     linkage.constituent_tree_string( mode=1 )   -> str
- *
- *  Return the constituent tree as a printable string.
- *
- *  Example:
- *     sent = dict.parse( "He is a big dog." )
- *     link = sent.linkages.first
- *     link.constituent_tree_string
- *
- *     # ==> "(S (NP He)\n   (VP is\n       (NP a big dog))\n   .)\n"
- */
-static VALUE
-rlink_linkage_constituent_tree_string( int argc, VALUE *argv, VALUE self ) {
-	struct rlink_linkage *ptr = get_linkage( self );
-	char *ctree_string = NULL;
-	VALUE rval = Qnil, modenum = Qnil;
-	int mode;
-
-	if ( rb_scan_args(argc, argv, "01", &modenum) == 1 ) {
-		mode = NUM2INT( modenum );
-	} else {
-		mode = 1;
-	}
-
-	if ( mode < 1 || mode > 3 )
-		rb_raise( rb_eArgError, "Illegal mode %d specified.", mode );
-
-	ctree_string = linkage_print_constituent_tree( (Linkage)ptr->linkage, mode );
-
-	if ( ctree_string ) {
-		rval = rb_str_new2( ctree_string );
-		linkage_free_constituent_tree_str( ctree_string );
-	} else {
-		rval = Qnil;
-	}
-
-	return rval;
-}
-
-
-
-/*
- * This is the API's representation of a parse. A LinkParser::Sentence may have one or more
- * of LinkParser::Linkages, each of which represents one possible structure of the sentence.
- * It can be thought of as a Sentence together with a collection of links. If the parse
- * has a conjunction, then the Linkage is made up of at least two "sublinkages". A
- * Linkage can be pretty printed in either ASCII or Postscript format, and individual
- * links can be extracted.
- *
- */
 void
-rlink_init_linkage() {
+rlink_init_linkage()
+{
 	rlink_cLinkage = rb_define_class_under( rlink_mLinkParser, "Linkage", rb_cObject );
 
+	display_walls_sym  = ID2SYM( rb_intern("display_walls") );
+	display_header_sym = ID2SYM( rb_intern("display_header") );
+	max_width_sym      = ID2SYM( rb_intern("max_width") );
+
 	rb_define_alloc_func( rlink_cLinkage, rlink_linkage_s_alloc );
 
 	rb_define_method( rlink_cLinkage, "initialize", rlink_linkage_init, -1 );
-	rb_define_method( rlink_cLinkage, "diagram", rlink_linkage_diagram, 0 );
-	rb_define_method( rlink_cLinkage, "postscript_diagram", rlink_linkage_print_postscript, 1 );
+	rb_define_method( rlink_cLinkage, "diagram", rlink_linkage_diagram, -1 );
+	rb_define_method( rlink_cLinkage, "postscript_diagram", rlink_linkage_print_postscript, -1 );
 	rb_define_method( rlink_cLinkage, "links_and_domains", rlink_linkage_links_and_domains, 0 );
 
 	rb_define_method( rlink_cLinkage, "num_words", rlink_linkage_get_num_words, 0 );
@@ -899,31 +670,9 @@ rlink_init_linkage() {
 	rb_define_method( rlink_cLinkage, "words", rlink_linkage_get_words, 0 );
 	rb_define_method( rlink_cLinkage, "disjunct_strings", rlink_linkage_get_disjunct_strings, 0 );
 
-	rb_define_method( rlink_cLinkage, "compute_union", rlink_linkage_compute_union, 0 );
 	rb_define_method( rlink_cLinkage, "unused_word_cost", rlink_linkage_unused_word_cost, 0 );
 	rb_define_method( rlink_cLinkage, "disjunct_cost", rlink_linkage_disjunct_cost, 0 );
-	rb_define_method( rlink_cLinkage, "and_cost", rlink_linkage_and_cost, 0 );
 	rb_define_method( rlink_cLinkage, "link_cost", rlink_linkage_link_cost, 0 );
-	rb_define_method( rlink_cLinkage, "canonical?", rlink_linkage_canonical_p, 0 );
-	rb_define_method( rlink_cLinkage, "improper?", rlink_linkage_improper_p, 0 );
-	rb_define_method( rlink_cLinkage, "has_inconsistent_domains?",
-		rlink_linkage_has_inconsistent_domains_p, 0 );
 	rb_define_method( rlink_cLinkage, "violation_name", rlink_linkage_get_violation_name, 0 );
-
-	/* Struct that contains links of a constituent tree (:label, :children, :start, :end) */
-	rb_define_const( rlink_cLinkage, "CTree", rlink_sLinkageCTree );
-	rlink_sLinkageCTree = rb_struct_define( "LinkParserLinkageCTree",
-		"label", "children", "start", "end", NULL );
-
-	rb_define_method( rlink_cLinkage, "constituent_tree", rlink_linkage_constituent_tree, 0 );
-	rb_define_method( rlink_cLinkage, "constituent_tree_string",
-		rlink_linkage_constituent_tree_string, -1 );
-
-	/* Deprecated sublinkage API */
-	rb_define_method( rlink_cLinkage, "num_sublinkages", rlink_linkage_num_sublinkages, 0 );
-	rb_define_method( rlink_cLinkage, "current_sublinkage=",
-		rlink_linkage_current_sublinkage_eq, 1 );
-	rb_define_method( rlink_cLinkage, "current_sublinkage", rlink_linkage_current_sublinkage, 0 );
-
 }