New upstream version 1.2018.13

295 files changed, 2388 insertions, 19923 deletions

diff --git a/src/h/Agattr_s.java b/src/h/Agattr_s.java
deleted file mode 100644
index 0813e82..0000000
--- a/src/h/Agattr_s.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 bhyg6b8o9rt02pkq0cw5v7v8l
-
-public interface Agattr_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agattr_s",
-"{",
-"Agrec_t h",
-"Dict_t *dict",
-"char **str",
-"}");
-}
-
-// struct Agattr_s {		/* dynamic string attributes */
-//     Agrec_t h;			/* common data header */
-//     Dict_t *dict;		/* shared dict to interpret attr field */
-//     char **str;			/* the attribute string values */
-// };
\ No newline at end of file
diff --git a/src/h/Agattr_t.java b/src/h/Agattr_t.java
deleted file mode 100644
index 0a816da..0000000
--- a/src/h/Agattr_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 4eab8jpwd22sxwe7231h81ak7
-
-public interface Agattr_t extends Agattr_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agattr_s Agattr_t");
-}
-
-// typedef struct Agattr_s Agattr_t;
\ No newline at end of file
diff --git a/src/h/Agcbdisc_s.java b/src/h/Agcbdisc_s.java
deleted file mode 100644
index 053e1a5..0000000
--- a/src/h/Agcbdisc_s.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 4bs0remcyjtoc7ic0ezb77hjt
-
-public interface Agcbdisc_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agcbdisc_s",
-"{",
-"struct",
-"{",
-"agobjfn_t ins",
-"agobjupdfn_t mod",
-"agobjfn_t del",
-"}",
-"graph, node, edge",
-"}");
-}
-
-// struct Agcbdisc_s {
-//     struct {
-// 	agobjfn_t ins;
-// 	agobjupdfn_t mod;
-// 	agobjfn_t del;
-//     } graph, node, edge;
-// };
\ No newline at end of file
diff --git a/src/h/Agcbdisc_t.java b/src/h/Agcbdisc_t.java
deleted file mode 100644
index 0800c7a..0000000
--- a/src/h/Agcbdisc_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 5yq6nwzfy7wrzq92i583nbcxk
-
-public interface Agcbdisc_t extends Agcbdisc_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agcbdisc_s Agcbdisc_t");
-}
-
-// typedef struct Agcbdisc_s Agcbdisc_t;
\ No newline at end of file
diff --git a/src/h/Agclos_s.java b/src/h/Agclos_s.java
deleted file mode 100644
index 22eebd3..0000000
--- a/src/h/Agclos_s.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 eo8sfsh5lby147igpryzvitu7
-
-public interface Agclos_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agclos_s",
-"{",
-"Agdisc_t disc",
-"Agdstate_t state",
-"Dict_t *strdict",
-"unsigned long seq[3]",
-"Agcbstack_t *cb",
-"unsigned char callbacks_enabled",
-"Dict_t *lookup_by_name[3]",
-"Dict_t *lookup_by_id[3]",
-"}");
-}
-
-// struct Agclos_s {
-//     Agdisc_t disc;		/* resource discipline functions */
-//     Agdstate_t state;		/* resource closures */
-//     Dict_t *strdict;		/* shared string dict */
-//     unsigned long seq[3];	/* local object sequence number counter */
-//     Agcbstack_t *cb;		/* user and system callback function stacks */
-//     unsigned char callbacks_enabled;	/* issue user callbacks or hold them? */
-//     Dict_t *lookup_by_name[3];
-//     Dict_t *lookup_by_id[3];
-// };
\ No newline at end of file
diff --git a/src/h/Agclos_t.java b/src/h/Agclos_t.java
deleted file mode 100644
index 406608b..0000000
--- a/src/h/Agclos_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 b7spmxawwjlyako5bvwhmto82
-
-public interface Agclos_t extends Agclos_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agclos_s Agclos_t");
-}
-
-// typedef struct Agclos_s Agclos_t;
\ No newline at end of file
diff --git a/src/h/Agcmpedge_t.java b/src/h/Agcmpedge_t.java
deleted file mode 100644
index 8b449f2..0000000
--- a/src/h/Agcmpedge_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 aaoij3s9ltd2qv1eegfydx2a3
-
-public interface Agcmpedge_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agcmpedge_s",
-"{",
-"Agrec_t hdr",
-"save_stack_t stack[2]",
-"}",
-"Agcmpedge_t");
-}
-
-// typedef struct Agcmpedge_s {
-//     Agrec_t hdr;
-//     save_stack_t stack[2];	/* IN and OUT save stacks */
-// } Agcmpedge_t;
\ No newline at end of file
diff --git a/src/h/Agcmpgraph_t.java b/src/h/Agcmpgraph_t.java
deleted file mode 100644
index f0f8527..0000000
--- a/src/h/Agcmpgraph_t.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 5vqgch0hhxdt8uyrsm383989v
-
-public interface Agcmpgraph_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agcmpgraph_s",
-"{",
-"Agrec_t hdr",
-"Agnode_t *node",
-"Dict_t *hidden_node_set",
-"}",
-"Agcmpgraph_t");
-}
-
-// typedef struct Agcmpgraph_s {
-//     Agrec_t hdr;
-//     Agnode_t *node;		/* its associated node */
-//     Dict_t *hidden_node_set;
-// } Agcmpgraph_t;
\ No newline at end of file
diff --git a/src/h/Agcmpnode_t.java b/src/h/Agcmpnode_t.java
deleted file mode 100644
index ff320a3..0000000
--- a/src/h/Agcmpnode_t.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 cym8pkipa9u10pg85jps0y6fj
-
-public interface Agcmpnode_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agcmpnode_s",
-"{",
-"Agrec_t hdr",
-"Agraph_t *subg",
-"int collapsed",
-"}",
-"Agcmpnode_t");
-}
-
-// typedef struct Agcmpnode_s {
-//     Agrec_t hdr;
-//     Agraph_t *subg;
-//     int collapsed;
-// } Agcmpnode_t;
\ No newline at end of file
diff --git a/src/h/Agdatadict_s.java b/src/h/Agdatadict_s.java
deleted file mode 100644
index 7917834..0000000
--- a/src/h/Agdatadict_s.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 1wbtv41cwqamseppeo0vb4kjf
-
-public interface Agdatadict_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agdatadict_s",
-"{",
-"Agrec_t h",
-"struct",
-"{",
-"Dict_t *n, *e, *g",
-"}",
-"dict",
-"}");
-}
-
-// struct Agdatadict_s {		/* set of dictionaries per graph */
-//     Agrec_t h;			/* installed in list of graph recs */
-//     struct {
-// 	Dict_t *n, *e, *g;
-//     } dict;
-// };
\ No newline at end of file
diff --git a/src/h/Agdatadict_t.java b/src/h/Agdatadict_t.java
deleted file mode 100644
index 89bbcca..0000000
--- a/src/h/Agdatadict_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 cx24b8rdaygr5mrcvg063ostp
-
-public interface Agdatadict_t extends Agdatadict_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agdatadict_s Agdatadict_t");
-}
-
-// typedef struct Agdatadict_s Agdatadict_t;
\ No newline at end of file
diff --git a/src/h/Agdesc_s.java b/src/h/Agdesc_s.java
deleted file mode 100644
index 90dc7a1..0000000
--- a/src/h/Agdesc_s.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 drqmj6wswekevi9i4ghve61wj
-
-public interface Agdesc_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agdesc_s",
-"{",
-"unsigned directed:1",
-"unsigned strict:1",
-"unsigned no_loop:1",
-"unsigned maingraph:1",
-"unsigned flatlock:1",
-"unsigned no_write:1",
-"unsigned has_attrs:1",
-"unsigned has_cmpnd:1",
-"}");
-}
-
-// struct Agdesc_s {		/* graph descriptor */
-//     unsigned directed:1;	/* if edges are asymmetric */
-//     unsigned strict:1;		/* if multi-edges forbidden */
-//     unsigned no_loop:1;		/* if no loops */
-//     unsigned maingraph:1;	/* if this is the top level graph */
-//     unsigned flatlock:1;	/* if sets are flattened into lists in cdt */
-//     unsigned no_write:1;	/* if a temporary subgraph */
-//     unsigned has_attrs:1;	/* if string attr tables should be initialized */
-//     unsigned has_cmpnd:1;	/* if may contain collapsed nodes */
-// };
\ No newline at end of file
diff --git a/src/h/Agdesc_t.java b/src/h/Agdesc_t.java
deleted file mode 100644
index f41ef97..0000000
--- a/src/h/Agdesc_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 2nxdbvy3uxd7hzq9yspewhiy2
-
-public interface Agdesc_t extends Agdesc_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agdesc_s Agdesc_t");
-}
-
-// typedef struct Agdesc_s Agdesc_t;
\ No newline at end of file
diff --git a/src/h/Agdisc_s.java b/src/h/Agdisc_s.java
deleted file mode 100644
index 92b113d..0000000
--- a/src/h/Agdisc_s.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 88aohxn7kudu5j4oxbyvcxvz9
-
-public interface Agdisc_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agdisc_s",
-"{",
-"Agmemdisc_t *mem",
-"Agiddisc_t *id",
-"Agiodisc_t *io",
-"}");
-}
-
-// struct Agdisc_s {		/* user's discipline */
-//     Agmemdisc_t *mem;
-//     Agiddisc_t *id;
-//     Agiodisc_t *io;
-// };
\ No newline at end of file
diff --git a/src/h/Agdisc_t.java b/src/h/Agdisc_t.java
deleted file mode 100644
index 70fc7c1..0000000
--- a/src/h/Agdisc_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 a75fiuk7wedgsbsb3dymg9c1c
-
-public interface Agdisc_t extends Agdisc_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agdisc_s Agdisc_t");
-}
-
-// typedef struct Agdisc_s Agdisc_t;
\ No newline at end of file
diff --git a/src/h/Agdstate_t.java b/src/h/Agdstate_t.java
deleted file mode 100644
index c2242c9..0000000
--- a/src/h/Agdstate_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 5kp1ggrs1pvfbdfrnl42a1l69
-
-public interface Agdstate_t extends Agdstate_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agdstate_s Agdstate_t");
-}
-
-// typedef struct Agdstate_s Agdstate_t;
\ No newline at end of file
diff --git a/src/h/Agedge_s.java b/src/h/Agedge_s.java
deleted file mode 100644
index dcdf5a6..0000000
--- a/src/h/Agedge_s.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 5g85sn734cnzkqf8sdgtdesgl
-
-public interface Agedge_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agedge_s",
-"{",
-"Agobj_t base",
-"Dtlink_t id_link",
-"Dtlink_t seq_link",
-"Agnode_t *node",
-"}");
-}
-
-// struct Agedge_s {
-//     Agobj_t base;
-//     Dtlink_t id_link;		/* main graph only */
-//     Dtlink_t seq_link;
-//     Agnode_t *node;		/* the endpoint node */
-// };
\ No newline at end of file
diff --git a/src/h/Agedge_t.java b/src/h/Agedge_t.java
deleted file mode 100644
index 3496435..0000000
--- a/src/h/Agedge_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 at817e3s1icc92sqipan1gjl9
-
-public interface Agedge_t extends Agedge_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agedge_s Agedge_t");
-}
-
-// typedef struct Agedge_s Agedge_t;
\ No newline at end of file
diff --git a/src/h/Agedgeinfo_t.java b/src/h/Agedgeinfo_t.java
deleted file mode 100644
index 856f5a9..0000000
--- a/src/h/Agedgeinfo_t.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 c1b3tf6cmbwk2cvu1u6j2rduc
-
-public interface Agedgeinfo_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agedgeinfo_t",
-"{",
-"Agrec_t hdr",
-"splines *spl",
-"port tail_port, head_port",
-"textlabel_t *label, *head_label, *tail_label, *xlabel",
-"char edge_type",
-"char adjacent",
-"char label_ontop",
-"unsigned char gui_state",
-"edge_t *to_orig",
-"void *alg",
-"double factor",
-"double dist",
-"Ppolyline_t path",
-"unsigned char showboxes",
-"boolean conc_opp_flag",
-"short xpenalty",
-"int weight",
-"int cutvalue, tree_index",
-"short count",
-"unsigned short minlen",
-"edge_t *to_virt",
-"}",
-"Agedgeinfo_t");
-}
-
-// typedef struct Agedgeinfo_t {
-// 	Agrec_t hdr;
-// 	splines *spl;
-// 	port tail_port, head_port;
-// 	textlabel_t *label, *head_label, *tail_label, *xlabel;
-// 	char edge_type;
-// 	char adjacent;          /* true for flat edge with adjacent nodes */
-// 	char label_ontop;
-// 	unsigned char gui_state; /* Edge state for GUI ops */
-// 	edge_t *to_orig;	/* for dot's shapes.c    */
-// 	void *alg;
-// 
-// 
-// 	double factor;
-// 	double dist;
-// 	Ppolyline_t path;
-// 
-// 
-// 	unsigned char showboxes;
-// 	boolean conc_opp_flag;
-// 	short xpenalty;
-// 	int weight;
-// 	int cutvalue, tree_index;
-// 	short count;
-// 	unsigned short minlen;
-// 	edge_t *to_virt;
-// 
-//     } Agedgeinfo_t;
\ No newline at end of file
diff --git a/src/h/Agedgepair_s.java b/src/h/Agedgepair_s.java
deleted file mode 100644
index e38067d..0000000
--- a/src/h/Agedgepair_s.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 57xqkv3rhmm29ure1eqi4xjwm
-
-public interface Agedgepair_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agedgepair_s",
-"{",
-"Agedge_t out, in",
-"}");
-}
-
-// struct Agedgepair_s {
-//     Agedge_t out, in;
-// };
\ No newline at end of file
diff --git a/src/h/Agedgepair_t.java b/src/h/Agedgepair_t.java
deleted file mode 100644
index 18d5277..0000000
--- a/src/h/Agedgepair_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 9y2h3138nynj283jcxucqmaib
-
-public interface Agedgepair_t extends Agedgepair_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agedgepair_s Agedgepair_t");
-}
-
-// typedef struct Agedgepair_s Agedgepair_t;
\ No newline at end of file
diff --git a/src/h/Agiddisc_s.java b/src/h/Agiddisc_s.java
deleted file mode 100644
index 751bc95..0000000
--- a/src/h/Agiddisc_s.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 9v8qggm3xqq7ok84lmnkhvpv8
-
-public interface Agiddisc_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agiddisc_s",
-"{",
-"void *(*open) (Agraph_t * g, Agdisc_t*)",
-"long (*map) (void *state, int objtype, char *str, unsigned long *id,    int createflag)",
-"long (*alloc) (void *state, int objtype, unsigned long id)",
-"void (*free) (void *state, int objtype, unsigned long id)",
-"char *(*print) (void *state, int objtype, unsigned long id)",
-"void (*close) (void *state)",
-"void (*idregister) (void *state, int objtype, void *obj)",
-"}");
-}
-
-// struct Agiddisc_s {		/* object ID allocator */
-//     void *(*open) (Agraph_t * g, Agdisc_t*);	/* associated with a graph */
-//     long (*map) (void *state, int objtype, char *str, unsigned long *id,
-// 		 int createflag);
-//     long (*alloc) (void *state, int objtype, unsigned long id);
-//     void (*free) (void *state, int objtype, unsigned long id);
-//     char *(*print) (void *state, int objtype, unsigned long id);
-//     void (*close) (void *state);
-//     void (*idregister) (void *state, int objtype, void *obj);
-// };
\ No newline at end of file
diff --git a/src/h/Agiddisc_t.java b/src/h/Agiddisc_t.java
deleted file mode 100644
index 8cf33cc..0000000
--- a/src/h/Agiddisc_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 7fbm9w57ywtqk4kw5c3z6zwm1
-
-public interface Agiddisc_t extends Agiddisc_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agiddisc_s Agiddisc_t");
-}
-
-// typedef struct Agiddisc_s Agiddisc_t;
\ No newline at end of file
diff --git a/src/h/Agiodisc_t.java b/src/h/Agiodisc_t.java
deleted file mode 100644
index 6d93a30..0000000
--- a/src/h/Agiodisc_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 63k1fn4amvhaud4remizhg2ks
-
-public interface Agiodisc_t extends Agiodisc_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agiodisc_s Agiodisc_t");
-}
-
-// typedef struct Agiodisc_s Agiodisc_t;
\ No newline at end of file
diff --git a/src/h/Agmemdisc_s.java b/src/h/Agmemdisc_s.java
deleted file mode 100644
index 07d7360..0000000
--- a/src/h/Agmemdisc_s.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 366ph8t7jvjosq0zlqhb1g26x
-
-public interface Agmemdisc_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agmemdisc_s",
-"{",
-"void *(*open) (Agdisc_t*)",
-"void *(*alloc) (void *state, size_t req)",
-"void *(*resize) (void *state, void *ptr, size_t old, size_t req)",
-"void (*free) (void *state, void *ptr)",
-"void (*close) (void *state)",
-"}");
-}
-
-// struct Agmemdisc_s {		/* memory allocator */
-//     void *(*open) (Agdisc_t*);	/* independent of other resources */
-//     void *(*alloc) (void *state, size_t req);
-//     void *(*resize) (void *state, void *ptr, size_t old, size_t req);
-//     void (*free) (void *state, void *ptr);
-//     void (*close) (void *state);
-// };
\ No newline at end of file
diff --git a/src/h/Agmemdisc_t.java b/src/h/Agmemdisc_t.java
deleted file mode 100644
index d4f2916..0000000
--- a/src/h/Agmemdisc_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 e2u8m7bby3ay236un81y217mm
-
-public interface Agmemdisc_t extends Agmemdisc_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agmemdisc_s Agmemdisc_t");
-}
-
-// typedef struct Agmemdisc_s Agmemdisc_t;
\ No newline at end of file
diff --git a/src/h/Agnode_s.java b/src/h/Agnode_s.java
deleted file mode 100644
index 5239c0e..0000000
--- a/src/h/Agnode_s.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 5h58ys5dc8q21vir1hk2r7xr7
-
-public interface Agnode_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agnode_s",
-"{",
-"Agobj_t base",
-"Agraph_t *root",
-"Agsubnode_t mainsub",
-"}");
-}
-
-// struct Agnode_s {
-//     Agobj_t base;
-//     Agraph_t *root;
-//     Agsubnode_t mainsub;	/* embedded for main graph */
-// };
\ No newline at end of file
diff --git a/src/h/Agnode_t.java b/src/h/Agnode_t.java
deleted file mode 100644
index ec5df3d..0000000
--- a/src/h/Agnode_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 8eeq5jtusu1u57hjz90nc9i9m
-
-public interface Agnode_t extends Agnode_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agnode_s Agnode_t");
-}
-
-// typedef struct Agnode_s Agnode_t;
\ No newline at end of file
diff --git a/src/h/Agnodeinfo_t.java b/src/h/Agnodeinfo_t.java
deleted file mode 100644
index 2485c79..0000000
--- a/src/h/Agnodeinfo_t.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 da1kcmh9tvz6n7xaqw78dn4h8
-
-public interface Agnodeinfo_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agnodeinfo_t",
-"{",
-"Agrec_t hdr",
-"shape_desc *shape",
-"void *shape_info",
-"pointf coord",
-"double width, height",
-"boxf bb",
-"double ht, lw, rw",
-"textlabel_t *label",
-"textlabel_t *xlabel",
-"void *alg",
-"char state",
-"unsigned char gui_state",
-"boolean clustnode",
-"unsigned char pinned",
-"int id, heapindex, hops",
-"double *pos, dist",
-"unsigned char showboxes",
-"boolean  has_port",
-"node_t* rep",
-"node_t *set",
-"char node_type, mark, onstack",
-"char ranktype, weight_class",
-"node_t *next, *prev",
-"elist in, out, flat_out, flat_in, other",
-"graph_t *clust",
-"int UF_size",
-"node_t *UF_parent",
-"node_t *inleaf, *outleaf",
-"int rank, order",
-"double mval",
-"elist save_in, save_out",
-"elist tree_in, tree_out",
-"edge_t *par",
-"int low, lim",
-"int priority",
-"double pad[1]",
-"}",
-"Agnodeinfo_t");
-}
-
-// typedef struct Agnodeinfo_t {
-// 	Agrec_t hdr;
-// 	shape_desc *shape;
-// 	void *shape_info;
-// 	pointf coord;
-// 	double width, height;  /* inches */
-// 	boxf bb;
-// 	double ht, lw, rw;
-// 	textlabel_t *label;
-// 	textlabel_t *xlabel;
-// 	void *alg;
-// 	char state;
-// 	unsigned char gui_state; /* Node state for GUI ops */
-// 	boolean clustnode;
-// 
-// 
-// 	unsigned char pinned;
-// 	int id, heapindex, hops;
-// 	double *pos, dist;
-// 
-// 
-// 	unsigned char showboxes;
-// 	boolean  has_port;
-// 	node_t* rep;
-// 	node_t *set;
-// 
-// 	/* fast graph */
-// 	char node_type, mark, onstack;
-// 	char ranktype, weight_class;
-// 	node_t *next, *prev;
-// 	elist in, out, flat_out, flat_in, other;
-// 	graph_t *clust;
-// 
-// 	/* for union-find and collapsing nodes */
-// 	int UF_size;
-// 	node_t *UF_parent;
-// 	node_t *inleaf, *outleaf;
-// 
-// 	/* for placing nodes */
-// 	int rank, order;	/* initially, order = 1 for ordered edges */
-// 	double mval;
-// 	elist save_in, save_out;
-// 
-// 	/* for network-simplex */
-// 	elist tree_in, tree_out;
-// 	edge_t *par;
-// 	int low, lim;
-// 	int priority;
-// 
-// 	double pad[1];
-// 
-// 
-//     } Agnodeinfo_t;
\ No newline at end of file
diff --git a/src/h/Agobj_s.java b/src/h/Agobj_s.java
deleted file mode 100644
index fa02077..0000000
--- a/src/h/Agobj_s.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 7fv7yqhmqaa7u2qszrcz1x603
-
-public interface Agobj_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agobj_s",
-"{",
-"Agtag_t tag",
-"Agrec_t *data",
-"}");
-}
-
-// struct Agobj_s {
-//     Agtag_t tag;
-//     Agrec_t *data;
-// };
\ No newline at end of file
diff --git a/src/h/Agobj_t.java b/src/h/Agobj_t.java
deleted file mode 100644
index 5392fe8..0000000
--- a/src/h/Agobj_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 cxj639s7ndfjcf3ku07ins96y
-
-public interface Agobj_t extends Agobj_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agobj_s Agobj_t");
-}
-
-// typedef struct Agobj_s Agobj_t;
\ No newline at end of file
diff --git a/src/h/Agraph_s.java b/src/h/Agraph_s.java
deleted file mode 100644
index 09e993a..0000000
--- a/src/h/Agraph_s.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 5ho0f0m8hitlfq9j032lww947
-
-public interface Agraph_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agraph_s",
-"{",
-"Agobj_t base",
-"Agdesc_t desc",
-"Dtlink_t link",
-"Dict_t *n_seq",
-"Dict_t *n_id",
-"Dict_t *e_seq, *e_id",
-"Dict_t *g_dict",
-"Agraph_t *parent, *root",
-"Agclos_t *clos",
-"}");
-}
-
-// struct Agraph_s {
-//     Agobj_t base;
-//     Agdesc_t desc;
-//     Dtlink_t link;
-//     Dict_t *n_seq;		/* the node set in sequence */
-//     Dict_t *n_id;		/* the node set indexed by ID */
-//     Dict_t *e_seq, *e_id;	/* holders for edge sets */
-//     Dict_t *g_dict;		/* subgraphs - descendants */
-//     Agraph_t *parent, *root;	/* subgraphs - ancestors */
-//     Agclos_t *clos;		/* shared resources */
-// };
\ No newline at end of file
diff --git a/src/h/Agraph_t.java b/src/h/Agraph_t.java
deleted file mode 100644
index 062c4ae..0000000
--- a/src/h/Agraph_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 aqw3i7b3unkie2w709gyzy18f
-
-public interface Agraph_t extends Agraph_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agraph_s Agraph_t");
-}
-
-// typedef struct Agraph_s Agraph_t;
\ No newline at end of file
diff --git a/src/h/Agraphinfo_t.java b/src/h/Agraphinfo_t.java
deleted file mode 100644
index e4c1559..0000000
--- a/src/h/Agraphinfo_t.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 2mtqmob86ayzjvuxgvhlg4ctl
-
-public interface Agraphinfo_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agraphinfo_t",
-"{",
-"Agrec_t hdr",
-"layout_t *drawing",
-"textlabel_t *label",
-"boxf bb",
-"pointf border[4]",
-"unsigned char gui_state",
-"unsigned char has_labels",
-"boolean has_images",
-"unsigned char charset",
-"int rankdir",
-"double ht1, ht2",
-"unsigned short flags",
-"void *alg",
-"GVC_t *gvc",
-"void (*cleanup) (graph_t * g)",
-"node_t **neato_nlist",
-"int move",
-"double **dist, **spring, **sum_t, ***t",
-"unsigned short ndim",
-"unsigned short odim",
-"int n_cluster",
-"graph_t **clust",
-"graph_t *dotroot",
-"node_t *nlist",
-"rank_t *rank",
-"graph_t *parent",
-"int level",
-"node_t *minrep, *maxrep",
-"nlist_t comp",
-"node_t *minset, *maxset",
-"long n_nodes",
-"short minrank, maxrank",
-"boolean has_flat_edges",
-"boolean has_sourcerank",
-"boolean has_sinkrank",
-"unsigned char showboxes",
-"fontname_kind fontnames",
-"int nodesep, ranksep",
-"node_t *ln, *rn",
-"node_t *leader, **rankleader",
-"boolean expanded",
-"char installed",
-"char set_type",
-"char label_pos",
-"boolean exact_ranksep",
-"}",
-"Agraphinfo_t");
-}
-
-// typedef struct Agraphinfo_t {
-// 	Agrec_t hdr;
-// 	/* to generate code */
-// 	layout_t *drawing;
-// 	textlabel_t *label;	/* if the cluster has a title */
-// 	boxf bb;			/* bounding box */
-// 	pointf border[4];	/* sizes of margins for graph labels */
-// 	unsigned char gui_state; /* Graph state for GUI ops */
-// 	unsigned char has_labels;
-// 	boolean has_images;
-// 	unsigned char charset; /* input character set */
-// 	int rankdir;
-// 	double ht1, ht2;	/* below and above extremal ranks */
-// 	unsigned short flags;
-// 	void *alg;
-// 	GVC_t *gvc;	/* context for "globals" over multiple graphs */
-// 	void (*cleanup) (graph_t * g);   /* function to deallocate layout-specific data */
-// 
-// 
-// 	/* to place nodes */
-// 	node_t **neato_nlist;
-// 	int move;
-// 	double **dist, **spring, **sum_t, ***t;
-// 	unsigned short ndim;
-// 	unsigned short odim;
-// 
-// 
-// 	/* to have subgraphs */
-// 	int n_cluster;
-// 	graph_t **clust;	/* clusters are in clust[1..n_cluster] !!! */
-// 	graph_t *dotroot;
-// 	node_t *nlist;
-// 	rank_t *rank;
-// 	graph_t *parent;        /* containing cluster (not parent subgraph) */
-// 	int level;		/* cluster nesting level (not node level!) */
-// 	node_t	*minrep, *maxrep;	/* set leaders for min and max rank */
-// 
-// 	/* fast graph node list */
-// 	nlist_t comp;
-// 	/* connected components */
-// 	node_t *minset, *maxset;	/* set leaders */
-// 	long n_nodes;
-// 	/* includes virtual */
-// 	short minrank, maxrank;
-// 
-// 	/* various flags */
-// 	boolean has_flat_edges;
-// 	boolean has_sourcerank;
-// 	boolean has_sinkrank;
-// 	unsigned char	showboxes;
-// 	fontname_kind fontnames;		/* to override mangling in SVG */
-// 
-// 	int nodesep, ranksep;
-// 	node_t *ln, *rn;	/* left, right nodes of bounding box */
-// 
-// 	/* for clusters */
-// 	node_t *leader, **rankleader;
-// 	boolean expanded;
-// 	char installed;
-// 	char set_type;
-// 	char label_pos;
-// 	boolean exact_ranksep;
-// 
-// 
-//     } Agraphinfo_t;
\ No newline at end of file
diff --git a/src/h/Agrec_t.java b/src/h/Agrec_t.java
deleted file mode 100644
index 09ac6df..0000000
--- a/src/h/Agrec_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 6w4pxxbi3ief76hgbmcde192u
-
-public interface Agrec_t extends Agrec_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agrec_s Agrec_t");
-}
-
-// typedef struct Agrec_s Agrec_t;
\ No newline at end of file
diff --git a/src/h/Agsplice_arg_t.java b/src/h/Agsplice_arg_t.java
deleted file mode 100644
index ae920ac..0000000
--- a/src/h/Agsplice_arg_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 6utnqddi1e85hs0re8q6xa1vy
-
-public interface Agsplice_arg_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agsplice_arg_s",
-"{",
-"int head_side",
-"Agnode_t *target",
-"}",
-"Agsplice_arg_t");
-}
-
-// typedef struct Agsplice_arg_s {
-//     int head_side;
-//     Agnode_t *target;
-// } Agsplice_arg_t;
\ No newline at end of file
diff --git a/src/h/Agsubnode_s.java b/src/h/Agsubnode_s.java
deleted file mode 100644
index 1de80e7..0000000
--- a/src/h/Agsubnode_s.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 eykrclzau59zmxissqegaiilg
-
-public interface Agsubnode_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agsubnode_s",
-"{",
-"Dtlink_t seq_link",
-"Dtlink_t id_link",
-"Agnode_t *node",
-"Dtlink_t *in_id, *out_id",
-"Dtlink_t *in_seq, *out_seq",
-"}");
-}
-
-// struct Agsubnode_s {		/* the node-per-graph-or-subgraph record */
-//     Dtlink_t seq_link;		/* must be first */
-//     Dtlink_t id_link;
-//     Agnode_t *node;		/* the object */
-//     Dtlink_t *in_id, *out_id;	/* by node/ID for random access */
-//     Dtlink_t *in_seq, *out_seq;	/* by node/sequence for serial access */
-// };
\ No newline at end of file
diff --git a/src/h/Agsubnode_t.java b/src/h/Agsubnode_t.java
deleted file mode 100644
index 6283c70..0000000
--- a/src/h/Agsubnode_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 df23022lk4w8conzi4uihoqpu
-
-public interface Agsubnode_t extends Agsubnode_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agsubnode_s Agsubnode_t");
-}
-
-// typedef struct Agsubnode_s Agsubnode_t;
\ No newline at end of file
diff --git a/src/h/Agsym_t.java b/src/h/Agsym_t.java
deleted file mode 100644
index 11085e5..0000000
--- a/src/h/Agsym_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 c6lodtp6m9o7i924kguh8py09
-
-public interface Agsym_t extends Agsym_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agsym_s Agsym_t");
-}
-
-// typedef struct Agsym_s Agsym_t;
\ No newline at end of file
diff --git a/src/h/Agtag_s.java b/src/h/Agtag_s.java
deleted file mode 100644
index 4b51753..0000000
--- a/src/h/Agtag_s.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 f4eovs59su6ztmd1h9rq229c2
-
-public interface Agtag_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agtag_s",
-"{",
-"unsigned objtype:2",
-"unsigned mtflock:1",
-"unsigned attrwf:1",
-"unsigned seq:(sizeof(unsigned) * 8 - 4)",
-"unsigned long id",
-"}");
-}
-
-// struct Agtag_s {
-//     unsigned objtype:2;		/* see literal tags below */
-//     unsigned mtflock:1;		/* move-to-front lock, see above */
-//     unsigned attrwf:1;		/* attrs written (parity, write.c) */
-//     unsigned seq:(sizeof(unsigned) * 8 - 4);	/* sequence no. */
-//     unsigned long id;		/* client  ID */
-// };
\ No newline at end of file
diff --git a/src/h/Agtag_t.java b/src/h/Agtag_t.java
deleted file mode 100644
index bd48d3e..0000000
--- a/src/h/Agtag_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 bfyeakqg0xg9gqt8ssajorir5
-
-public interface Agtag_t extends Agtag_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agtag_s Agtag_t");
-}
-
-// typedef struct Agtag_s Agtag_t;
\ No newline at end of file
diff --git a/src/h/BestPos_t.java b/src/h/BestPos_t.java
deleted file mode 100644
index 9b8a0e2..0000000
--- a/src/h/BestPos_t.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 42vrsrrzqoc36nrw8vum1390l
-
-public interface BestPos_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct best_p_s",
-"{",
-"int n",
-"double area",
-"pointf pos",
-"}",
-"BestPos_t");
-}
-
-// typedef struct best_p_s {
-//     int n;
-//     double area;
-//     pointf pos;
-// } BestPos_t;
\ No newline at end of file
diff --git a/src/h/Dict_t.java b/src/h/Dict_t.java
deleted file mode 100644
index 4ae7d5f..0000000
--- a/src/h/Dict_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 2ggfcdw1rvmiwttzvdn3ew5b9
-
-public interface Dict_t extends _dt_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct _dt_s  Dict_t");
-}
-
-// typedef struct _dt_s		Dict_t;
\ No newline at end of file
diff --git a/src/h/Dt_t.java b/src/h/Dt_t.java
deleted file mode 100644
index f7e44a1..0000000
--- a/src/h/Dt_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 u1i3hxdborawdyw7d778quhw
-
-public interface Dt_t extends _dt_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct _dt_s  Dt_t");
-}
-
-// typedef struct _dt_s		Dt_t;
\ No newline at end of file
diff --git a/src/h/Dtdata_t.java b/src/h/Dtdata_t.java
deleted file mode 100644
index 2faee9a..0000000
--- a/src/h/Dtdata_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 864wtxvrdrty5k31pa1h7jqki
-
-public interface Dtdata_t extends _dtdata_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct _dtdata_s Dtdata_t");
-}
-
-// typedef struct _dtdata_s	Dtdata_t;
\ No newline at end of file
diff --git a/src/h/Dtdisc_t.java b/src/h/Dtdisc_t.java
deleted file mode 100644
index 9405bdc..0000000
--- a/src/h/Dtdisc_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 3n3lg4dzicyo9pzjj6bv0krf5
-
-public interface Dtdisc_t extends _dtdisc_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct _dtdisc_s Dtdisc_t");
-}
-
-// typedef struct _dtdisc_s	Dtdisc_t;
\ No newline at end of file
diff --git a/src/h/Dthold_t.java b/src/h/Dthold_t.java
deleted file mode 100644
index 3d6fdb5..0000000
--- a/src/h/Dthold_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 1tob3f90syune1bxwbffctfmj
-
-public interface Dthold_t extends _dthold_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct _dthold_s Dthold_t");
-}
-
-// typedef struct _dthold_s	Dthold_t;
\ No newline at end of file
diff --git a/src/h/Dtlink_t.java b/src/h/Dtlink_t.java
deleted file mode 100644
index 4f47de7..0000000
--- a/src/h/Dtlink_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 8y38rtlesz0zzh2ncgic680by
-
-public interface Dtlink_t extends _dtlink_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct _dtlink_s Dtlink_t");
-}
-
-// typedef struct _dtlink_s	Dtlink_t;
\ No newline at end of file
diff --git a/src/h/Dtmethod_t.java b/src/h/Dtmethod_t.java
deleted file mode 100644
index 97cd270..0000000
--- a/src/h/Dtmethod_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 14xcg8o7gvv98a59xu3dtokd
-
-public interface Dtmethod_t extends _dtmethod_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct _dtmethod_s Dtmethod_t");
-}
-
-// typedef struct _dtmethod_s	Dtmethod_t;
\ No newline at end of file
diff --git a/src/h/GVC_s.java b/src/h/GVC_s.java
deleted file mode 100644
index 679b685..0000000
--- a/src/h/GVC_s.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 clpjw996k49ieh47hl09lwwq1
-
-public interface GVC_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct GVC_s",
-"{",
-"GVCOMMON_t common",
-"char *config_path",
-"boolean config_found",
-"char **input_filenames",
-"GVG_t *gvgs",
-"GVG_t *gvg",
-"gvplugin_available_t *apis[ +1 +1 +1 +1 +1 ]",
-"gvplugin_available_t *api[ +1 +1 +1 +1 +1 ]",
-"gvplugin_package_t *packages",
-"size_t (*write_fn) (GVJ_t *job, const char *s, size_t len)",
-"Dtdisc_t textfont_disc",
-"Dt_t *textfont_dt",
-"gvplugin_active_textlayout_t textlayout",
-"GVJ_t *jobs",
-"GVJ_t *job",
-"graph_t *g",
-"gvplugin_active_layout_t layout",
-"char *graphname",
-"GVJ_t *active_jobs",
-"char *pagedir",
-"pointf margin",
-"pointf pad",
-"pointf pageSize",
-"point pb",
-"boxf bb",
-"int rotation",
-"boolean graph_sets_pad, graph_sets_margin, graph_sets_pageSize, graph_sets_rotation",
-"char *layerDelims",
-"char *layerListDelims",
-"char *layers",
-"char **layerIDs",
-"int numLayers",
-"int *layerlist",
-"char *defaultfontname",
-"double defaultfontsize",
-"char **defaultlinestyle",
-"gvcolor_t bgcolor",
-"int fontrenaming",
-"}");
-}
-
-// struct GVC_s {
-// 	GVCOMMON_t common;
-// 
-// 	char *config_path;
-// 	boolean config_found;
-// 
-// 	/* gvParseArgs */
-// 	char **input_filenames; /* null terminated array of input filenames */
-// 
-// 	/* gvNextInputGraph() */
-// 	GVG_t *gvgs;	/* linked list of graphs */
-// 	GVG_t *gvg;	/* current graph */
-// 
-// 	/* plugins */
-// 
-// 	/* APIS expands to "+1 +1 ... +1" to give the number of APIs */
-// 	gvplugin_available_t *apis[ +1 +1 +1 +1 +1 ]; /* array of linked-list of plugins per api */
-// 	gvplugin_available_t *api[ +1 +1 +1 +1 +1 ];  /* array of current plugins per api */
-// 
-// 	gvplugin_package_t *packages;   /* list of available packages */
-// 
-//         /* externally provided write() displine */
-// 	size_t (*write_fn) (GVJ_t *job, const char *s, size_t len);
-// 
-// 	/* fonts and textlayout */
-// 	Dtdisc_t textfont_disc;
-// 	Dt_t *textfont_dt;
-// 	gvplugin_active_textlayout_t textlayout; /* always use best avail for all jobs */
-// //	void (*free_layout) (void *layout);   /* function for freeing layouts (mostly used by pango) */
-// 	
-// /* FIXME - everything below should probably move to GVG_t */
-// 
-// 	/* gvrender_config() */
-// 	GVJ_t *jobs;	/* linked list of jobs */
-// 	GVJ_t *job;	/* current job */
-// 
-// 	graph_t *g;      /* current graph */
-// 
-// 	/* gvrender_begin_job() */
-// 	gvplugin_active_layout_t layout;
-// 
-// 	char *graphname;	/* name from graph */
-// 	GVJ_t *active_jobs;   /* linked list of active jobs */
-// 
-// 	/* pagination */
-// 	char *pagedir;		/* pagination order */
-// 	pointf margin;		/* margins in graph units */
-// 	pointf pad;		/* pad in graph units */
-// 	pointf pageSize;	/* pageSize in graph units, not including margins */
-// 	point pb;		/* page size - including margins (inches) */
-// 	boxf bb;		/* graph bb in graph units, not including margins */
-// 	int rotation;		/* rotation - 0 = portrait, 90 = landscape */
-// 	boolean graph_sets_pad, graph_sets_margin, graph_sets_pageSize, graph_sets_rotation;
-// 
-// 	/* layers */
-// 	char *layerDelims;	/* delimiters in layer names */
-// 	char *layerListDelims;	/* delimiters between layer ranges */ 
-// 	char *layers;		/* null delimited list of layer names */
-// 	char **layerIDs;	/* array of layer names */
-// 	int numLayers;		/* number of layers */
-// 	int *layerlist;
-// 
-// 	/* default font */
-// 	char *defaultfontname;
-// 	double defaultfontsize;
-// 
-// 	/* default line style */
-// 	char **defaultlinestyle;
-// 
-// 	/* render defaults set from graph */
-// 	gvcolor_t bgcolor;	/* background color */
-// 
-// 	/* whether to mangle font names (at least in SVG), usually false */
-// 	int fontrenaming;
-//     };
\ No newline at end of file
diff --git a/src/h/GVC_t.java b/src/h/GVC_t.java
deleted file mode 100644
index 1491e41..0000000
--- a/src/h/GVC_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 fg8z912mbk6t13fn38q7zn7l
-
-public interface GVC_t extends GVC_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct GVC_s GVC_t");
-}
-
-// typedef struct GVC_s GVC_t;
\ No newline at end of file
diff --git a/src/h/GVG_s.java b/src/h/GVG_s.java
deleted file mode 100644
index 9d0caa3..0000000
--- a/src/h/GVG_s.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 cvpkcmk8fwmnuwmcjl85zzkxc
-
-public interface GVG_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct GVG_s",
-"{",
-"GVC_t *gvc",
-"GVG_t *next",
-"char *input_filename",
-"int graph_index",
-"graph_t *g",
-"}");
-}
-
-// struct GVG_s {
-// 	GVC_t *gvc;	/* parent gvc */
-// 	GVG_t *next;	/* next gvg in list */
-// 
-// 	char *input_filename; /* or NULL if stdin */
-// 	int graph_index;  /* index of graph within input_file */
-// 	graph_t *g;
-//     };
\ No newline at end of file
diff --git a/src/h/GVG_t.java b/src/h/GVG_t.java
deleted file mode 100644
index 6df79f6..0000000
--- a/src/h/GVG_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 3h2jjekexv13eg90o5lqy1d0j
-
-public interface GVG_t extends GVG_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct GVG_s GVG_t");
-}
-
-// typedef struct GVG_s GVG_t;
\ No newline at end of file
diff --git a/src/h/GVJ_s.java b/src/h/GVJ_s.java
deleted file mode 100644
index 37a1f53..0000000
--- a/src/h/GVJ_s.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 dg8cqsmppn0zl04sycueci9yw
-
-public interface GVJ_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct GVJ_s",
-"{",
-"GVC_t *gvc",
-"GVJ_t *next",
-"GVJ_t *next_active",
-"GVCOMMON_t *common",
-"obj_state_t *obj",
-"char *input_filename",
-"int graph_index",
-"const char *layout_type",
-"const char *output_filename",
-"FILE *output_file",
-"char *output_data",
-"unsigned int output_data_allocated",
-"unsigned int output_data_position",
-"const char *output_langname",
-"int output_lang",
-"gvplugin_active_render_t render",
-"gvplugin_active_device_t device",
-"gvplugin_active_loadimage_t loadimage",
-"gvdevice_callbacks_t *callbacks",
-"pointf device_dpi",
-"boolean device_sets_dpi",
-"void *display",
-"int screen",
-"void *context",
-"boolean external_context",
-"char *imagedata",
-"int flags",
-"int numLayers",
-"int layerNum",
-"point  pagesArraySize",
-"point pagesArrayFirst",
-"point pagesArrayMajor",
-"point pagesArrayMinor",
-"point pagesArrayElem",
-"int numPages",
-"boxf    bb",
-"pointf  pad",
-"boxf    clip",
-"boxf pageBox",
-"pointf pageSize",
-"pointf  focus",
-"double  zoom",
-"int rotation",
-"pointf  view",
-"boxf canvasBox",
-"pointf  margin",
-"pointf dpi",
-"unsigned int width",
-"unsigned int height",
-"box     pageBoundingBox",
-"box     boundingBox",
-"pointf  scale",
-"pointf  translation",
-"pointf  devscale",
-"boolean fit_mode,   needs_refresh,   click,   has_grown,   has_been_rendered",
-"unsigned char button",
-"pointf pointer",
-"pointf oldpointer",
-"void *current_obj",
-"void *selected_obj",
-"char *active_tooltip",
-"char *selected_href",
-"gv_argvlist_t selected_obj_type_name",
-"gv_argvlist_t selected_obj_attributes",
-"void *window",
-"gvevent_key_binding_t *keybindings",
-"int numkeys",
-"void *keycodes",
-"}");
-}
-
-// struct GVJ_s {
-// 	GVC_t *gvc;		/* parent gvc */
-// 	GVJ_t *next;		/* linked list of jobs */
-// 	GVJ_t *next_active;	/* linked list of active jobs (e.g. multiple windows) */
-// 
-// 	GVCOMMON_t *common;
-// 
-// 	obj_state_t *obj;	/* objects can be nested (at least clusters can)
-// 					so keep object state on a stack */
-// 	char *input_filename;
-// 	int graph_index;
-// 
-// 	const char *layout_type;
-// 
-// 	const char *output_filename;
-// 	FILE *output_file;
-// 	char *output_data;
-// 	unsigned int output_data_allocated;
-// 	unsigned int output_data_position;
-// 
-// 	const char *output_langname;
-// 	int output_lang;
-// 
-// 	gvplugin_active_render_t render;
-// 	gvplugin_active_device_t device;
-// 	gvplugin_active_loadimage_t loadimage;
-// 	gvdevice_callbacks_t *callbacks;
-// 	pointf device_dpi;
-// 	boolean device_sets_dpi;
-// 
-// 	void *display;
-// 	int screen;
-// 
-// 	void *context;		/* gd or cairo surface */
-// 	boolean external_context;	/* context belongs to caller */
-// 	char *imagedata;	/* location of imagedata */
-// 
-//         int flags;		/* emit_graph flags */
-// 
-// 	int numLayers;		/* number of layers */
-// 	int layerNum;		/* current layer - 1 based*/
-// 
-// 	point 	pagesArraySize; /* 2D size of page array */
-// 	point	pagesArrayFirst;/* 2D starting corner in */
-// 	point	pagesArrayMajor;/* 2D major increment */
-// 	point	pagesArrayMinor;/* 2D minor increment */
-// 	point	pagesArrayElem; /* 2D coord of current page - 0,0 based */
-//         int	numPages;	/* number of pages */
-// 
-// 	boxf    bb;		/* graph bb with padding - graph units */
-// 	pointf  pad;		/* padding around bb - graph units */
-// 	boxf    clip;		/* clip region in graph units */
-// 	boxf	pageBox;	/* current page in graph units */
-// 	pointf	pageSize;	/* page size in graph units */
-// 	pointf  focus;		/* viewport focus - graph units */
-// 
-// 	double  zoom;		/* viewport zoom factor (points per graph unit) */
-// 	int	rotation;	/* viewport rotation (degrees)  0=portrait, 90=landscape */
-// 
-// 	pointf  view;		/* viewport size - points */
-// 	boxf	canvasBox;	/* viewport area - points */
-//         pointf  margin;		/* job-specific margin - points */
-// 
-// 	pointf	dpi;		/* device resolution device-units-per-inch */
-// 
-//         unsigned int width;     /* device width - device units */
-//         unsigned int height;    /* device height - device units */
-// 	box     pageBoundingBox;/* rotated boundingBox - device units */
-// 	box     boundingBox;    /* cumulative boundingBox over all pages - device units */
-// 
-// 	pointf  scale;		/* composite device to graph units (zoom and dpi) */
-// 	pointf  translation;    /* composite translation */
-// 	pointf  devscale;	/* composite device to points: dpi, y_goes_down */
-// 
-// 	boolean	fit_mode,
-// 		needs_refresh,
-// 		click,
-// 		has_grown,
-// 		has_been_rendered;
-// 
-// 	unsigned char button;   /* active button */
-// 	pointf pointer;		/* pointer position in device units */
-// 	pointf oldpointer;	/* old pointer position in device units */
-// 
-// 	void *current_obj;      /* graph object that pointer is in currently */
-// 
-// 	void *selected_obj;      /* graph object that has been selected */
-// 					/* (e.g. button 1 clicked on current obj) */
-// 	char *active_tooltip;		/* tooltip of active object - or NULL */
-// 	char *selected_href;		/* href of selected object - or NULL */
-// 	gv_argvlist_t selected_obj_type_name; /* (e.g. "edge" "node3" "e" "->" "node5" "") */
-// 	gv_argvlist_t selected_obj_attributes; /* attribute triplets: name, value, type */
-// 				/* e.g. "color", "red", GVATTR_COLOR,
-// 					"style", "filled", GVATTR_BOOL, */
-// 
-// 	void *window;		/* display-specific data for gvrender plugin */
-// 
-//         /* keybindings for keyboard events */
-// 	gvevent_key_binding_t *keybindings;
-// 	int numkeys;
-// 	void *keycodes;
-//     };
\ No newline at end of file
diff --git a/src/h/GVJ_t.java b/src/h/GVJ_t.java
deleted file mode 100644
index 9421980..0000000
--- a/src/h/GVJ_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 1emyokhi9lvf2dq2tz1mt5lq6
-
-public interface GVJ_t extends GVJ_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct GVJ_s GVJ_t");
-}
-
-// typedef struct GVJ_s GVJ_t;
\ No newline at end of file
diff --git a/src/h/HDict_t.java b/src/h/HDict_t.java
deleted file mode 100644
index 6079501..0000000
--- a/src/h/HDict_t.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 d6n85f1kdf00c97r9x4uf3hdy
-
-public interface HDict_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct obyh",
-"{",
-"Dtlink_t link",
-"int key",
-"Leaf_t d",
-"}",
-"HDict_t");
-}
-
-// typedef struct obyh {
-//     Dtlink_t link;
-//     int key;
-//     Leaf_t d;
-// } HDict_t;
\ No newline at end of file
diff --git a/src/h/IMapEntry_t.java b/src/h/IMapEntry_t.java
deleted file mode 100644
index 27cbecd..0000000
--- a/src/h/IMapEntry_t.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 et72dr7wfb74xjns0mtbfof0b
-
-public interface IMapEntry_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct IMapEntry_s",
-"{",
-"Dtlink_t namedict_link",
-"Dtlink_t iddict_link",
-"unsigned long id",
-"char *str",
-"}",
-"IMapEntry_t");
-}
-
-// typedef struct IMapEntry_s {
-//     Dtlink_t namedict_link;
-//     Dtlink_t iddict_link;
-//     unsigned long id;
-//     char *str;
-// } IMapEntry_t;
\ No newline at end of file
diff --git a/src/h/Pedge_t.java b/src/h/Pedge_t.java
deleted file mode 100644
index 78eaa39..0000000
--- a/src/h/Pedge_t.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 2nvsp26kuu9u7ogyjj0s4xc6g
-
-public interface Pedge_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Pedge_t",
-"{",
-"Ppoint_t a, b",
-"}",
-"Pedge_t");
-}
-
-// typedef struct Pedge_t {
-// 	Ppoint_t a, b;
-//     } Pedge_t;
\ No newline at end of file
diff --git a/src/h/Ppoly_t.java b/src/h/Ppoly_t.java
deleted file mode 100644
index 034db5a..0000000
--- a/src/h/Ppoly_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 e64uez8phkm446sopxainj3um
-
-public interface Ppoly_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Ppoly_t",
-"{",
-"Ppoint_t *ps",
-"int pn",
-"}",
-"Ppoly_t");
-}
-
-// typedef struct Ppoly_t {
-// 	Ppoint_t *ps;
-// 	int pn;
-//     } Ppoly_t;
\ No newline at end of file
diff --git a/src/h/RTree.java b/src/h/RTree.java
deleted file mode 100644
index aaed3be..0000000
--- a/src/h/RTree.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 6erg9dnjb8l3vavlty90aui6v
-
-public interface RTree extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct RTree",
-"{",
-"Node_t *root",
-"SplitQ_t split",
-"int MinFill",
-"long ElapsedTime",
-"float UserTime, SystemTime",
-"int Deleting",
-"int StatFlag",
-"int InsertCount",
-"int DeleteCount",
-"int ReInsertCount",
-"int InSplitCount",
-"int DeSplitCount",
-"int ElimCount",
-"int EvalCount",
-"int InTouchCount",
-"int DeTouchCount",
-"int SeTouchCount",
-"int CallCount",
-"float SplitMeritSum",
-"int RectCount",
-"int NodeCount",
-"int LeafCount, NonLeafCount",
-"int EntryCount",
-"int SearchCount",
-"int HitCount",
-"}");
-}
-
-// struct RTree {
-//     Node_t *root;
-// 
-//     SplitQ_t split;
-// 
-//     /* balance criterion for node splitting */
-//     int MinFill;
-// 
-//     /* times */
-//     long ElapsedTime;
-//     float UserTime, SystemTime;
-// 
-//     int Deleting;
-// 
-//     /* variables for statistics */
-//     int StatFlag;		/* tells if we are counting or not */
-//     /* counters affected only when StatFlag set */
-//     int InsertCount;
-//     int DeleteCount;
-//     int ReInsertCount;
-//     int InSplitCount;
-//     int DeSplitCount;
-//     int ElimCount;
-//     int EvalCount;
-//     int InTouchCount;
-//     int DeTouchCount;
-//     int SeTouchCount;
-//     int CallCount;
-//     float SplitMeritSum;
-// 
-//     /* counters used even when StatFlag not set */
-//     int RectCount;
-//     int NodeCount;
-//     int LeafCount, NonLeafCount;
-//     int EntryCount;
-//     int SearchCount;
-//     int HitCount;
-// 
-// };
\ No newline at end of file
diff --git a/src/h/RTree_t.java b/src/h/RTree_t.java
deleted file mode 100644
index e57f8e8..0000000
--- a/src/h/RTree_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 2mpm2fft75drx0k0by8s54asw
-
-public interface RTree_t extends RTree {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct RTree RTree_t");
-}
-
-// typedef struct RTree RTree_t;
\ No newline at end of file
diff --git a/src/h/Rect_t.java b/src/h/Rect_t.java
deleted file mode 100644
index c52979c..0000000
--- a/src/h/Rect_t.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 32vghhci9sc1tdk0jb8p5rlhk
-
-public interface Rect_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Rect",
-"{",
-"int boundary[2*2]",
-"}",
-"Rect_t");
-}
-
-// typedef struct Rect {
-//     int boundary[2*2];
-// } Rect_t;
\ No newline at end of file
diff --git a/src/h/STArray.java b/src/h/STArray.java
deleted file mode 100644
index b09ece6..0000000
--- a/src/h/STArray.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import smetana.core.UnsupportedArrayOfPtr;
-import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__array_of_ptr__;
-import smetana.core.__ptr__;
-import smetana.core.__struct__;
-import smetana.core.size_t;
-import smetana.core.amiga.Area;
-import smetana.core.amiga.StarArrayOfPtr;
-
-public class STArray<O extends UnsupportedStructAndPtr> extends UnsupportedArrayOfPtr {
-
-	private final int pos;
-	private final List<O> list;
-	private final Class clazz;
-
-	public STArray(int pos, List<O> list, Class clazz) {
-		this.pos = pos;
-		this.list = list;
-		this.clazz = clazz;
-	}
-
-	@Override
-	public int comparePointerInternal(__array_of_ptr__ other) {
-		STArray<O> other2 = (STArray<O>) other;
-		if (this.list != other2.list) {
-			throw new IllegalArgumentException();
-		}
-		return this.pos - other2.pos;
-	}
-
-	public STArray(int size, int pos, Class clazz) {
-		this.pos = pos;
-		this.list = new ArrayList<O>();
-		this.clazz = clazz;
-		for (int i = 0; i < size; i++) {
-			try {
-				this.list.add((O) clazz.newInstance());
-			} catch (Exception e) {
-				throw new IllegalStateException(e.toString());
-			}
-		}
-	}
-
-	@Override
-	public void realloc(size_t nb) {
-		realloc(nb.getInternalNb());
-	}
-
-	@Override
-	public void realloc(int nb) {
-		while (list.size() < nb) {
-			try {
-				this.list.add((O) clazz.newInstance());
-			} catch (Exception e) {
-				throw new IllegalStateException(e.toString());
-			}
-		}
-	}
-
-	@Override
-	public __array_of_ptr__ plus(int delta) {
-		return new STArray(pos + delta, this.list, clazz);
-	}
-
-	@Override
-	public __array_of_ptr__ move(int delta) {
-		return new STArray(pos + delta, this.list, clazz);
-	}
-
-	@Override
-	public void setStruct(__struct__ value) {
-		list.get(pos).setStruct(value);
-	}
-
-	@Override
-	public __struct__ getStruct() {
-		return list.get(pos).getStruct();
-		// return list.get(pos);
-	}
-
-	@Override
-	public __struct__ getStruct(String fieldName) {
-		return list.get(pos).getStruct(fieldName);
-	}
-
-	@Override
-	public __ptr__ getPtr() {
-		return list.get(pos).amp();
-	}
-
-	@Override
-	public __ptr__ asPtr() {
-		return new StarArrayOfPtr(this);
-	}
-
-	@Override
-	public void setPtr(__ptr__ value) {
-		list.set(pos, (O) value.getStruct());
-	}
-
-	@Override
-	public Area getInternal(final int idx) {
-		return list.get(pos + idx);
-	}
-
-}
diff --git a/src/h/ST_Agattr_s.java b/src/h/ST_Agattr_s.java
index 31e3214..adfbb4a 100644
--- a/src/h/ST_Agattr_s.java
+++ b/src/h/ST_Agattr_s.java
@@ -45,17 +45,18 @@
  */
 package h;
 
+import java.util.List;
+
+import smetana.core.CString;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__array_of_cstring__;
 import smetana.core.__ptr__;
-import smetana.core.amiga.StarArrayOfCString;
 import smetana.core.amiga.StarStruct;
 
 public class ST_Agattr_s extends UnsupportedStructAndPtr {
 
 	private final ST_Agrec_s h = new ST_Agrec_s(this); /* common data header */
 	public ST_dt_s dict; /* shared dict to interpret attr field */
-	public StarArrayOfCString str; /* the attribute string values */
+	public List<CString> str; /* the attribute string values */
 
 	private final StarStruct parent;
 
@@ -72,37 +73,8 @@ public class ST_Agattr_s extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("dict")) {
-			return dict;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
-	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-		if (fieldName.equals("dict")) {
-			this.dict = (ST_dt_s) newData;
-			return dict;
-		}
-		if (fieldName.equals("str")) {
-			this.str = (StarArrayOfCString) newData;
-			return str;
-		}
-		return super.setPtr(fieldName, newData);
-	}
-
-	@Override
-	public __array_of_cstring__ getArrayOfCString(String fieldName) {
-		if (fieldName.equals("str")) {
-			return str.getInternalArray();
-		}
-		return super.getArrayOfCString(fieldName);
-	}
-
-	@Override
 	public __ptr__ castTo(Class dest) {
-		if (dest == Agrec_s.class) {
+		if (dest == ST_Agrec_s.class) {
 			return h;
 			// return h.amp();
 		}
diff --git a/src/h/ST_Agclos_s.java b/src/h/ST_Agclos_s.java
index 6b93fd4..f55dc78 100644
--- a/src/h/ST_Agclos_s.java
+++ b/src/h/ST_Agclos_s.java
@@ -45,60 +45,24 @@
  */
 package h;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import smetana.core.ArrayOfInteger;
-import smetana.core.UnsupportedArrayOfPtr;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__array_of_integer__;
-import smetana.core.__array_of_ptr__;
 import smetana.core.__ptr__;
-import smetana.core.__struct__;
 import smetana.core.amiga.StarStruct;
 
 public class ST_Agclos_s extends UnsupportedStructAndPtr {
+	private final StarStruct parent;
+
 	public final ST_Agdisc_s disc = new ST_Agdisc_s(this); /* resource discipline functions */
 	public final ST_Agdstate_s state = new ST_Agdstate_s(this); /* resource closures */
 	public ST_dt_s strdict;
-	private final int[] seq = new int[3];
+	public final int[] seq = new int[3];
 	// "unsigned long seq[3]",
 	public ST_Agcbstack_s cb;
 	public boolean callbacks_enabled; /* issue user callbacks or hold them? */
 
 	// "Dict_t *lookup_by_name[3]",
 	// "Dict_t *lookup_by_id[3]",
-	private final ArrayOfThreePtrDict_t lookup_by_id = new ArrayOfThreePtrDict_t();
-
-	static class ArrayOfThreePtrDict_t extends UnsupportedArrayOfPtr implements __array_of_ptr__ {
-		private final List<Dict_t> list;
-		private final int pos;
-
-		private ArrayOfThreePtrDict_t(List<Dict_t> list, int pos) {
-			this.list = list;
-			this.pos = pos;
-		}
-
-		ArrayOfThreePtrDict_t() {
-			this(new ArrayList<Dict_t>(), 0);
-			for (int i = 0; i < 3; i++) {
-				list.add(null);
-			}
-		}
-
-		@Override
-		public __array_of_ptr__ plus(int delta) {
-			return new ArrayOfThreePtrDict_t(list, pos + delta);
-		}
-
-		@Override
-		public __ptr__ getPtr() {
-			return list.get(0);
-		}
-
-	}
-
-	private final StarStruct parent;
+	public final ST_dt_s[] lookup_by_id = new ST_dt_s[3];
 
 	public ST_Agclos_s() {
 		this(null);
@@ -112,24 +76,6 @@ public class ST_Agclos_s extends UnsupportedStructAndPtr {
 		return parent;
 	}
 
-	@Override
-	public boolean getBoolean(String fieldName) {
-		if (fieldName.equals("callbacks_enabled")) {
-			return callbacks_enabled;
-		}
-		return super.getBoolean(fieldName);
-	}
-
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("strdict")) {
-			return strdict;
-		}
-		if (fieldName.equals("cb")) {
-			return cb;
-		}
-		return super.getPtr(fieldName);
-	}
 
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
@@ -140,42 +86,6 @@ public class ST_Agclos_s extends UnsupportedStructAndPtr {
 		return super.setPtr(fieldName, newData);
 	}
 
-	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("disc")) {
-			return disc;
-		}
-		if (fieldName.equals("state")) {
-			return state;
-		}
-		return super.getStruct(fieldName);
-	}
-
-	@Override
-	public void setBoolean(String fieldName, boolean data) {
-		if (fieldName.equals("callbacks_enabled")) {
-			this.callbacks_enabled = data;
-			return;
-		}
-		super.setBoolean(fieldName, data);
-	}
-
-	@Override
-	public __array_of_integer__ getArrayOfInteger(String fieldName) {
-		if (fieldName.equals("seq")) {
-			return new ArrayOfInteger(seq, 0);
-		}
-		return super.getArrayOfInteger(fieldName);
-	}
-
-	@Override
-	public __array_of_ptr__ getArrayOfPtr(String fieldName) {
-		if (fieldName.equals("lookup_by_id")) {
-			return lookup_by_id;
-		}
-		return super.getArrayOfPtr(fieldName);
-	}
-
 	// public interface ST_Agclos_s extends __ptr__ {
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "struct Agclos_s",
diff --git a/src/h/ST_Agdatadict_s.java b/src/h/ST_Agdatadict_s.java
index bb015e2..ca82cc4 100644
--- a/src/h/ST_Agdatadict_s.java
+++ b/src/h/ST_Agdatadict_s.java
@@ -45,7 +45,6 @@
  */
 package h;
 
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
@@ -53,9 +52,9 @@ import smetana.core.amiga.StarStruct;
 public class ST_Agdatadict_s extends UnsupportedStructAndPtr {
 
 	private final ST_Agrec_s h = new ST_Agrec_s(this); /* installed in list of graph recs */
-	public ST_dt_s n;
-	public ST_dt_s e;
-	public ST_dt_s g;
+	public ST_dt_s dict_n;
+	public ST_dt_s dict_e;
+	public ST_dt_s dict_g;
 
 	private final StarStruct parent;
 
@@ -72,49 +71,26 @@ public class ST_Agdatadict_s extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
-
-	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("dict.n")) {
-			this.n = (ST_dt_s) newData;
-			return n;
+			this.dict_n = (ST_dt_s) newData;
+			return dict_n;
 		}
 		if (fieldName.equals("dict.e")) {
-			this.e = (ST_dt_s) newData;
-			return e;
+			this.dict_e = (ST_dt_s) newData;
+			return dict_e;
 		}
 		if (fieldName.equals("dict.g")) {
-			this.g = (ST_dt_s) newData;
-			return g;
+			this.dict_g = (ST_dt_s) newData;
+			return dict_g;
 		}
 		return super.setPtr(fieldName, newData);
 	}
 
 	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("dict.n")) {
-			return n;
-		}
-		if (fieldName.equals("dict.e")) {
-			return e;
-		}
-		if (fieldName.equals("dict.g")) {
-			return g;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
 	public __ptr__ castTo(Class dest) {
-		if (dest == Agrec_s.class) {
-			return h.amp();
+		if (dest == ST_Agrec_s.class) {
+			return h;
 		}
 		return super.castTo(dest);
 	}
diff --git a/src/h/ST_Agdisc_s.java b/src/h/ST_Agdisc_s.java
index 76a7bd2..47493c6 100644
--- a/src/h/ST_Agdisc_s.java
+++ b/src/h/ST_Agdisc_s.java
@@ -51,9 +51,9 @@ import smetana.core.amiga.StarStruct;
 
 public class ST_Agdisc_s extends UnsupportedStructAndPtr {
 
-	public ST_Agmemdisc_s.Amp mem;
-	public ST_Agiddisc_s.Amp id;
-	public ST_Agiodisc_s.Amp io;
+	public ST_Agmemdisc_s mem;
+	public ST_Agiddisc_s id;
+	public ST_Agiodisc_s io;
 
 	private final StarStruct parent;
 
@@ -72,11 +72,11 @@ public class ST_Agdisc_s extends UnsupportedStructAndPtr {
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("mem")) {
-			this.mem = (ST_Agmemdisc_s.Amp) newData;
+			this.mem = (ST_Agmemdisc_s) newData;
 			return mem;
 		}
 		if (fieldName.equals("id")) {
-			this.id = (ST_Agiddisc_s.Amp) newData;
+			this.id = (ST_Agiddisc_s) newData;
 			return id;
 		}
 		// if (fieldName.equals("io")) {
@@ -86,16 +86,6 @@ public class ST_Agdisc_s extends UnsupportedStructAndPtr {
 		return super.setPtr(fieldName, newData);
 	}
 
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("mem")) {
-			return mem;
-		}
-		if (fieldName.equals("id")) {
-			return id;
-		}
-		return super.getPtr(fieldName);
-	}
 
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "struct Agdisc_s",
diff --git a/src/h/ST_Agdstate_s.java b/src/h/ST_Agdstate_s.java
index 9ca0179..1855b4e 100644
--- a/src/h/ST_Agdstate_s.java
+++ b/src/h/ST_Agdstate_s.java
@@ -81,16 +81,6 @@ public class ST_Agdstate_s extends UnsupportedStructAndPtr {
 		return super.setPtr(fieldName, newData);
 	}
 	
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("mem")) {
-			return mem;
-		}
-		if (fieldName.equals("id")) {
-			return id;
-		}
-		return super.getPtr(fieldName);
-	}
 
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "struct Agdstate_s",
diff --git a/src/h/ST_Agedge_s.java b/src/h/ST_Agedge_s.java
index b67debd..cb52a73 100644
--- a/src/h/ST_Agedge_s.java
+++ b/src/h/ST_Agedge_s.java
@@ -45,155 +45,135 @@
  */
 package h;
 
-import h.ST_Agrec_s.Amp;
+import java.util.ArrayList;
+import java.util.List;
+
 import smetana.core.HardcodedStruct;
 import smetana.core.OFFSET;
-import smetana.core.UnsupportedSize_t;
-import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedArrayOfPtr;
 import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_ptr__;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
-import smetana.core.size_t;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_Agedge_s extends UnsupportedStructAndPtr implements HardcodedStruct {
 
-	private final ST_Agobj_s base = new ST_Agobj_s(this);
-	private final ST_dtlink_s id_link = new ST_dtlink_s(this);
-	private final ST_dtlink_s seq_link = new ST_dtlink_s(this);
-	private ST_Agnode_s node;
-
-	@Override
-	public void copyDataFrom(__ptr__ arg) {
-		if (arg instanceof Amp) {
-			arg = ((Amp) arg).getObject();
-		}
-		ST_Agedge_s this2 = (ST_Agedge_s) arg;
-		this.base.copyDataFrom((__struct__) this2.base);
-		this.id_link.copyDataFrom((__struct__) this2.id_link);
-		this.seq_link.copyDataFrom((__struct__) this2.seq_link);
-		this.node = this2.node;
-	}
-
 	private final StarStruct parent;
 
-	public ST_Agedge_s() {
-		this(null);
-	}
-
-	public ST_Agedge_s(StarStruct parent) {
-		this.parent = parent;
-	}
-
-	@Override
-	public boolean isSameThan(StarStruct other) {
-		if (other instanceof Amp) {
-			Amp other2 = (Amp) other;
-			return this == other2.me;
-		}
-		ST_Agedge_s other2 = (ST_Agedge_s) other;
-		return this == other2;
-	}
+	public final ST_Agobj_s base = new ST_Agobj_s(this);
+	public final ST_dtlink_s id_link = new ST_dtlink_s(this);
+	public final ST_dtlink_s seq_link = new ST_dtlink_s(this);
+	public ST_Agnode_s node;
 
-	@Override
-	public StarStruct amp() {
-		return new Amp(this);
-	}
+	public static class ArrayOfStar extends UnsupportedArrayOfPtr implements __ptr__, __array_of_ptr__ {
 
-	public class Amp extends UnsupportedStarStruct {
+		private final List<ST_Agedge_s> data;
+		private final int pos;
 
-		private final ST_Agedge_s me;
+		public ArrayOfStar(int size) {
+			this.data = new ArrayList<ST_Agedge_s>();
+			this.pos = 0;
+			for (int i = 0; i < size; i++) {
+				data.add(null);
+			}
+		}
 
-		public Amp(ST_Agedge_s me) {
-			this.me = me;
+		public void swap(int i, int j) {
+			ST_Agedge_s e1 = data.get(i);
+			ST_Agedge_s e2 = data.get(j);
+			data.set(i, e2);
+			data.set(j, e1);
 		}
 
-		public ST_Agedge_s getObject() {
-			return me;
+		public ArrayOfStar(List<ST_Agedge_s> data, int pos) {
+			this.data = data;
+			this.pos = pos;
 		}
 
-		@Override
-		public boolean isSameThan(StarStruct other) {
-			if (other instanceof ST_Agedge_s) {
-				ST_Agedge_s other2 = (ST_Agedge_s) other;
-				return this.me == other2;
+		public ArrayOfStar reallocJ(int newsize) {
+			while (data.size() < newsize) {
+				data.add(null);
 			}
-			Amp other2 = (Amp) other;
-			return this.me == other2.me;
+			return this;
 		}
 
 		@Override
-		public __ptr__ castTo(Class dest) {
-			return ST_Agedge_s.this.castTo(dest);
+		public ArrayOfStar plus(int delta) {
+			return new ArrayOfStar(data, pos + delta);
 		}
-
-		@Override
-		public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-			return ST_Agedge_s.this.setPtr(fieldName, newData);
+		
+		public ST_Agedge_s get(int i) {
+			return plus(i).getPtr();
 		}
 
-		@Override
-		public void copyDataFrom(__struct__ other) {
-			ST_Agedge_s.this.copyDataFrom(other);
-		}
 
 		@Override
-		public void copyDataFrom(__ptr__ other) {
-			ST_Agedge_s.this.copyDataFrom(other);
+		public ArrayOfStar asPtr() {
+			return this;
 		}
 
 		@Override
-		public __ptr__ getPtr(String fieldName) {
-			return ST_Agedge_s.this.getPtr(fieldName);
+		public void setPtr(__ptr__ value) {
+			this.data.set(pos, (ST_Agedge_s) value);
 		}
 
 		@Override
-		public __struct__ getStruct(String fieldName) {
-			return ST_Agedge_s.this.getStruct(fieldName);
+		public ST_Agedge_s getPtr() {
+			return this.data.get(pos);
 		}
 
 		@Override
-		public __ptr__ plus(int pointerMove) {
-			ST_Agedgepair_s pair = (ST_Agedgepair_s) me.parent;
-			// Order=out, in
-			if (pair.out == me && pointerMove == 1) {
-				return pair.in;
+		public int comparePointer(__ptr__ other) {
+			final ArrayOfStar this2 = (ArrayOfStar) other;
+			if (this.data != this2.data) {
+				throw new IllegalArgumentException();
 			}
-			if (pair.in == me && pointerMove == -1) {
-				return pair.out;
-			}
-			return super.plus(pointerMove);
+			return this.pos - this2.pos;
 		}
 
-		@Override
-		public Object addVirtualBytes(int virtualBytes) {
-			if (virtualBytes == 0) {
-				return this;
-			}
-			OFFSET offset = OFFSET.fromInt(virtualBytes);
-			if (offset.toString().equals("h.Agedge_s::seq_link")) {
-				return seq_link;
+		public boolean isSameThan2(ArrayOfStar other) {
+			if (this.data != other.data) {
+				throw new IllegalArgumentException();
 			}
-			if (offset.toString().equals("h.Agedge_s::id_link")) {
-				return id_link;
-			}
-			System.err.println("offset1=" + offset);
-			return super.addVirtualBytes(virtualBytes);
+			return this.pos == other.pos;
 		}
 
 	}
 
 	@Override
+	public void copyDataFrom(__ptr__ arg) {
+		ST_Agedge_s this2 = (ST_Agedge_s) arg;
+		this.base.copyDataFrom((__struct__) this2.base);
+		this.id_link.copyDataFrom((__struct__) this2.id_link);
+		this.seq_link.copyDataFrom((__struct__) this2.seq_link);
+		this.node = this2.node;
+	}
+
+	public ST_Agedge_s() {
+		this(null);
+	}
+
+	public ST_Agedge_s(StarStruct parent) {
+		this.parent = parent;
+	}
+
+	@Override
+	public boolean isSameThan(StarStruct other) {
+		ST_Agedge_s other2 = (ST_Agedge_s) other;
+		return this == other2;
+	}
+
+	@Override
 	public Object addVirtualBytes(int virtualBytes) {
 		if (virtualBytes == 0) {
 			return this;
 		}
 		OFFSET offset = OFFSET.fromInt(virtualBytes);
-		if (offset.toString().equals("h.Agedge_s::seq_link")) {
+		if (offset.toString().equals("h.ST_Agedge_s::seq_link")) {
 			return seq_link;
 		}
-		if (offset.toString().equals("h.Agedge_s::id_link")) {
+		if (offset.toString().equals("h.ST_Agedge_s::id_link")) {
 			return id_link;
 		}
 		System.err.println("offset2=" + offset);
@@ -201,7 +181,7 @@ public class ST_Agedge_s extends UnsupportedStructAndPtr implements HardcodedStr
 	}
 
 	@Override
-	public __ptr__ plus(int pointerMove) {
+	public ST_Agedge_s plus(int pointerMove) {
 		ST_Agedgepair_s pair = (ST_Agedgepair_s) parent;
 		// Order=out, in
 		if (pair.out == this && pointerMove == 1) {
@@ -210,91 +190,53 @@ public class ST_Agedge_s extends UnsupportedStructAndPtr implements HardcodedStr
 		if (pair.in == this && pointerMove == -1) {
 			return pair.out;
 		}
-		return super.plus(pointerMove);
+		throw new UnsupportedOperationException();
 	}
 
 	@Override
 	public __ptr__ castTo(Class dest) {
-		if (dest == Agobj_s.class) {
+		if (dest == ST_Agobj_s.class) {
 			return base;
 		}
-		if (dest == Agedge_s.class) {
+		if (dest == ST_Agedge_s.class) {
 			return this;
 		}
 		return super.castTo(dest);
 	}
+	
+	public ST_Agobj_s castTo_ST_Agobj_s() {
+		return base;
+	}
+
 
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("node")) {
-			if (newData instanceof ST_Agnode_s.Amp) {
-				this.node = ((ST_Agnode_s.Amp) newData).getObject();
-			} else {
-				this.node = (ST_Agnode_s) newData;
-			}
+			this.node = (ST_Agnode_s) newData;
 			return node;
 		}
 		return super.setPtr(fieldName, newData);
 	}
 
 	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("node")) {
-			return node;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("base")) {
-			return base;
-		}
-		return super.getStruct(fieldName);
+	public ST_Agedge_s getPtr() {
+		return this;
 	}
 
 	public StarStruct from_seq_link(ST_dtlink_s from) {
 		if (from == seq_link) {
-			return amp();
+			return this;
 		}
 		throw new IllegalArgumentException();
 	}
 
 	public StarStruct from_id_link(ST_dtlink_s from) {
 		if (from == id_link) {
-			return amp();
+			return this;
 		}
 		throw new IllegalArgumentException();
 	}
 
-	public static size_t sizeof_starstar_empty(final int nb) {
-		return new UnsupportedSize_t(nb) {
-			@Override
-			public Object malloc() {
-				return STStarArrayOfPointer.malloc(nb);
-			}
-
-			@Override
-			public Object realloc(Object old) {
-				if (old instanceof STStarArrayOfPointer) {
-					STStarArrayOfPointer old2 = (STStarArrayOfPointer) old;
-					old2.realloc(nb);
-					return old2;
-				}
-				// if (old instanceof StarArrayOfPtr) {
-				// StarArrayOfPtr old2 = (StarArrayOfPtr) old;
-				// old2.realloc(nb);
-				// return old2;
-				// }
-				return super.realloc(old);
-			}
-
-			@Override
-			public int getInternalNb() {
-				return nb;
-			}
-		};
-	}
 
 	// public interface ST_Agedge_s extends __ptr__ {
 	// public static List<String> DEFINITION = Arrays.asList(
diff --git a/src/h/ST_Agedgeinfo_t.java b/src/h/ST_Agedgeinfo_t.java
index 334960b..0d93006 100644
--- a/src/h/ST_Agedgeinfo_t.java
+++ b/src/h/ST_Agedgeinfo_t.java
@@ -45,7 +45,6 @@
  */
 package h;
 
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
@@ -63,29 +62,29 @@ public class ST_Agedgeinfo_t extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	private final ST_Agrec_s hdr = new ST_Agrec_s(this);
+	public final ST_Agrec_s hdr = new ST_Agrec_s(this);
 
-	private ST_splines spl;
-	private final ST_port tail_port = new ST_port(this), head_port = new ST_port(this);
-	private ST_textlabel_t label, head_label, tail_label, xlabel;
-	private int edge_type;
-	private int adjacent;
-	private boolean label_ontop;
+	public ST_splines spl;
+	public final ST_port tail_port = new ST_port(this), head_port = new ST_port(this);
+	public ST_textlabel_t label, head_label, tail_label, xlabel;
+	public int edge_type;
+	public int adjacent;
+	public boolean label_ontop;
 	// "unsigned char gui_state",
-	private ST_Agedge_s to_orig;
+	public ST_Agedge_s to_orig;
 	// "void *alg",
 	// "double factor",
-	private double dist;
+	public double dist;
 	// "Ppolyline_t path",
-	private int showboxes;
-	private boolean conc_opp_flag;
-	private int xpenalty;
-	private int weight;
-	private int cutvalue, tree_index;
-	private int count;
-	private int minlen;
+	public int showboxes;
+	public boolean conc_opp_flag;
+	public int xpenalty;
+	public int weight;
+	public int cutvalue, tree_index;
+	public int count;
+	public int minlen;
 
-	private ST_Agedge_s to_virt;
+	public ST_Agedge_s to_virt;
 
 	@Override
 	public void copyDataFrom(__struct__ other) {
@@ -115,24 +114,11 @@ public class ST_Agedgeinfo_t extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-		@Override
-		public __ptr__ castTo(Class dest) {
-			return ST_Agedgeinfo_t.this.castTo(dest);
-		}
-
-	}
-
-	@Override
 	public __ptr__ castTo(Class dest) {
-		if (dest == Agrec_s.class) {
+		if (dest == ST_Agrec_s.class) {
 			return hdr;
 		}
-		if (dest == Agedgeinfo_t.class) {
+		if (dest == ST_Agedgeinfo_t.class) {
 			return this;
 		}
 		return super.castTo(dest);
@@ -152,15 +138,6 @@ public class ST_Agedgeinfo_t extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public void setBoolean(String fieldName, boolean data) {
-		if (fieldName.equals("label_ontop")) {
-			this.label_ontop = data;
-			return;
-		}
-		super.setBoolean(fieldName, data);
-	}
-
-	@Override
 	public void setDouble(String fieldName, double data) {
 		if (fieldName.equals("dist")) {
 			this.dist = data;
@@ -210,110 +187,15 @@ public class ST_Agedgeinfo_t extends UnsupportedStructAndPtr {
 		super.setInt(fieldName, data);
 	}
 
-	@Override
-	public double getDouble(String fieldName) {
-		if (fieldName.equals("dist")) {
-			return this.dist;
-		}
-		return super.getDouble(fieldName);
-	}
-
-	@Override
-	public boolean getBoolean(String fieldName) {
-		if (fieldName.equals("conc_opp_flag")) {
-			return this.conc_opp_flag;
-		}
-		if (fieldName.equals("label_ontop")) {
-			return this.label_ontop;
-		}
-		return super.getBoolean(fieldName);
-	}
-
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("minlen")) {
-			return this.minlen;
-		}
-		if (fieldName.equals("weight")) {
-			return this.weight;
-		}
-		if (fieldName.equals("cutvalue")) {
-			return this.cutvalue;
-		}
-		if (fieldName.equals("tree_index")) {
-			return this.tree_index;
-		}
-		if (fieldName.equals("count")) {
-			return this.count;
-		}
-		if (fieldName.equals("xpenalty")) {
-			return this.xpenalty;
-		}
-		if (fieldName.equals("showboxes")) {
-			return this.showboxes;
-		}
-		if (fieldName.equals("edge_type")) {
-			return this.edge_type;
-		}
-		if (fieldName.equals("adjacent")) {
-			return this.adjacent;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("to_virt")) {
-			return this.to_virt;
-		}
-		if (fieldName.equals("to_orig")) {
-			return this.to_orig;
-		}
-		if (fieldName.equals("label")) {
-			return this.label;
-		}
-		if (fieldName.equals("spl")) {
-			return this.spl;
-		}
-		if (fieldName.equals("xlabel")) {
-			return this.xlabel;
-		}
-		if (fieldName.equals("head_label")) {
-			return this.head_label;
-		}
-		if (fieldName.equals("tail_label")) {
-			return this.tail_label;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("tail_port")) {
-			return this.tail_port;
-		}
-		if (fieldName.equals("head_port")) {
-			return this.head_port;
-		}
-		return super.getStruct(fieldName);
-	}
 
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("to_virt")) {
-			if (newData instanceof ST_Agedge_s.Amp) {
-				this.to_virt = ((ST_Agedge_s.Amp) newData).getObject();
-			} else {
 				this.to_virt = (ST_Agedge_s) newData;
-			}
 			return this.to_virt;
 		}
 		if (fieldName.equals("to_orig")) {
-			if (newData instanceof ST_Agedge_s.Amp) {
-				this.to_orig = ((ST_Agedge_s.Amp) newData).getObject();
-			} else {
 				this.to_orig = (ST_Agedge_s) newData;
-			}
 			return this.to_orig;
 		}
 		if (fieldName.equals("spl")) {
@@ -328,6 +210,10 @@ public class ST_Agedgeinfo_t extends UnsupportedStructAndPtr {
 			this.head_label = (ST_textlabel_t) newData;
 			return this.head_label;
 		}
+		if (fieldName.equals("tail_label")) {
+			this.tail_label = (ST_textlabel_t) newData;
+			return this.tail_label;
+		}
 		return super.setPtr(fieldName, newData);
 	}
 
diff --git a/src/h/ST_Agedgepair_s.java b/src/h/ST_Agedgepair_s.java
index ed17446..a9b1b17 100644
--- a/src/h/ST_Agedgepair_s.java
+++ b/src/h/ST_Agedgepair_s.java
@@ -46,9 +46,7 @@
 package h;
 
 import smetana.core.HardcodedStruct;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__struct__;
 import smetana.core.amiga.StarStruct;
 
 public class ST_Agedgepair_s extends UnsupportedStructAndPtr implements HardcodedStruct {
@@ -66,25 +64,6 @@ public class ST_Agedgepair_s extends UnsupportedStructAndPtr implements Hardcode
 		this.parent = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-	}
-
-	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("out")) {
-			return out;
-		}
-		if (fieldName.equals("in")) {
-			return in;
-		}
-		return super.getStruct(fieldName);
-	}
-
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "struct Agedgepair_s",
 	// "{",
diff --git a/src/h/ST_Agiddisc_s.java b/src/h/ST_Agiddisc_s.java
index aac624f..df67983 100644
--- a/src/h/ST_Agiddisc_s.java
+++ b/src/h/ST_Agiddisc_s.java
@@ -46,12 +46,9 @@
 package h;
 
 import smetana.core.CFunction;
-import smetana.core.UnsupportedStarStruct;
-import smetana.core.UnsupportedStruct;
-import smetana.core.__ptr__;
-import smetana.core.amiga.StarStruct;
+import smetana.core.UnsupportedStructAndPtr;
 
-public class ST_Agiddisc_s extends UnsupportedStruct {
+public class ST_Agiddisc_s extends UnsupportedStructAndPtr {
 
 	public CFunction open;
 	public CFunction map;
@@ -61,37 +58,6 @@ public class ST_Agiddisc_s extends UnsupportedStruct {
 	public CFunction close;
 	public CFunction idregister;
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-		@Override
-		public Object call(String fieldName, Object... args) {
-			if (fieldName.equals("open")) {
-				return open.exe(args);
-			}
-			if (fieldName.equals("map")) {
-				return map.exe(args);
-			}
-			if (fieldName.equals("idregister")) {
-				return idregister.exe(args);
-			}
-			if (fieldName.equals("print")) {
-				return print.exe(args);
-			}
-			return super.call(fieldName, args);
-		}
-
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			if (fieldName.equals("print")) {
-				return print;
-			}
-			return super.getPtr(fieldName);
-		}
-	}
 
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "struct Agiddisc_s",
diff --git a/src/h/ST_Agiodisc_s.java b/src/h/ST_Agiodisc_s.java
index 084350e..55379bf 100644
--- a/src/h/ST_Agiodisc_s.java
+++ b/src/h/ST_Agiodisc_s.java
@@ -45,9 +45,7 @@
  */
 package h;
 import smetana.core.CFunction;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStruct;
-import smetana.core.amiga.StarStruct;
 
 public class ST_Agiodisc_s extends UnsupportedStruct {
 	
@@ -55,37 +53,6 @@ public class ST_Agiodisc_s extends UnsupportedStruct {
 	public CFunction putstr;
 	public CFunction flush;
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-//		@Override
-//		public Object call(String fieldName, Object... args) {
-//			if (fieldName.equals("open")) {
-//				return open.exe(args);
-//			}
-//			if (fieldName.equals("map")) {
-//				return map.exe(args);
-//			}
-//			if (fieldName.equals("idregister")) {
-//				return idregister.exe(args);
-//			}
-//			if (fieldName.equals("print")) {
-//				return print.exe(args);
-//			}
-//			return super.call(fieldName, args);
-//		}
-//
-//		@Override
-//		public __ptr__ getPtr(String fieldName) {
-//			if (fieldName.equals("print")) {
-//				return print;
-//			}
-//			return super.getPtr(fieldName);
-//		}
-	}
 
 
 	// public static List<String> DEFINITION = Arrays.asList(
diff --git a/src/h/ST_Agmemdisc_s.java b/src/h/ST_Agmemdisc_s.java
index 989cd7c..31f2934 100644
--- a/src/h/ST_Agmemdisc_s.java
+++ b/src/h/ST_Agmemdisc_s.java
@@ -46,11 +46,9 @@
 package h;
 
 import smetana.core.CFunction;
-import smetana.core.UnsupportedStarStruct;
-import smetana.core.UnsupportedStruct;
-import smetana.core.amiga.StarStruct;
+import smetana.core.UnsupportedStructAndPtr;
 
-public class ST_Agmemdisc_s extends UnsupportedStruct {
+public class ST_Agmemdisc_s extends UnsupportedStructAndPtr {
 
 	public CFunction open;
 	public CFunction alloc;
@@ -58,24 +56,6 @@ public class ST_Agmemdisc_s extends UnsupportedStruct {
 	public CFunction free;
 	public CFunction close;
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-		@Override
-		public Object call(String fieldName, Object... args) {
-			if (fieldName.equals("open")) {
-				return open.exe(args);
-			}
-			if (fieldName.equals("alloc")) {
-				return alloc.exe(args);
-			}
-			return super.call(fieldName, args);
-		}
-	}
-
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "struct Agmemdisc_s",
 	// "{",
diff --git a/src/h/ST_Agnode_s.java b/src/h/ST_Agnode_s.java
index 685df91..e0bc057 100644
--- a/src/h/ST_Agnode_s.java
+++ b/src/h/ST_Agnode_s.java
@@ -45,113 +45,212 @@
  */
 package h;
 
-import smetana.core.UnsupportedSize_t;
-import smetana.core.UnsupportedStarStruct;
+import java.util.ArrayList;
+import java.util.List;
+
+import smetana.core.UnsupportedArrayOfPtr;
+import smetana.core.UnsupportedArrayOfStruct2;
 import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_ptr__;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
 import smetana.core.size_t;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_Agnode_s extends UnsupportedStructAndPtr {
 
-	private final ST_Agobj_s base = new ST_Agobj_s(this);
-	private ST_Agraph_s root;
-	private ST_Agsubnode_s mainsub = new ST_Agsubnode_s(this);
+	public final ST_Agobj_s base = new ST_Agobj_s(this);
+	public ST_Agraph_s root;
+	public final ST_Agsubnode_s mainsub = new ST_Agsubnode_s(this);
 
 	private final StarStruct parent;
 
-	public ST_Agnode_s() {
-		this(null);
-	}
+	public static class ArrayOfStar extends UnsupportedArrayOfPtr implements __ptr__, __array_of_ptr__ {
 
-	public ST_Agnode_s(StarStruct parent) {
-		this.parent = parent;
-	}
+		private final List<ST_Agnode_s> data;
+		private final int pos;
 
-	public StarStruct getParent() {
-		return parent;
-	}
+		public ArrayOfStar(int size) {
+			this.data = new ArrayList<ST_Agnode_s>();
+			this.pos = 0;
+			for (int i = 0; i < size; i++) {
+				data.add(null);
+			}
+		}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp(this);
-	}
+		public void swap(int i, int j) {
+			ST_Agnode_s e1 = data.get(i);
+			ST_Agnode_s e2 = data.get(j);
+			data.set(i, e2);
+			data.set(j, e1);
+		}
+
+		public ArrayOfStar(List<ST_Agnode_s> data, int pos) {
+			this.data = data;
+			this.pos = pos;
+		}
+
+		public ArrayOfStar reallocJ(int newsize) {
+			while (data.size() < newsize) {
+				data.add(null);
+			}
+			return this;
+		}
+
+		@Override
+		public ArrayOfStar plus(int delta) {
+			return new ArrayOfStar(data, pos + delta);
+		}
 
-	public class Amp extends UnsupportedStarStruct {
+		@Override
+		public ArrayOfStar asPtr() {
+			return this;
+		}
 
-		private final ST_Agnode_s me;
+		@Override
+		public void setPtr(__ptr__ value) {
+			this.data.set(pos, (ST_Agnode_s) value);
+		}
+		
+		public ST_Agnode_s get(int i) {
+			return plus(i).getPtr();
+		}
 
-		public Amp(ST_Agnode_s me) {
-			this.me = me;
+		@Override
+		public ST_Agnode_s getPtr() {
+			return this.data.get(pos);
 		}
 
 		@Override
-		public __ptr__ castTo(Class dest) {
-			if (dest == Agobj_s.class) {
-				return base.amp();
+		public int comparePointer(__ptr__ other) {
+			final ArrayOfStar this2 = (ArrayOfStar) other;
+			if (this.data != this2.data) {
+				throw new IllegalArgumentException();
 			}
-			if (dest == Agnode_s.class) {
-				return me;
+			return this.pos - this2.pos;
+		}
+
+		public boolean isSameThan2(ArrayOfStar other) {
+			if (this.data != other.data) {
+				throw new IllegalArgumentException();
 			}
-			return super.castTo(dest);
+			return this.pos == other.pos;
 		}
+	}
+
+	public static class Array extends UnsupportedArrayOfStruct2 implements __ptr__, __array_of_ptr__ {
+
+		private final List<ST_Agnode_s> data;
+		private final int pos;
 
 		@Override
-		public __struct__ getStruct() {
-			return ST_Agnode_s.this.getStruct();
+		public void setStruct(__struct__ value) {
+			get(0).___(value);
 		}
 
 		@Override
-		public __ptr__ getPtr(String fieldName) {
-			return ST_Agnode_s.this.getPtr(fieldName);
+		public Array asPtr() {
+			return this;
+		}
+
+		public Array(int size) {
+			this.data = new ArrayList<ST_Agnode_s>();
+			this.pos = 0;
+			for (int i = 0; i < size; i++) {
+				data.add(new ST_Agnode_s());
+			}
+		}
+
+		public Array reallocJ(int newsize) {
+			while (data.size() < newsize) {
+				data.add(new ST_Agnode_s());
+			}
+			return this;
+		}
+
+		public Array plus(int delta) {
+			return plusJ(delta);
+		}
+
+		@Override
+		public void setPtr(__ptr__ value) {
+			this.data.set(pos, (ST_Agnode_s) value);
 		}
 
 		@Override
-		public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-			return ST_Agnode_s.this.setPtr(fieldName, newData);
+		public ST_Agnode_s getPtr() {
+			return this.data.get(pos);
+		}
+
+		private Array(List<ST_Agnode_s> data, int pos) {
+			this.data = data;
+			this.pos = pos;
+		}
+
+		public ST_Agnode_s get(int i) {
+			return this.data.get(pos + i);
 		}
 
-		public ST_Agnode_s getObject() {
-			return me;
+		public Array plusJ(int i) {
+			return new Array(data, pos + i);
 		}
 
+		public int minus(Array other) {
+			if (this.data != other.data) {
+				throw new IllegalArgumentException();
+			}
+			return this.pos - other.pos;
+		}
+
+		public Array move(int delta) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+		public void realloc(size_t nb) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+		public int comparePointerInternal(__array_of_ptr__ other) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+
+	}
+
+	public ST_Agnode_s() {
+		this(null);
+	}
+
+	public ST_Agnode_s(StarStruct parent) {
+		this.parent = parent;
+	}
+
+	public StarStruct getParent() {
+		return parent;
 	}
 
 	@Override
 	public __ptr__ castTo(Class dest) {
-		if (dest == Agnode_s.class) {
+		if (dest == ST_Agnode_s.class) {
 			return this;
 		}
-		if (dest == Agobj_s.class) {
+		if (dest == ST_Agobj_s.class) {
 			return base;
 		}
 		return super.castTo(dest);
 	}
+	
+	public ST_Agobj_s castTo_ST_Agobj_s() {
+		return base;
+	}
 
 	@Override
 	public boolean isSameThan(StarStruct other) {
-		if (other instanceof Amp) {
-			Amp other2 = (Amp) other;
-			return this == other2.me;
-		}
 		ST_Agnode_s other2 = (ST_Agnode_s) other;
 		return this == other2;
 	}
 
 	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("base")) {
-			return base;
-		}
-		if (fieldName.equals("mainsub")) {
-			return mainsub;
-		}
-		return super.getStruct(fieldName);
-	}
-
-	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("root")) {
 			this.root = (ST_Agraph_s) newData;
@@ -161,60 +260,10 @@ public class ST_Agnode_s extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("root")) {
-			return root;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
-	public __struct__ getStruct() {
+	public ST_Agnode_s getStruct() {
 		return this;
 	}
 
-	public static size_t sizeof_starstar_empty(final int nb) {
-		return new UnsupportedSize_t(nb) {
-			@Override
-			public Object malloc() {
-				return STStarArrayOfPointer.malloc(nb);
-			}
-
-			@Override
-			public int getInternalNb() {
-				return nb;
-			}
-		};
-	}
-
-	public static size_t sizeof(final int nb) {
-		return new UnsupportedSize_t(nb) {
-			@Override
-			public Object malloc() {
-				return new StarArrayOfPtr(new STArray<ST_Agnode_s>(nb, 0, ST_Agnode_s.class));
-			}
-
-			@Override
-			public int getInternalNb() {
-				return nb;
-			}
-
-			@Override
-			public Object realloc(Object old) {
-				if (old instanceof STStarArrayOfPointer) {
-					STStarArrayOfPointer old2 = (STStarArrayOfPointer) old;
-					old2.realloc(nb);
-					return old2;
-				}
-				if (old instanceof StarArrayOfPtr) {
-					StarArrayOfPtr old2 = (StarArrayOfPtr) old;
-					old2.realloc(nb);
-					return old2;
-				}
-				return super.realloc(old);
-			}
-		};
-	}
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "struct Agnode_s",
 	// "{",
diff --git a/src/h/ST_Agnodeinfo_t.java b/src/h/ST_Agnodeinfo_t.java
index 3a7d3bf..4293a8e 100644
--- a/src/h/ST_Agnodeinfo_t.java
+++ b/src/h/ST_Agnodeinfo_t.java
@@ -45,7 +45,6 @@
  */
 package h;
 
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
@@ -63,72 +62,63 @@ public class ST_Agnodeinfo_t extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	private final ST_Agrec_s hdr = new ST_Agrec_s(this);
+	public final ST_Agrec_s hdr = new ST_Agrec_s(this);
 
-	private ST_shape_desc shape;
-	private ST_polygon_t shape_info;
-	private final ST_pointf coord = new ST_pointf(this);
-	private double width, height;
+	public ST_shape_desc shape;
+	public ST_polygon_t shape_info;
+	public final ST_pointf coord = new ST_pointf(this);
+	public double width, height;
 
 	// "boxf bb",
-	private double ht, lw, rw;
-	private ST_textlabel_t label;
-	private ST_textlabel_t xlabel;
+	public double ht, lw, rw;
+	public ST_textlabel_t label;
+	public ST_textlabel_t xlabel;
 	// "void *alg",
-	private ST_Agedge_s alg = null;
+	public ST_Agedge_s alg = null;
 	// "char state",
 	// "unsigned char gui_state",
 	// "boolean clustnode",
 	// "unsigned char pinned",
-	private int id, heapindex, hops;
+	public int id, heapindex, hops;
 	// "double *pos, dist",
-	private int showboxes;
+	public int showboxes;
 
-	private boolean has_port;
+	public boolean has_port;
 	// "node_t* rep",
 	// "node_t *set",
-	private int node_type, mark, onstack;
-	private int ranktype, weight_class;
-	private ST_Agnode_s next;
-	private ST_Agnode_s prev;
+	public int node_type, mark, onstack;
+	public int ranktype, weight_class;
+	public ST_Agnode_s next;
+	public ST_Agnode_s prev;
 	// "elist in, out, flat_out, flat_in, other",
-	private final ST_elist in = new ST_elist(this);
-	private final ST_elist out = new ST_elist(this);
-	private final ST_elist flat_out = new ST_elist(this);
-	private final ST_elist flat_in = new ST_elist(this);
-	private final ST_elist other = new ST_elist(this);
-	private ST_Agraph_s.Amp clust;
-	private int UF_size;
+	public final ST_elist in = new ST_elist(this);
+	public final ST_elist out = new ST_elist(this);
+	public final ST_elist flat_out = new ST_elist(this);
+	public final ST_elist flat_in = new ST_elist(this);
+	public final ST_elist other = new ST_elist(this);
+	public ST_Agraph_s clust;
+	public int UF_size;
 
-	private ST_Agnode_s UF_parent;
+	public ST_Agnode_s UF_parent;
 
-	private ST_Agnode_s inleaf, outleaf;
-	private int rank, order;
-	private double mval;
-	private final ST_elist save_in = new ST_elist(this);
-	private final ST_elist save_out = new ST_elist(this);
-	private final ST_elist tree_in = new ST_elist(this);
-	private final ST_elist tree_out = new ST_elist(this);
-	private ST_Agedge_s par;
-	private int low, lim;
-	private int priority;
+	public ST_Agnode_s inleaf, outleaf;
+	public int rank, order;
+	public double mval;
+	public final ST_elist save_in = new ST_elist(this);
+	public final ST_elist save_out = new ST_elist(this);
+	public final ST_elist tree_in = new ST_elist(this);
+	public final ST_elist tree_out = new ST_elist(this);
+	public ST_Agedge_s par;
+	public int low, lim;
+	public int priority;
 
 	// "double pad[1]",
 	// "}",
 	// "Agnodeinfo_t");
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
-
-	@Override
 	public __ptr__ castTo(Class dest) {
-		if (dest == Agrec_s.class) {
+		if (dest == ST_Agrec_s.class) {
 			return hdr;
 		}
 		return super.castTo(dest);
@@ -164,42 +154,6 @@ public class ST_Agnodeinfo_t extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public double getDouble(String fieldName) {
-		if (fieldName.equals("width")) {
-			return this.width;
-		}
-		if (fieldName.equals("height")) {
-			return this.height;
-		}
-		if (fieldName.equals("ht")) {
-			return this.ht;
-		}
-		if (fieldName.equals("lw")) {
-			return this.lw;
-		}
-		if (fieldName.equals("rw")) {
-			return this.rw;
-		}
-		if (fieldName.equals("mval")) {
-			return this.mval;
-		}
-		return super.getDouble(fieldName);
-	}
-
-	@Override
-	public void setBoolean(String fieldName, boolean data) {
-		if (fieldName.equals("mark")) {
-			this.mark = data ? 1 : 0;
-			return;
-		}
-		if (fieldName.equals("onstack")) {
-			this.onstack = data ? 1 : 0;
-			return;
-		}
-		super.setBoolean(fieldName, data);
-	}
-
-	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("showboxes")) {
 			this.showboxes = data;
@@ -253,67 +207,6 @@ public class ST_Agnodeinfo_t extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("UF_size")) {
-			return this.UF_size;
-		}
-		if (fieldName.equals("ranktype")) {
-			return this.ranktype;
-		}
-		if (fieldName.equals("mark")) {
-			return this.mark;
-		}
-		if (fieldName.equals("onstack")) {
-			return this.onstack;
-		}
-		if (fieldName.equals("priority")) {
-			return this.priority;
-		}
-		if (fieldName.equals("node_type")) {
-			return this.node_type;
-		}
-		if (fieldName.equals("rank")) {
-			return this.rank;
-		}
-		if (fieldName.equals("order")) {
-			return this.order;
-		}
-		if (fieldName.equals("ranktype")) {
-			return this.ranktype;
-		}
-		if (fieldName.equals("low")) {
-			return this.low;
-		}
-		if (fieldName.equals("lim")) {
-			return this.lim;
-		}
-		if (fieldName.equals("weight_class")) {
-			return this.weight_class;
-		}
-		if (fieldName.equals("id")) {
-			return this.id;
-		}
-		if (fieldName.equals("heapindex")) {
-			return this.heapindex;
-		}
-		if (fieldName.equals("hops")) {
-			return this.hops;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
-	public boolean getBoolean(String fieldName) {
-		if (fieldName.equals("onstack")) {
-			return this.onstack != 0;
-		}
-		if (fieldName.equals("has_port")) {
-			return this.has_port;
-		}
-		return super.getBoolean(fieldName);
-	}
-
-	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("shape")) {
 			this.shape = (ST_shape_desc) newData;
@@ -328,11 +221,7 @@ public class ST_Agnodeinfo_t extends UnsupportedStructAndPtr {
 			return label;
 		}
 		if (fieldName.equals("clust")) {
-			if (newData instanceof ST_Agraph_s) {
-				this.clust = (h.ST_Agraph_s.Amp) ((ST_Agraph_s) newData).amp();
-			} else {
-				this.clust = (ST_Agraph_s.Amp) newData;
-			}
+				this.clust = (ST_Agraph_s) newData;
 			return clust;
 		}
 		if (fieldName.equals("next")) {
@@ -340,11 +229,7 @@ public class ST_Agnodeinfo_t extends UnsupportedStructAndPtr {
 			return next;
 		}
 		if (fieldName.equals("prev")) {
-			if (newData instanceof ST_Agnode_s.Amp) {
-				this.prev = ((ST_Agnode_s.Amp) newData).getObject();
-			} else {
 				this.prev = (ST_Agnode_s) newData;
-			}
 			return prev;
 		}
 		if (fieldName.equals("UF_parent")) {
@@ -352,11 +237,7 @@ public class ST_Agnodeinfo_t extends UnsupportedStructAndPtr {
 			return UF_parent;
 		}
 		if (fieldName.equals("par")) {
-			if (newData instanceof ST_Agedge_s.Amp) {
-				this.par = ((ST_Agedge_s.Amp) newData).getObject();
-			} else {
-				this.par = (ST_Agedge_s) newData;
-			}
+			this.par = (ST_Agedge_s) newData;
 			return par;
 		}
 		if (fieldName.equals("alg")) {
@@ -366,81 +247,7 @@ public class ST_Agnodeinfo_t extends UnsupportedStructAndPtr {
 		return super.setPtr(fieldName, newData);
 	}
 
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("shape")) {
-			return shape;
-		}
-		if (fieldName.equals("label")) {
-			return label;
-		}
-		if (fieldName.equals("UF_parent")) {
-			return UF_parent;
-		}
-		if (fieldName.equals("next")) {
-			return next;
-		}
-		if (fieldName.equals("prev")) {
-			return prev;
-		}
-		if (fieldName.equals("clust")) {
-			return clust;
-		}
-		if (fieldName.equals("inleaf")) {
-			return inleaf;
-		}
-		if (fieldName.equals("outleaf")) {
-			return outleaf;
-		}
-		if (fieldName.equals("alg")) {
-			return alg;
-		}
-		if (fieldName.equals("par")) {
-			return par;
-		}
-		if (fieldName.equals("xlabel")) {
-			return xlabel;
-		}
-		if (fieldName.equals("shape_info")) {
-			return shape_info;
-		}
-		return super.getPtr(fieldName);
-	}
 
-	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("in")) {
-			return in;
-		}
-		if (fieldName.equals("out")) {
-			return out;
-		}
-		if (fieldName.equals("flat_out")) {
-			return flat_out;
-		}
-		if (fieldName.equals("flat_in")) {
-			return flat_in;
-		}
-		if (fieldName.equals("other")) {
-			return other;
-		}
-		if (fieldName.equals("save_in")) {
-			return save_in;
-		}
-		if (fieldName.equals("save_out")) {
-			return save_out;
-		}
-		if (fieldName.equals("tree_in")) {
-			return tree_in;
-		}
-		if (fieldName.equals("tree_out")) {
-			return tree_out;
-		}
-		if (fieldName.equals("coord")) {
-			return coord;
-		}
-		return super.getStruct(fieldName);
-	}
 
 	@Override
 	public void setStruct(String fieldName, __struct__ newData) {
diff --git a/src/h/ST_Agobj_s.java b/src/h/ST_Agobj_s.java
index 9791440..c50cd69 100644
--- a/src/h/ST_Agobj_s.java
+++ b/src/h/ST_Agobj_s.java
@@ -46,7 +46,6 @@
 package h;
 
 import smetana.core.HardcodedStruct;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
@@ -55,7 +54,7 @@ import smetana.core.amiga.StarStruct;
 public class ST_Agobj_s extends UnsupportedStructAndPtr implements WithParent, HardcodedStruct {
 
 	public final ST_Agtag_s tag = new ST_Agtag_s(this);
-	public ST_Agrec_s.Amp data;
+	public ST_Agrec_s data;
 
 	@Override
 	public void copyDataFrom(__struct__ other) {
@@ -76,45 +75,17 @@ public class ST_Agobj_s extends UnsupportedStructAndPtr implements WithParent, H
 	}
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-		@Override
-		public __struct__ getStruct(String fieldName) {
-			return ST_Agobj_s.this.getStruct(fieldName);
-		}
-
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			return ST_Agobj_s.this.getPtr(fieldName);
-		}
-
-		@Override
-		public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-			return ST_Agobj_s.this.setPtr(fieldName, newData);
-		}
-
-		@Override
-		public __ptr__ castTo(Class dest) {
-			return ST_Agobj_s.this.castTo(dest);
-		}
-	}
-
-	@Override
 	public __ptr__ castTo(Class dest) {
-		if (dest == Agobj_s.class) {
+		if (dest == ST_Agobj_s.class) {
 			return this;
 		}
-		if (dest == Agraph_s.class && parent instanceof ST_Agraph_s) {
+		if (dest == ST_Agraph_s.class && parent instanceof ST_Agraph_s) {
 			return (ST_Agraph_s) parent;
 		}
-		if (dest == Agnode_s.class && parent instanceof ST_Agnode_s) {
+		if (dest == ST_Agnode_s.class && parent instanceof ST_Agnode_s) {
 			return (ST_Agnode_s) parent;
 		}
-		if (dest == Agedge_s.class && parent instanceof ST_Agedge_s) {
+		if (dest == ST_Agedge_s.class && parent instanceof ST_Agedge_s) {
 			return (ST_Agedge_s) parent;
 		}
 		return super.castTo(dest);
@@ -125,18 +96,16 @@ public class ST_Agobj_s extends UnsupportedStructAndPtr implements WithParent, H
 		if (fieldName.equals("data")) {
 			if (newData instanceof ST_Agnodeinfo_t) {
 				ST_Agnodeinfo_t info = (ST_Agnodeinfo_t) newData;
-				newData = (ST_Agrec_s) info.castTo(Agrec_s.class);
+				newData = (ST_Agrec_s) info.castTo(ST_Agrec_s.class);
 			} else if (newData instanceof ST_Agedgeinfo_t) {
 				ST_Agedgeinfo_t info = (ST_Agedgeinfo_t) newData;
-				newData = (ST_Agrec_s) info.castTo(Agrec_s.class);
-			} else if (newData instanceof ST_Agedgeinfo_t.Amp) {
-				ST_Agedgeinfo_t.Amp info = (ST_Agedgeinfo_t.Amp) newData;
-				newData = (ST_Agrec_s) info.castTo(Agrec_s.class);
+				newData = (ST_Agrec_s) info.castTo(ST_Agrec_s.class);
+			} else if (newData instanceof ST_Agedgeinfo_t) {
+				ST_Agedgeinfo_t info = (ST_Agedgeinfo_t) newData;
+				newData = (ST_Agrec_s) info.castTo(ST_Agrec_s.class);
 			}
 			if (newData instanceof ST_Agrec_s) {
-				this.data = (ST_Agrec_s.Amp) ((ST_Agrec_s) newData).amp();
-			} else {
-				this.data = (ST_Agrec_s.Amp) newData;
+				this.data = (ST_Agrec_s) newData;
 			}
 			return data;
 		}
@@ -144,22 +113,6 @@ public class ST_Agobj_s extends UnsupportedStructAndPtr implements WithParent, H
 	}
 
 	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("data")) {
-			return data;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("tag")) {
-			return tag;
-		}
-		return super.getStruct(fieldName);
-	}
-
-	@Override
 	public void setStruct(String fieldName, __struct__ newData) {
 		if (fieldName.equals("tag")) {
 			this.tag.copyDataFrom(newData);
diff --git a/src/h/ST_Agraph_s.java b/src/h/ST_Agraph_s.java
index e8b312d..c2d807e 100644
--- a/src/h/ST_Agraph_s.java
+++ b/src/h/ST_Agraph_s.java
@@ -45,14 +45,16 @@
  */
 package h;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import smetana.core.OFFSET;
-import smetana.core.UnsupportedSize_t;
-import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedArrayOfStruct2;
 import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_ptr__;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
 import smetana.core.size_t;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_Agraph_s extends UnsupportedStructAndPtr {
@@ -84,9 +86,9 @@ public class ST_Agraph_s extends UnsupportedStructAndPtr {
 	public StarStruct getParent() {
 		return _parent;
 	}
-	
+
 	@Override
-	public __struct__ getStruct() {
+	public ST_Agraph_s getStruct() {
 		return this;
 	}
 
@@ -100,76 +102,94 @@ public class ST_Agraph_s extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public StarStruct amp() {
-		return new Amp(this);
+	public ST_Agraph_s getPtr() {
+		return this;
 	}
 
-	public class Amp extends UnsupportedStarStruct {
+	public static class Array extends UnsupportedArrayOfStruct2 implements __ptr__, __array_of_ptr__ {
 
-		private final ST_Agraph_s me;
+		private final List<ST_Agraph_s> data;
+		private final int pos;
 
-		public Amp(ST_Agraph_s me) {
-			this.me = me;
+		@Override
+		public void setStruct(String fieldName, __struct__ data) {
+			getStruct().setStruct(fieldName, data);
 		}
-		
+
 		@Override
-		public __ptr__ getPtr(String fieldName) {
-			return ST_Agraph_s.this.getPtr(fieldName);
+		public __ptr__ castTo(Class dest) {
+			return getStruct().castTo(dest);
 		}
-		
+
 		@Override
-		public __struct__ getStruct() {
-			return ST_Agraph_s.this.getStruct();
+		public void setPtr(__ptr__ value) {
+			this.data.set(pos, (ST_Agraph_s) value);
 		}
-		
+
 		@Override
-		public __struct__ getStruct(String fieldName) {
-			return ST_Agraph_s.this.getStruct(fieldName);
+		public ST_Agraph_s getPtr() {
+			return this.data.get(pos);
 		}
 
 		@Override
-		public boolean isSameThan(StarStruct other) {
-			if (other instanceof Amp) {
-				Amp other2 = (Amp) other;
-				return this.me == other2.me;
-			}
-			if (other instanceof ST_Agraph_s) {
-				ST_Agraph_s other2 = (ST_Agraph_s) other;
-				return this.me == other2;
-			}
-			return super.isSameThan(other);
+		public Array asPtr() {
+			return this;
 		}
 
 		@Override
-		public __ptr__ castTo(Class dest) {
-			if (dest == Agobj_s.class) {
-				return base.amp();
+		public ST_Agraph_s getStruct() {
+			return data.get(pos);
+		}
+
+		public Array(int size) {
+			this.data = new ArrayList<ST_Agraph_s>();
+			this.pos = 0;
+			for (int i = 0; i < size; i++) {
+				data.add(null);
 			}
-			if (dest == Agraph_s.class) {
-				return ST_Agraph_s.this;
+		}
+
+		public Array reallocJ(int newsize) {
+			while (data.size() < newsize) {
+				data.add(null);
 			}
+			return this;
+		}
 
-			return super.castTo(dest);
+		public Array plus(int delta) {
+			return plusJ(delta);
 		}
 
-		@Override
-		public Object addVirtualBytes(int virtualBytes) {
-			if (virtualBytes == 0) {
-				return this;
-			}
-			OFFSET offset = OFFSET.fromInt(virtualBytes);
-			// if (offset.toString().equals("h.Agedge_s::seq_link")) {
-			// return seq_link;
-			// }
-			if (offset.toString().equals("h.Agraph_s::link")) {
-				return link;
+		private Array(List<ST_Agraph_s> data, int pos) {
+			this.data = data;
+			this.pos = pos;
+		}
+
+		public ST_Agraph_s get(int i) {
+			return this.data.get(pos + i);
+		}
+
+		public Array plusJ(int i) {
+			return new Array(data, pos + i);
+		}
+
+		public int minus(Array other) {
+			if (this.data != other.data) {
+				throw new IllegalArgumentException();
 			}
-			System.err.println("offset176=" + offset);
-			return super.addVirtualBytes(virtualBytes);
+			return this.pos - other.pos;
+		}
+
+		public Array move(int delta) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+		public void realloc(size_t nb) {
+			throw new UnsupportedOperationException(getClass().toString());
 		}
 
-		public ST_Agraph_s getObject() {
-			return me;
+		public int comparePointerInternal(__array_of_ptr__ other) {
+			throw new UnsupportedOperationException(getClass().toString());
 		}
 
 	}
@@ -183,7 +203,7 @@ public class ST_Agraph_s extends UnsupportedStructAndPtr {
 		// if (offset.toString().equals("h.Agedge_s::seq_link")) {
 		// return seq_link;
 		// }
-		if (offset.toString().equals("h.Agraph_s::link")) {
+		if (offset.toString().equals("h.ST_Agraph_s::link")) {
 			return link;
 		}
 		System.err.println("offset156=" + offset);
@@ -191,14 +211,6 @@ public class ST_Agraph_s extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("desc")) {
-			return desc;
-		}
-		return super.getStruct(fieldName);
-	}
-
-	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("clos")) {
 			this.clos = (ST_Agclos_s) newData;
@@ -236,45 +248,20 @@ public class ST_Agraph_s extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("clos")) {
-			return clos;
-		}
-		if (fieldName.equals("root")) {
-			return root;
-		}
-		if (fieldName.equals("parent")) {
-			return parent;
-		}
-		if (fieldName.equals("n_id")) {
-			return n_id;
-		}
-		if (fieldName.equals("n_seq")) {
-			return n_seq;
-		}
-		if (fieldName.equals("e_id")) {
-			return e_id;
-		}
-		if (fieldName.equals("e_seq")) {
-			return e_seq;
-		}
-		if (fieldName.equals("g_dict")) {
-			return g_dict;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
 	public __ptr__ castTo(Class dest) {
-		if (dest == Agobj_s.class) {
+		if (dest == ST_Agobj_s.class) {
 			return base;
 		}
-		if (dest == Agraph_s.class) {
+		if (dest == ST_Agraph_s.class) {
 			return this;
 		}
 		return super.castTo(dest);
 	}
 
+	public ST_Agobj_s castTo_ST_Agobj_s() {
+		return base;
+	}
+
 	@Override
 	public boolean isSameThan(StarStruct other) {
 		ST_Agraph_s other2 = (ST_Agraph_s) other;
@@ -283,33 +270,10 @@ public class ST_Agraph_s extends UnsupportedStructAndPtr {
 
 	public StarStruct from_link(ST_dtlink_s from) {
 		if (from == link) {
-			return amp();
+			return this;
 		}
 		throw new IllegalArgumentException();
 	}
-	
-	
-	public static size_t sizeof(final int nb) {
-		return new UnsupportedSize_t(nb) {
-			@Override
-			public Object malloc() {
-				return new StarArrayOfPtr(new STArray<ST_Agraph_s>(nb, 0, ST_Agraph_s.class));
-			}
-
-			@Override
-			public int getInternalNb() {
-				return nb;
-			}
-
-			@Override
-			public Object realloc(Object old) {
-				StarArrayOfPtr old2 = (StarArrayOfPtr) old;
-				old2.realloc(nb);
-				return old2;
-			}
-		};
-	}
-
 
 	//
 	// public interface ST_Agraph_s extends __ptr__ {
diff --git a/src/h/ST_Agraphinfo_t.java b/src/h/ST_Agraphinfo_t.java
index cb9c87b..330c3ff 100644
--- a/src/h/ST_Agraphinfo_t.java
+++ b/src/h/ST_Agraphinfo_t.java
@@ -48,34 +48,31 @@ package h;
 import smetana.core.CFunction;
 import smetana.core.HardcodedStruct;
 import smetana.core.UnsupportedArrayOfStruct;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__array_of_struct__;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_Agraphinfo_t extends UnsupportedStructAndPtr implements HardcodedStruct {
 
-	private final ST_Agrec_s hdr = new ST_Agrec_s(this);
+	public final ST_Agrec_s hdr = new ST_Agrec_s(this);
 	// /* to generate code */
-	private ST_layout_t drawing;
-	private ST_textlabel_t label; /* if the cluster has a title */
-	private final ST_boxf bb = new ST_boxf(this); /* bounding box */
+	public ST_layout_t drawing;
+	public ST_textlabel_t label; /* if the cluster has a title */
+	public final ST_boxf bb = new ST_boxf(this); /* bounding box */
 	// pointf border[4]; /* sizes of margins for graph labels */
-	private final ST_pointf border[] = new ST_pointf[] { new ST_pointf(), new ST_pointf(), new ST_pointf(),
+	public final ST_pointf border[] = new ST_pointf[] { new ST_pointf(), new ST_pointf(), new ST_pointf(),
 			new ST_pointf() };
 	// unsigned char gui_state; /* Graph state for GUI ops */
-	private int has_labels;
+	public int has_labels;
 	// boolean has_images;
-	private int charset; /* input character set */
-	private int rankdir;
-	private double ht1, ht2; /* below and above extremal ranks */
-	private int flags;
+	public int charset; /* input character set */
+	public int rankdir;
+	public double ht1, ht2; /* below and above extremal ranks */
+	public int flags;
 	// void *alg;
-	private ST_GVC_s gvc; /* context for "globals" over multiple graphs */
-	private CFunction cleanup;
+	public ST_GVC_s gvc; /* context for "globals" over multiple graphs */
+	public CFunction cleanup;
 	// void (*cleanup) (graph_t * g); /* function to deallocate layout-specific data */
 	//
 	//
@@ -88,43 +85,43 @@ public class ST_Agraphinfo_t extends UnsupportedStructAndPtr implements Hardcode
 	//
 	//
 	// /* to have subgraphs */
-	private int n_cluster;
+	public int n_cluster;
 	// graph_t **clust; /* clusters are in clust[1..n_cluster] !!! */
-	private StarArrayOfPtr clust;
-	private ST_Agraph_s dotroot;
-	private ST_Agnode_s nlist;
-	private StarArrayOfPtr rank;
-	private ST_Agraph_s parent; /* containing cluster (not parent subgraph) */
+	public ST_Agraph_s.Array clust;
+	public ST_Agraph_s dotroot;
+	public ST_Agnode_s nlist;
+	public ST_rank_t.Array2 rank;
+	public ST_Agraph_s parent; /* containing cluster (not parent subgraph) */
 	// int level; /* cluster nesting level (not node level!) */
 	// node_t *minrep, *maxrep; /* set leaders for min and max rank */
 	//
 	// /* fast graph node list */
-	private final ST_nlist_t comp = new ST_nlist_t(this);
+	public final ST_nlist_t comp = new ST_nlist_t(this);
 	// /* connected components */
-	private ST_Agnode_s minset, maxset; /* set leaders */
-	private int n_nodes;
+	public ST_Agnode_s minset, maxset; /* set leaders */
+	public int n_nodes;
 	// /* includes virtual */
-	private int minrank, maxrank;
+	public int minrank, maxrank;
 	//
 	// /* various flags */
-	private int has_flat_edges;
+	public int has_flat_edges;
 	// boolean has_sourcerank;
 	// boolean has_sinkrank;
-	private int showboxes;
-	private int fontnames; /* to override mangling in SVG */
+	public int showboxes;
+	public int fontnames; /* to override mangling in SVG */
 	//
-	private int nodesep, ranksep;
-	private ST_Agnode_s ln, rn; /* left, right nodes of bounding box */
+	public int nodesep, ranksep;
+	public ST_Agnode_s ln, rn; /* left, right nodes of bounding box */
 	//
 	// /* for clusters */
 	// node_t *leader, **rankleader;
-	private ST_Agnode_s leader;
-	private STStarArrayOfPointer rankleader;
-	private boolean expanded;
-	private int installed;
-	// char set_type;
-	private int label_pos;
-	private int exact_ranksep;
+	public ST_Agnode_s leader;
+	public ST_Agnode_s.Array rankleader;
+	public boolean expanded;
+	public int installed;
+	public int set_type;
+	public int label_pos;
+	public int exact_ranksep;
 
 	private final StarStruct parent_;
 
@@ -136,14 +133,6 @@ public class ST_Agraphinfo_t extends UnsupportedStructAndPtr implements Hardcode
 		this.parent_ = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-	}
-
 	class ArrayOfFour extends UnsupportedArrayOfStruct {
 
 		final private int pos;
@@ -152,8 +141,7 @@ public class ST_Agraphinfo_t extends UnsupportedStructAndPtr implements Hardcode
 			this.pos = pos;
 		}
 
-		@Override
-		public __array_of_struct__ plus(int delta) {
+		public ArrayOfFour plus(int delta) {
 			return new ArrayOfFour(pos + delta);
 		}
 
@@ -167,36 +155,12 @@ public class ST_Agraphinfo_t extends UnsupportedStructAndPtr implements Hardcode
 			border[pos].copyDataFrom(value);
 		}
 
-		@Override
-		public double getDouble(String fieldName) {
-			return getStruct().getDouble(fieldName);
-		}
-
-	}
-
-	@Override
-	public __array_of_struct__ getArrayOfStruct(String fieldName) {
-		if (fieldName.equals("border")) {
-			return new ArrayOfFour(0);
-		}
-		return super.getArrayOfStruct(fieldName);
-	}
-
-	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("comp")) {
-			return this.comp;
-		}
-		if (fieldName.equals("bb")) {
-			return this.bb;
-		}
-		return super.getStruct(fieldName);
 	}
 
 	@Override
 	public __ptr__ castTo(Class dest) {
-		if (dest == Agrec_s.class) {
-			return hdr.amp();
+		if (dest == ST_Agrec_s.class) {
+			return hdr;
 		}
 		return super.castTo(dest);
 	}
@@ -216,15 +180,11 @@ public class ST_Agraphinfo_t extends UnsupportedStructAndPtr implements Hardcode
 			return dotroot;
 		}
 		if (fieldName.equals("parent")) {
-			if (newData instanceof ST_Agraph_s.Amp) {
-				this.parent = ((ST_Agraph_s.Amp) newData).getObject();
-			} else {
-				this.parent = (ST_Agraph_s) newData;
-			}
+			this.parent = (ST_Agraph_s) newData;
 			return parent;
 		}
 		if (fieldName.equals("clust")) {
-			this.clust = (StarArrayOfPtr) newData;
+			this.clust = (ST_Agraph_s.Array) newData;
 			return clust;
 		}
 		if (fieldName.equals("label")) {
@@ -240,11 +200,7 @@ public class ST_Agraphinfo_t extends UnsupportedStructAndPtr implements Hardcode
 			return minset;
 		}
 		if (fieldName.equals("nlist")) {
-			if (newData instanceof ST_Agnode_s.Amp) {
-				this.nlist = ((ST_Agnode_s.Amp) newData).getObject();
-			} else {
-				this.nlist = (ST_Agnode_s) newData;
-			}
+			this.nlist = (ST_Agnode_s) newData;
 			return nlist;
 		}
 		if (fieldName.equals("leader")) {
@@ -252,11 +208,11 @@ public class ST_Agraphinfo_t extends UnsupportedStructAndPtr implements Hardcode
 			return leader;
 		}
 		if (fieldName.equals("rankleader")) {
-			this.rankleader = (STStarArrayOfPointer) newData;
+			this.rankleader = (ST_Agnode_s.Array) newData;
 			return rankleader;
 		}
 		if (fieldName.equals("rank")) {
-			this.rank = (StarArrayOfPtr) newData;
+			this.rank = (ST_rank_t.Array2) newData;
 			return rank;
 		}
 		if (fieldName.equals("ln")) {
@@ -271,69 +227,6 @@ public class ST_Agraphinfo_t extends UnsupportedStructAndPtr implements Hardcode
 	}
 
 	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("drawing")) {
-			return drawing;
-		}
-		if (fieldName.equals("gvc")) {
-			return gvc;
-		}
-		if (fieldName.equals("parent")) {
-			return parent;
-		}
-		if (fieldName.equals("dotroot")) {
-			return dotroot;
-		}
-		if (fieldName.equals("clust")) {
-			return clust;
-		}
-		if (fieldName.equals("label")) {
-			return label;
-		}
-		if (fieldName.equals("maxset")) {
-			return maxset;
-		}
-		if (fieldName.equals("minset")) {
-			return minset;
-		}
-		if (fieldName.equals("nlist")) {
-			return nlist;
-		}
-		if (fieldName.equals("leader")) {
-			return leader;
-		}
-		if (fieldName.equals("rankleader")) {
-			return rankleader;
-		}
-		if (fieldName.equals("rank")) {
-			return rank;
-		}
-		if (fieldName.equals("ln")) {
-			return ln;
-		}
-		if (fieldName.equals("rn")) {
-			return rn;
-		}
-		if (fieldName.equals("cleanup")) {
-			return cleanup;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
-	public void setBoolean(String fieldName, boolean data) {
-		if (fieldName.equals("expanded")) {
-			this.expanded = data;
-			return;
-		}
-		if (fieldName.equals("has_flat_edges")) {
-			this.has_flat_edges = data ? 1 : 0;
-			return;
-		}
-		super.setBoolean(fieldName, data);
-	}
-
-	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("charset")) {
 			this.charset = data;
@@ -394,71 +287,6 @@ public class ST_Agraphinfo_t extends UnsupportedStructAndPtr implements Hardcode
 		super.setInt(fieldName, data);
 	}
 
-	@Override
-	public boolean getBoolean(String fieldName) {
-		if (fieldName.equals("expanded")) {
-			return expanded;
-		}
-		return super.getBoolean(fieldName);
-	}
-
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("flags")) {
-			return flags;
-		}
-		if (fieldName.equals("charset")) {
-			return charset;
-		}
-		if (fieldName.equals("rankdir")) {
-			return rankdir;
-		}
-		if (fieldName.equals("has_labels")) {
-			return has_labels;
-		}
-		if (fieldName.equals("n_cluster")) {
-			return n_cluster;
-		}
-		if (fieldName.equals("label_pos")) {
-			return label_pos;
-		}
-		if (fieldName.equals("n_nodes")) {
-			return n_nodes;
-		}
-		if (fieldName.equals("maxrank")) {
-			return maxrank;
-		}
-		if (fieldName.equals("minrank")) {
-			return minrank;
-		}
-		if (fieldName.equals("has_flat_edges")) {
-			return has_flat_edges;
-		}
-		if (fieldName.equals("installed")) {
-			return installed;
-		}
-		if (fieldName.equals("exact_ranksep")) {
-			return exact_ranksep;
-		}
-		if (fieldName.equals("nodesep")) {
-			return nodesep;
-		}
-		if (fieldName.equals("ranksep")) {
-			return ranksep;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
-	public double getDouble(String fieldName) {
-		if (fieldName.equals("ht1")) {
-			return ht1;
-		}
-		if (fieldName.equals("ht2")) {
-			return ht2;
-		}
-		return super.getDouble(fieldName);
-	}
 
 	@Override
 	public void setDouble(String fieldName, double data) {
diff --git a/src/h/ST_Agrec_s.java b/src/h/ST_Agrec_s.java
index 9f466cc..f174692 100644
--- a/src/h/ST_Agrec_s.java
+++ b/src/h/ST_Agrec_s.java
@@ -46,7 +46,6 @@
 package h;
 
 import smetana.core.CString;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
@@ -55,7 +54,7 @@ import smetana.core.amiga.StarStruct;
 public class ST_Agrec_s extends UnsupportedStructAndPtr implements WithParent {
 
 	public CString name;
-	public ST_Agrec_s.Amp next;
+	public ST_Agrec_s next;
 
 	private final StarStruct parent;
 
@@ -83,79 +82,48 @@ public class ST_Agrec_s extends UnsupportedStructAndPtr implements WithParent {
 	}
 
 	@Override
-	public StarStruct amp() {
-		return new Amp(this);
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-		private final ST_Agrec_s me;
-
-		public Amp(ST_Agrec_s me) {
-			this.me = me;
-		}
-
-		@Override
-		public boolean isSameThan(StarStruct other) {
-			Amp other2 = (Amp) other;
-			return this.me == other2.me;
-		}
-
-		@Override
-		public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-			return ST_Agrec_s.this.setPtr(fieldName, newData);
-		}
-
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			return ST_Agrec_s.this.getPtr(fieldName);
-		}
-
-		@Override
-		public __ptr__ castTo(Class dest) {
-			return ST_Agrec_s.this.castTo(dest);
-		}
-
-		@Override
-		public CString getCString(String fieldName) {
-			return ST_Agrec_s.this.getCString(fieldName);
-		}
-
-		@Override
-		public void copyDataFrom(__struct__ other) {
-			ST_Agrec_s.this.copyDataFrom(other);
-		}
-	}
-
-	@Override
-	public CString getCString(String fieldName) {
-		if (fieldName.equals("name")) {
-			return name;
-		}
-		return super.getCString(fieldName);
+	public boolean isSameThan(StarStruct other) {
+		ST_Agrec_s other2 = (ST_Agrec_s) other;
+		return this == other2;
 	}
 
 	@Override
 	public __ptr__ castTo(Class dest) {
-		if (dest == Agdatadict_s.class && getParent() instanceof ST_Agdatadict_s) {
+		if (dest == ST_Agdatadict_s.class && getParent() instanceof ST_Agdatadict_s) {
 			return (ST_Agdatadict_s) getParent();
 		}
-		if (dest == Agattr_s.class && getParent() instanceof ST_Agattr_s) {
+		if (dest == ST_Agattr_s.class && getParent() instanceof ST_Agattr_s) {
 			return (ST_Agattr_s) getParent();
 		}
-		if (dest == Agraphinfo_t.class && getParent() instanceof ST_Agraphinfo_t) {
+		if (dest == ST_Agraphinfo_t.class && getParent() instanceof ST_Agraphinfo_t) {
 			return (ST_Agraphinfo_t) getParent();
 		}
-		if (dest == Agnodeinfo_t.class && getParent() instanceof ST_Agnodeinfo_t) {
+		if (dest == ST_Agnodeinfo_t.class && getParent() instanceof ST_Agnodeinfo_t) {
 			return (ST_Agnodeinfo_t) getParent();
 		}
-		if (dest == Agedgeinfo_t.class && getParent() instanceof ST_Agedgeinfo_t) {
+		if (dest == ST_Agedgeinfo_t.class && getParent() instanceof ST_Agedgeinfo_t) {
 			return (ST_Agedgeinfo_t) getParent();
 		}
 		System.err.println("dest=" + dest);
 		System.err.println("getParent=" + getParent().getClass());
 		return super.castTo(dest);
 	}
+	
+	public ST_Agnodeinfo_t castTo_ST_Agnodeinfo_t() {
+		if (getParent() instanceof ST_Agnodeinfo_t) {
+			return (ST_Agnodeinfo_t) getParent();
+		}
+		throw new UnsupportedOperationException();
+	}
+
+
+
+	public ST_Agraphinfo_t castTo_ST_Agraphinfo_t() {
+		if (getParent() instanceof ST_Agraphinfo_t) {
+			return (ST_Agraphinfo_t) getParent();
+		}
+		throw new UnsupportedOperationException();
+	}
 
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
@@ -165,23 +133,13 @@ public class ST_Agrec_s extends UnsupportedStructAndPtr implements WithParent {
 		}
 		if (fieldName.equals("next")) {
 			if (newData instanceof ST_Agrec_s) {
-				this.next = (ST_Agrec_s.Amp) ((ST_Agrec_s) newData).amp();
-			} else {
-				this.next = (ST_Agrec_s.Amp) newData;
+				this.next = (ST_Agrec_s) newData;
 			}
 			return next;
 		}
 		return super.setPtr(fieldName, newData);
 	}
 
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("next")) {
-			return next;
-		}
-		return super.getPtr(fieldName);
-	}
-
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "struct Agrec_s",
 	// "{",
diff --git a/src/h/ST_Agsubnode_s.java b/src/h/ST_Agsubnode_s.java
index 0584063..c6a1899 100644
--- a/src/h/ST_Agsubnode_s.java
+++ b/src/h/ST_Agsubnode_s.java
@@ -45,10 +45,8 @@
  */
 package h;
 
-import h.ST_splineInfo.Amp;
 import smetana.core.HardcodedStruct;
 import smetana.core.OFFSET;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
@@ -57,11 +55,11 @@ public class ST_Agsubnode_s extends UnsupportedStructAndPtr implements Hardcoded
 
 	public final ST_dtlink_s seq_link = new ST_dtlink_s(this);
 	public final ST_dtlink_s id_link = new ST_dtlink_s(this);
-	public Agnode_s node;
-	public ST_dtlink_s.Amp in_id;
-	public ST_dtlink_s.Amp out_id;
-	public ST_dtlink_s.Amp in_seq;
-	public ST_dtlink_s.Amp out_seq;
+	public ST_Agnode_s node;
+	public ST_dtlink_s in_id;
+	public ST_dtlink_s out_id;
+	public ST_dtlink_s in_seq;
+	public ST_dtlink_s out_seq;
 
 	public ST_Agsubnode_s() {
 		this(null);
@@ -70,98 +68,46 @@ public class ST_Agsubnode_s extends UnsupportedStructAndPtr implements Hardcoded
 	public ST_Agsubnode_s(StarStruct parent) {
 	}
 
-	public StarStruct from_id_link(ST_dtlink_s from) {
+	public ST_Agsubnode_s from_id_link(ST_dtlink_s from) {
 		if (from == id_link) {
-			return amp();
+			return this;
 		}
 		throw new IllegalArgumentException();
 	}
 
-	public StarStruct from_seq_link(ST_dtlink_s from) {
+	public ST_Agsubnode_s from_seq_link(ST_dtlink_s from) {
 		if (from == seq_link) {
-			return amp();
+			return this;
 		}
 		throw new IllegalArgumentException();
 	}
 
-	public class Amp extends UnsupportedStarStruct {
-
-		private final ST_Agsubnode_s me;
-
-		public Amp(ST_Agsubnode_s me) {
-			this.me = me;
-		}
-
-		@Override
-		public boolean isSameThan(StarStruct other) {
-			Amp other2 = (Amp) other;
-			return this.me == other2.me;
-		}
-
-		@Override
-		public Object addVirtualBytes(int virtualBytes) {
-			if (virtualBytes == 0) {
-				return this;
-			}
-			final OFFSET offset = OFFSET.fromInt(virtualBytes);
-			if (offset.toString().equals("h.Agsubnode_s::id_link")) {
-				return id_link.amp();
-			}
-			if (offset.toString().equals("h.Agsubnode_s::seq_link")) {
-				return seq_link.amp();
-			}
-			System.err.println("virtualBytes=" + virtualBytes);
-			System.err.println("offset=" + offset);
-			return super.addVirtualBytes(virtualBytes);
-		}
-
-		@Override
-		public __ptr__ castTo(Class dest) {
-			if (dest == Agsubnode_s.class) {
-				return this;
-			}
-			System.err.println("dest=" + dest);
-			return super.castTo(dest);
-		}
-
-		@Override
-		public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-			return ST_Agsubnode_s.this.setPtr(fieldName, newData);
-		}
-
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			return ST_Agsubnode_s.this.getPtr(fieldName);
-		}
+	@Override
+	public boolean isSameThan(StarStruct other) {
+		return this == (ST_Agsubnode_s) other;
 	}
-	
+
 	@Override
 	public Object addVirtualBytes(int virtualBytes) {
 		if (virtualBytes == 0) {
 			return this;
 		}
 		final OFFSET offset = OFFSET.fromInt(virtualBytes);
-		if (offset.toString().equals("h.Agsubnode_s::id_link")) {
-			return id_link.amp();
+		if (offset.toString().equals("h.ST_Agsubnode_s::id_link")) {
+			return id_link;
 		}
-		if (offset.toString().equals("h.Agsubnode_s::seq_link")) {
-			return seq_link.amp();
+		if (offset.toString().equals("h.ST_Agsubnode_s::seq_link")) {
+			return seq_link;
 		}
 		System.err.println("virtualBytes=" + virtualBytes);
 		System.err.println("offset=" + offset);
 		return super.addVirtualBytes(virtualBytes);
 	}
 
-
-	@Override
-	public StarStruct amp() {
-		return new Amp(this);
-	}
-
 	@Override
 	public __ptr__ castTo(Class dest) {
-		if (dest == Agsubnode_s.class) {
-			return this;
+		if (dest == ST_Agsubnode_s.class) {
+			return ST_Agsubnode_s.this;
 		}
 		System.err.println("dest=" + dest);
 		return super.castTo(dest);
@@ -170,19 +116,19 @@ public class ST_Agsubnode_s extends UnsupportedStructAndPtr implements Hardcoded
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("node")) {
-			this.node = (Agnode_s) newData;
+			this.node = (ST_Agnode_s) newData;
 			return node;
 		}
 		if (fieldName.equals("in_id")) {
-			this.in_id = (h.ST_dtlink_s.Amp) newData;
+			this.in_id = (h.ST_dtlink_s) newData;
 			return in_id;
 		}
 		if (fieldName.equals("out_seq")) {
-			this.out_seq = (h.ST_dtlink_s.Amp) newData;
+			this.out_seq = (h.ST_dtlink_s) newData;
 			return out_seq;
 		}
 		if (fieldName.equals("out_id")) {
-			this.out_id = (h.ST_dtlink_s.Amp) newData;
+			this.out_id = (h.ST_dtlink_s) newData;
 			return out_id;
 		}
 		if (fieldName.equals("seq_link")) {
@@ -190,32 +136,12 @@ public class ST_Agsubnode_s extends UnsupportedStructAndPtr implements Hardcoded
 			return seq_link;
 		}
 		if (fieldName.equals("in_seq")) {
-			this.in_seq = (h.ST_dtlink_s.Amp) newData;
+			this.in_seq = (h.ST_dtlink_s) newData;
 			return in_seq;
 		}
 		return super.setPtr(fieldName, newData);
 	}
 
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("node")) {
-			return node;
-		}
-		if (fieldName.equals("in_id")) {
-			return in_id;
-		}
-		if (fieldName.equals("out_seq")) {
-			return out_seq;
-		}
-		if (fieldName.equals("out_id")) {
-			return out_id;
-		}
-		if (fieldName.equals("in_seq")) {
-			return in_seq;
-		}
-		return super.getPtr(fieldName);
-	}
-	
 
 	// public interface ST_Agsubnode_s extends __ptr__ {
 	// public static List<String> DEFINITION = Arrays.asList(
diff --git a/src/h/ST_Agsym_s.java b/src/h/ST_Agsym_s.java
index 6e77a15..8c5ce40 100644
--- a/src/h/ST_Agsym_s.java
+++ b/src/h/ST_Agsym_s.java
@@ -48,7 +48,6 @@ package h;
 import smetana.core.CString;
 import smetana.core.HardcodedStruct;
 import smetana.core.OFFSET;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
@@ -75,10 +74,10 @@ public class ST_Agsym_s extends UnsupportedStructAndPtr implements HardcodedStru
 			return this;
 		}
 		final OFFSET offset = OFFSET.fromInt(virtualBytes);
-		if (offset.toString().equals("h.Agsym_s::name")) {
+		if (offset.toString().equals("h.ST_Agsym_s::name")) {
 			return name;
 		}
-		if (offset.toString().equals("h.Agsym_s::link")) {
+		if (offset.toString().equals("h.ST_Agsym_s::link")) {
 			return link;
 		}
 		System.err.println("virtualBytes=" + virtualBytes);
@@ -89,56 +88,14 @@ public class ST_Agsym_s extends UnsupportedStructAndPtr implements HardcodedStru
 	public ST_Agsym_s() {
 		this(null);
 	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-		private final ST_Agsym_s me;
-
-		public Amp(ST_Agsym_s me) {
-			this.me = me;
-		}
-
-		@Override
-		public boolean isSameThan(StarStruct other) {
-			Amp other2 = (Amp) other;
-			return this.me == other2.me;
-		}
-
-		@Override
-		public Object addVirtualBytes(int virtualBytes) {
-			if (virtualBytes == 0) {
-				return this;
-			}
-			final OFFSET offset = OFFSET.fromInt(virtualBytes);
-			if (offset.toString().equals("h.Agsym_s::name")) {
-				return name;
-			}
-			System.err.println("virtualBytes=" + virtualBytes);
-			System.err.println("offset=" + offset);
-			return super.addVirtualBytes(virtualBytes);
-		}
-
-		@Override
-		public int getInt(String fieldName) {
-			return ST_Agsym_s.this.getInt(fieldName);
-		}
-
-		@Override
-		public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-			return ST_Agsym_s.this.setPtr(fieldName, newData);
-		}
-
-		@Override
-		public CString getCString(String fieldName) {
-			return ST_Agsym_s.this.getCString(fieldName);
-		}
-	}
-
+	
 	@Override
-	public StarStruct amp() {
-		return new Amp(this);
+	public boolean isSameThan(StarStruct other) {
+		ST_Agsym_s other2 = (ST_Agsym_s) other;
+		return this == other2;
 	}
 
+
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("name")) {
@@ -165,31 +122,9 @@ public class ST_Agsym_s extends UnsupportedStructAndPtr implements HardcodedStru
 		super.setInt(fieldName, data);
 	}
 
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("kind")) {
-			return kind;
-		}
-		if (fieldName.equals("id")) {
-			return id;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
-	public CString getCString(String fieldName) {
-		if (fieldName.equals("defval")) {
-			return defval;
-		}
-		if (fieldName.equals("name")) {
-			return name;
-		}
-		return super.getCString(fieldName);
-	}
-
 	public StarStruct from_link(ST_dtlink_s from) {
 		if (from == link) {
-			return amp();
+			return this;
 		}
 		throw new IllegalArgumentException();
 	}
diff --git a/src/h/ST_Agtag_s.java b/src/h/ST_Agtag_s.java
index cf72f25..cb3b48b 100644
--- a/src/h/ST_Agtag_s.java
+++ b/src/h/ST_Agtag_s.java
@@ -70,7 +70,7 @@ public class ST_Agtag_s extends UnsupportedStructAndPtr implements HardcodedStru
 
 	@Override
 	public Class getRealClass() {
-		return Agtag_s.class;
+		return ST_Agtag_s.class;
 	}
 
 	@Override
diff --git a/src/h/polygon_t.java b/src/h/ST_BestPos_t.java
index d5b5356..7bdd3b9 100644
--- a/src/h/polygon_t.java
+++ b/src/h/ST_BestPos_t.java
@@ -44,36 +44,74 @@
  *
  */
 package h;
-import java.util.Arrays;
-import java.util.List;
 
-import smetana.core.__ptr__;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
 
-//2 23el548cy5m8f5wz8b2x5tihx
+public class ST_BestPos_t extends UnsupportedStructAndPtr {
 
-public interface polygon_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct polygon_t",
-"{",
-"int regular",
-"int peripheries",
-"int sides",
-"double orientation",
-"double distortion",
-"double skew",
-"int option",
-"pointf *vertices",
-"}",
-"polygon_t");
-}
+	private final StarStruct parent;
+
+	public int n;
+	public double area;
+	public final ST_pointf pos = new ST_pointf(this);
+
+	public ST_BestPos_t() {
+		this(null);
+	}
+
+	public ST_BestPos_t(StarStruct parent) {
+		this.parent = parent;
+	}
+
+	@Override
+	public __struct__ copy() {
+		final ST_BestPos_t result = new ST_BestPos_t();
+		result.n = this.n;
+		result.area = this.area;
+		result.pos.copyDataFrom((__struct__) this.pos);
+		return result;
+	}
+	
+	public void ___(__struct__ other) {
+		ST_BestPos_t this2 = (ST_BestPos_t) other;
+		this.n = this2.n;
+		this.area = this2.area;
+		this.pos.copyDataFrom((__struct__) this2.pos);
+	}
 
-// typedef struct polygon_t {	/* mutable shape information for a node */
-// 	int regular;		/* true for symmetric shapes */
-// 	int peripheries;	/* number of periphery lines */
-// 	int sides;		/* number of sides */
-// 	double orientation;	/* orientation of shape (+ve degrees) */
-// 	double distortion;	/* distortion factor - as in trapezium */
-// 	double skew;		/* skew factor - as in parallelogram */
-// 	int option;		/* ROUNDED, DIAGONAL corners, etc. */
-// 	pointf *vertices;	/* array of vertex points */
-//     } polygon_t;
\ No newline at end of file
+
+	@Override
+	public void setStruct(String fieldName, __struct__ newData) {
+		if (fieldName.equals("pos")) {
+			pos.copyDataFrom(newData);
+			return;
+		}
+		super.setStruct(fieldName, newData);
+	}
+
+	@Override
+	public void setInt(String fieldName, int data) {
+		if (fieldName.equals("n")) {
+			this.n = data;
+			return;
+		}
+		super.setInt(fieldName, data);
+	}
+
+	@Override
+	public void setDouble(String fieldName, double data) {
+		if (fieldName.equals("area")) {
+			this.area = data;
+			return;
+		}
+		super.setDouble(fieldName, data);
+	}
+
+	// typedef struct best_p_s {
+	// int n;
+	// double area;
+	// pointf pos;
+	// } BestPos_t;
+}
diff --git a/src/h/STStarArrayOfPointer.java b/src/h/ST_Branch_t.java
index 7025548..19089fc 100644
--- a/src/h/STStarArrayOfPointer.java
+++ b/src/h/ST_Branch_t.java
@@ -45,73 +45,67 @@
  */
 package h;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import smetana.core.UnsupportedC;
-import smetana.core.__array_of_integer__;
+import smetana.core.HardcodedStruct;
+import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
-import smetana.core.amiga.Area;
+import smetana.core.__struct__;
 
-public class STStarArrayOfPointer extends UnsupportedC {
+public class ST_Branch_t extends UnsupportedStructAndPtr implements HardcodedStruct {
 
-	private final int pos;
-	private final List<__ptr__> data;
+	// Warning : could be a "ST_Leaf_t" from C Version
+	public final ST_Rect_t rect = new ST_Rect_t(this);
+	public ST_Node_t___or_object_t child; // "data" : ST_object_t
 
-	public void realloc(int nb) {
-		while (data.size() < nb) {
-			data.add(null);
-		}
+	public ST_Branch_t() {
 	}
 
-	public static STStarArrayOfPointer malloc(int size) {
-		List<__ptr__> data = new ArrayList<__ptr__>();
-		for (int i = 0; i < size; i++) {
-			data.add(null);
-		}
-		return new STStarArrayOfPointer(0, data);
-	}
-
-	private STStarArrayOfPointer(int pos, List<__ptr__> data) {
-		this.pos = pos;
-		this.data = data;
+	@Override
+	public void copyDataFrom(__struct__ other) {
+		ST_Branch_t this2 = (ST_Branch_t) other;
+		this.rect.copyDataFrom((__struct__) this2.rect);
+		this.child = this2.child;
 	}
 
 	@Override
-	public int comparePointer(__ptr__ other) {
-		final STStarArrayOfPointer this2 = (STStarArrayOfPointer) other;
-		if (this.data != this2.data) {
-			throw new IllegalArgumentException();
+	public __ptr__ castTo(Class dest) {
+		if (dest == Branch_t.class) {
+			return ST_Branch_t.this;
+		}
+		if (dest == ST_Rect_t.class) {
+			return rect;
 		}
-		return this.pos - this2.pos;
+		return super.castTo(dest);
 	}
 
-	@Override
-	public __ptr__ plus(int pointerMove) {
-		return new STStarArrayOfPointer(pos + pointerMove, data);
+	public __struct__ getStruct() {
+		return this;
 	}
 
 	@Override
-	public void setPtr(__ptr__ value) {
-		data.set(pos, value);
+	public void ___(__struct__ other) {
+		this.copyDataFrom(other);
 	}
 
 	@Override
-	public __ptr__ getPtr(String fieldName) {
-		return data.get(pos).getPtr(fieldName);
+	public void setStruct(String fieldName, __struct__ newData) {
+		if (fieldName.equals("rect")) {
+			this.rect.copyDataFrom(newData);
+			return;
+		}
+		super.setStruct(fieldName, newData);
 	}
 
 	@Override
-	public __ptr__ getPtr() {
-		return data.get(pos);
-	}
-
-	public void swap(int i, int j) {
-		__ptr__ e1 = data.get(i);
-		__ptr__ e2 = data.get(j);
-		data.set(i, e2);
-		data.set(j, e1);
-
+	public ST_Node_t___or_object_t setPtr(String fieldName, __ptr__ newData) {
+		if (fieldName.equals("child")) {
+			this.child = (ST_Node_t___or_object_t) newData;
+			return this.child;
+		}
+		throw new UnsupportedOperationException();
 	}
 
+	// typedef struct Branch {
+	// Rect_t rect;
+	// struct Node *child;
+	// } Branch_t;
 }
diff --git a/src/h/ST_EMPTY.java b/src/h/ST_EMPTY.java
index c3329c1..8e257f1 100644
--- a/src/h/ST_EMPTY.java
+++ b/src/h/ST_EMPTY.java
@@ -45,7 +45,6 @@
  */
 package h;
 
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.amiga.StarStruct;
 
@@ -61,13 +60,4 @@ public class ST_EMPTY extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
-
 }
diff --git a/src/h/ST_GVCOMMON_t.java b/src/h/ST_GVCOMMON_t.java
index 2028d07..55e1e05 100644
--- a/src/h/ST_GVCOMMON_t.java
+++ b/src/h/ST_GVCOMMON_t.java
@@ -47,7 +47,6 @@ package h;
 
 import smetana.core.CFunction;
 import smetana.core.HardcodedStruct;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
@@ -56,18 +55,18 @@ public class ST_GVCOMMON_t extends UnsupportedStructAndPtr implements HardcodedS
 
 	// "typedef struct GVCOMMON_s",
 	// "{",
-	private __ptr__ info;
+	public __ptr__ info;
 	// "char *cmdname",
 	// "int verbose",
 	// "boolean config, auto_outfile_names",
 	// "void (*errorfn) (const char *fmt, ...)",
-	private CFunction errorfn;
+	public CFunction errorfn;
 	// "const char **show_boxes",
 	// "const char **lib",
 	// "int viewNum",
 	// "const lt_symlist_t *builtins",
-	private __ptr__ builtins;
-	private boolean demand_loading;
+	public __ptr__ builtins;
+	public boolean demand_loading;
 	// "}",
 	// "GVCOMMON_t");
 
@@ -82,14 +81,6 @@ public class ST_GVCOMMON_t extends UnsupportedStructAndPtr implements HardcodedS
 	}
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-	}
-
-	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("info")) {
 			this.info = newData;
@@ -106,23 +97,6 @@ public class ST_GVCOMMON_t extends UnsupportedStructAndPtr implements HardcodedS
 		return super.setPtr(fieldName, newData);
 	}
 
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("builtins") && builtins == null) {
-			return builtins;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
-	public void setBoolean(String fieldName, boolean data) {
-		if (fieldName.equals("demand_loading")) {
-			this.demand_loading = data;
-			return;
-		}
-		super.setBoolean(fieldName, data);
-	}
-
 }
 
 // typedef struct GVCOMMON_s {
diff --git a/src/h/ST_GVC_s.java b/src/h/ST_GVC_s.java
index 6ca8393..c30a0f6 100644
--- a/src/h/ST_GVC_s.java
+++ b/src/h/ST_GVC_s.java
@@ -46,18 +46,16 @@
 package h;
 
 import smetana.core.HardcodedStruct;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__struct__;
 import smetana.core.amiga.StarStruct;
 
 public class ST_GVC_s extends UnsupportedStructAndPtr implements HardcodedStruct {
 
 	// "struct GVC_s",
 	// "{",
-	private final ST_GVCOMMON_t common = new ST_GVCOMMON_t(this);
+	public final ST_GVCOMMON_t common = new ST_GVCOMMON_t(this);
 	// "char *config_path",
-	private int config_found;
+	public int config_found;
 	// "char **input_filenames",
 	// "GVG_t *gvgs",
 	// "GVG_t *gvg",
@@ -71,7 +69,7 @@ public class ST_GVC_s extends UnsupportedStructAndPtr implements HardcodedStruct
 	// "GVJ_t *jobs",
 	// "GVJ_t *job",
 	// "graph_t *g",
-	private final ST_gvplugin_active_layout_t layout = new ST_gvplugin_active_layout_t();
+	public final ST_gvplugin_active_layout_t layout = new ST_gvplugin_active_layout_t();
 	// "char *graphname",
 	// "GVJ_t *active_jobs",
 	// "char *pagedir",
@@ -106,25 +104,6 @@ public class ST_GVC_s extends UnsupportedStructAndPtr implements HardcodedStruct
 	}
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-	}
-
-	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("common")) {
-			return common;
-		}
-		if (fieldName.equals("layout")) {
-			return layout;
-		}
-		return super.getStruct(fieldName);
-	}
-
-	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("config_found")) {
 			this.config_found = data;
diff --git a/src/h/ST_HDict_t.java b/src/h/ST_HDict_t.java
index 0c55223..c530d50 100644
--- a/src/h/ST_HDict_t.java
+++ b/src/h/ST_HDict_t.java
@@ -45,20 +45,18 @@
  */
 package h;
 
-import h.ST_HDict_t.Amp;
-
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.UnsupportedStarStruct;
+import smetana.core.OFFSET;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
 
 public class ST_HDict_t extends UnsupportedStructAndPtr {
 
 	private final StarStruct parent;
 
+	public final ST_dtlink_s link = new ST_dtlink_s(this);
+	public int key;
+	public final ST_Branch_t d = new ST_Branch_t(); /* Should be ST_Leaf_t */
+	
 	public ST_HDict_t() {
 		this(null);
 	}
@@ -68,13 +66,38 @@ public class ST_HDict_t extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
+	public Object addVirtualBytes(int virtualBytes) {
+		if (virtualBytes == 0) {
+			return this;
+		}
+		OFFSET offset = OFFSET.fromInt(virtualBytes);
+		if (offset.toString().equals("h.ST_HDict_t::key")) {
+			return key;
+		}
+		System.err.println("offset="+offset);
 
-	public class Amp extends UnsupportedStarStruct {
+		// TODO Auto-generated method stub
+		return super.addVirtualBytes(virtualBytes);
+	}
 
+//	@Override
+//	public __ptr__ getPtr(String fieldName) {
+//		if (fieldName.equals("d")) {
+//			return this.d;
+//		}
+//		return super.getPtr(fieldName);
+//	}
+	
+	@Override
+	public void setInt(String fieldName, int data) {
+		if (fieldName.equals("key")) {
+			this.key = data;
+			return;
+		}
+		super.setInt(fieldName, data);
 	}
+	
+	
 	// "typedef struct obyh",
 	// "{",
 	// "Dtlink_t link",
diff --git a/src/h/ST_IMapEntry_t.java b/src/h/ST_IMapEntry_t.java
index 1f6f4de..5b2ba1a 100644
--- a/src/h/ST_IMapEntry_t.java
+++ b/src/h/ST_IMapEntry_t.java
@@ -45,19 +45,15 @@
  */
 package h;
 
-import h.ST_IMapEntry_t.Amp;
-
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.UnsupportedStarStruct;
+import smetana.core.CString;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
 
 public class ST_IMapEntry_t extends UnsupportedStructAndPtr {
 
 	private final StarStruct parent;
+	
+	public final CString str = null;
 
 	public ST_IMapEntry_t() {
 		this(null);
@@ -67,14 +63,6 @@ public class ST_IMapEntry_t extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
 	// "typedef struct IMapEntry_s",
 	// "{",
 	// "Dtlink_t namedict_link",
diff --git a/src/h/agusererrf.java b/src/h/ST_LeafList_t.java
index 966af9a..bd604c1 100644
--- a/src/h/agusererrf.java
+++ b/src/h/ST_LeafList_t.java
@@ -44,16 +44,21 @@
  *
  */
 package h;
-import java.util.Arrays;
-import java.util.List;
 
-import smetana.core.__ptr__;
+import smetana.core.UnsupportedStructAndPtr;
 
-//2 dar3eyxi2ee4qldba8o9a54az
+public class ST_LeafList_t extends UnsupportedStructAndPtr {
+
+	public ST_LeafList_t next;
+	public ST_Branch_t /* ST_Leaf_t */leaf;
+
+	public ST_LeafList_t() {
+	}
 
-public interface agusererrf extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef int (*agusererrf) (char*)");
-}
 
-// typedef int (*agusererrf) (char*);
\ No newline at end of file
+	// typedef struct LeafList {
+	// struct LeafList *next;
+	// Leaf_t *leaf;
+	// } LeafList_t;
+
+}
diff --git a/src/h/ST_Node_t___.java b/src/h/ST_Node_t___.java
index 3b48a6b..22e2848 100644
--- a/src/h/ST_Node_t___.java
+++ b/src/h/ST_Node_t___.java
@@ -44,19 +44,32 @@
  *
  */
 package h;
-import h.ST_Node_t___.Amp;
 
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedArrayOfStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__ptr__;
+import smetana.core.__struct__;
 import smetana.core.amiga.StarStruct;
 
-public class ST_Node_t___ extends UnsupportedStructAndPtr {
+public class ST_Node_t___ extends UnsupportedStructAndPtr implements ST_Node_t___or_object_t {
 
 	private final StarStruct parent;
+	public int count;
+	public int level;
+	// Sorry guys :-)
+	public final ST_Branch_t branch[] = new ST_Branch_t[] { new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t() };
 
 	public ST_Node_t___() {
 		this(null);
@@ -66,25 +79,55 @@ public class ST_Node_t___ extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
+	class ArrayOfSixtyFor extends UnsupportedArrayOfStruct {
+
+		final private int pos;
+
+		public ArrayOfSixtyFor(int pos) {
+			this.pos = pos;
+		}
+
+		public ArrayOfSixtyFor plus(int delta) {
+			return new ArrayOfSixtyFor(pos + delta);
+		}
+
+		@Override
+		public __struct__ getStruct() {
+			return branch[pos];
+		}
+
+		@Override
+		public void setStruct(__struct__ value) {
+			branch[pos].copyDataFrom(value);
+		}
+
+	}
+
 	@Override
-	public StarStruct amp() {
-		return new Amp();
+	public void setInt(String fieldName, int data) {
+		if (fieldName.equals("count")) {
+			this.count = data;
+			return;
+		}
+		if (fieldName.equals("level")) {
+			this.level = data;
+			return;
+		}
+		super.setInt(fieldName, data);
 	}
 
-	public class Amp extends UnsupportedStarStruct {
 
-	}
-//"typedef struct Node",
-//"{",
-//"int count",
-//"int level",
-//"struct Branch branch[64]",
-//"}",
-//"Node_t");
+	// "typedef struct Node",
+	// "{",
+	// "int count",
+	// "int level",
+	// "struct Branch branch[64]",
+	// "}",
+	// "Node_t");
 }
 
 // typedef struct Node {
-//     int count;
-//     int level;			/* 0 is leaf, others positive */
-//     struct Branch branch[64];
+// int count;
+// int level; /* 0 is leaf, others positive */
+// struct Branch branch[64];
 // } Node_t;
\ No newline at end of file
diff --git a/src/h/Grid.java b/src/h/ST_Node_t___or_object_t.java
index cfe2344..b67442f 100644
--- a/src/h/Grid.java
+++ b/src/h/ST_Node_t___or_object_t.java
@@ -44,14 +44,9 @@
  *
  */
 package h;
-import java.util.Arrays;
-import java.util.List;
 
-//2 4i6l1ddogjsyl2pt4s30fqmwy
+import smetana.core.__ptr__;
 
-public interface Grid extends _grid {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct _grid Grid");
-}
+public interface ST_Node_t___or_object_t extends __ptr__ {
 
-// typedef struct _grid Grid;
\ No newline at end of file
+}
diff --git a/src/h/agxbuf.java b/src/h/ST_PartitionVars.java
index 771f8a2..5ea7aed 100644
--- a/src/h/agxbuf.java
+++ b/src/h/ST_PartitionVars.java
@@ -44,28 +44,67 @@
  *
  */
 package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 2bvk4wwyb3pp3ygpa39hp9xqw
-
-public interface agxbuf extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"unsigned char *buf",
-"unsigned char *ptr",
-"unsigned char *eptr",
-"int dyna",
-"}",
-"agxbuf");
-}
 
-// typedef struct {
-// 	unsigned char *buf;	/* start of buffer */
-// 	unsigned char *ptr;	/* next place to write */
-// 	unsigned char *eptr;	/* end of buffer */
-// 	int dyna;		/* true if buffer is malloc'ed */
-//     } agxbuf;
\ No newline at end of file
+import smetana.core.UnsupportedArrayOfStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_PartitionVars extends UnsupportedStructAndPtr {
+
+	private final StarStruct parent;
+
+	public final int[] partition = new int[64 + 1];
+	public final int[] taken = new int[64 + 1];
+	public final int[] count = new int[2];
+	public final ST_Rect_t[] cover = new ST_Rect_t[] { new ST_Rect_t(), new ST_Rect_t() };
+	public final int[] area = new int[2];
+
+	// int partition[64 + 1];
+	// int taken[64 + 1];
+	// int count[2];
+	// struct Rect cover[2];
+	// int area[2];
+	
+	class ArrayOfTwo extends UnsupportedArrayOfStruct {
+
+		final private int pos;
+
+		public ArrayOfTwo(int pos) {
+			this.pos = pos;
+		}
+
+		public ArrayOfTwo plus(int delta) {
+			return new ArrayOfTwo(pos + delta);
+		}
+
+		@Override
+		public __struct__ getStruct() {
+			return cover[pos];
+		}
+
+		@Override
+		public void setStruct(__struct__ value) {
+			cover[pos].copyDataFrom(value);
+		}
+
+	}
+
+
+	public ST_PartitionVars() {
+		this(null);
+	}
+
+	public ST_PartitionVars(StarStruct parent) {
+		this.parent = parent;
+	}
+
+	// struct PartitionVars {
+	// int partition[64 + 1];
+	// int taken[64 + 1];
+	// int count[2];
+	// struct Rect cover[2];
+	// int area[2];
+	// };
+
+}
diff --git a/src/h/ST_Pedge_t.java b/src/h/ST_Pedge_t.java
index 7e4fbe9..f180cf0 100644
--- a/src/h/ST_Pedge_t.java
+++ b/src/h/ST_Pedge_t.java
@@ -45,12 +45,15 @@
  */
 package h;
 
-import smetana.core.UnsupportedSize_t;
-import smetana.core.UnsupportedStarStruct;
+import java.util.ArrayList;
+import java.util.List;
+
+import smetana.core.UnsupportedArrayOfStruct2;
 import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_ptr__;
+import smetana.core.__ptr__;
 import smetana.core.__struct__;
 import smetana.core.size_t;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_Pedge_t extends UnsupportedStructAndPtr {
@@ -68,32 +71,88 @@ public class ST_Pedge_t extends UnsupportedStructAndPtr {
 	// "typedef struct Pedge_t",
 	// "{",
 	// "Ppoint_t a, b",
-	private final ST_pointf a = new ST_pointf(this);
-	private final ST_pointf b = new ST_pointf(this);
+	public final ST_pointf a = new ST_pointf(this);
+	public final ST_pointf b = new ST_pointf(this);
 
 	// "}",
 	// "Pedge_t");
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
+	
+	public static class Array extends UnsupportedArrayOfStruct2 implements __ptr__, __array_of_ptr__{
 
-	public class Amp extends UnsupportedStarStruct {
+		private final List<ST_Pedge_t> data;
+		private final int pos;
+		
+		@Override
+		public void setStruct(String fieldName, __struct__ data) {
+			getStruct().setStruct(fieldName, data);
+		}
+		
+		@Override
+		public Array asPtr() {
+			return this;
+		}
+		
+		@Override
+		public ST_Pedge_t getStruct() {
+			return data.get(pos);
+		}
+		
+		public Array(int size) {
+			this.data = new ArrayList<ST_Pedge_t>();
+			this.pos = 0;
+			for (int i = 0; i < size; i++) {
+				data.add(new ST_Pedge_t());
+			}
+		}
 
-	}
-	
-	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("a")) {
-			return a;
+		public Array reallocJ(int newsize) {
+			while (data.size() < newsize) {
+				data.add(new ST_Pedge_t());
+			}
+			return this;
 		}
-		if (fieldName.equals("b")) {
-			return b;
+		
+		public Array plus(int delta) {
+			return plusJ(delta);
+		}
+
+		private Array(List<ST_Pedge_t> data, int pos) {
+			this.data = data;
+			this.pos = pos;
+		}
+
+		public ST_Pedge_t get(int i) {
+			return this.data.get(pos + i);
+		}
+
+		public Array plusJ(int i) {
+			return new Array(data, pos + i);
 		}
-		return super.getStruct(fieldName);
+
+		public int minus(Array other) {
+			if (this.data != other.data) {
+				throw new IllegalArgumentException();
+			}
+			return this.pos - other.pos;
+		}
+
+		public Array move(int delta) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+		public void realloc(size_t nb) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+		public int comparePointerInternal(__array_of_ptr__ other) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+
 	}
-	
+
+
 	@Override
 	public void setStruct(String fieldName, __struct__ newData) {
 		if (fieldName.equals("a")) {
@@ -107,26 +166,6 @@ public class ST_Pedge_t extends UnsupportedStructAndPtr {
 		super.setStruct(fieldName, newData);
 	}
 
-	public static size_t sizeof(final int nb) {
-		return new UnsupportedSize_t(nb) {
-			@Override
-			public Object malloc() {
-				return new StarArrayOfPtr(new STArray<ST_Pedge_t>(nb, 0, ST_Pedge_t.class));
-			}
-
-			@Override
-			public int getInternalNb() {
-				return nb;
-			}
-
-			@Override
-			public Object realloc(Object old) {
-				StarArrayOfPtr old2 = (StarArrayOfPtr) old;
-				old2.realloc(nb);
-				return old2;
-			}
-		};
-	}
 
 }
 
diff --git a/src/h/ST_Ppoly_t.java b/src/h/ST_Ppoly_t.java
index 6206be8..8eb791e 100644
--- a/src/h/ST_Ppoly_t.java
+++ b/src/h/ST_Ppoly_t.java
@@ -46,23 +46,16 @@
 package h;
 
 import smetana.core.HardcodedStruct;
-import smetana.core.UnsupportedArrayOfPtr;
 import smetana.core.UnsupportedArrayOfStruct;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__array_of_ptr__;
-import smetana.core.__array_of_struct__;
-import smetana.core.__ptr__;
 import smetana.core.__struct__;
 import smetana.core.amiga.Area;
-import smetana.core.amiga.StarArrayOfPtr;
-import smetana.core.amiga.StarArrayOfStruct;
 import smetana.core.amiga.StarStruct;
 
 public class ST_Ppoly_t extends UnsupportedStructAndPtr implements HardcodedStruct {
 
-	// public List ps1;
-	public StarArrayOfPtr ps2;
+	// public StarArrayOfPtr ps;
+	public ST_pointf.Array ps;
 	public int pn;
 
 	public ST_Ppoly_t() {
@@ -75,47 +68,11 @@ public class ST_Ppoly_t extends UnsupportedStructAndPtr implements HardcodedStru
 	@Override
 	public __struct__ copy() {
 		ST_Ppoly_t result = new ST_Ppoly_t();
-		result.ps2 = this.ps2;
+		result.ps = this.ps;
 		result.pn = this.pn;
 		return result;
 	}
 
-	class Adaptor extends UnsupportedArrayOfPtr {
-
-		final private StarArrayOfStruct newData2;
-		final private int pos;
-
-		public Adaptor(StarArrayOfStruct newData2, int pos) {
-			this.newData2 = newData2;
-			this.pos = pos;
-		}
-
-		@Override
-		public __array_of_ptr__ move(int delta) {
-			return new Adaptor(newData2, pos + delta);
-		}
-
-		@Override
-		public Area getInternal(int idx) {
-			return newData2.getInternalArray().getInternal(pos + idx);
-		}
-
-		@Override
-		public __ptr__ getPtr() {
-			return newData2.plus(pos).getPtr();
-		}
-
-		@Override
-		public __struct__ getStruct() {
-			return newData2.plus(pos).getStruct();
-		}
-
-		@Override
-		public int comparePointerInternal(__array_of_ptr__ other) {
-			return super.comparePointerInternal(other);
-		}
-
-	}
 
 	class Adaptor2 extends UnsupportedArrayOfStruct {
 
@@ -125,62 +82,21 @@ public class ST_Ppoly_t extends UnsupportedStructAndPtr implements HardcodedStru
 			this.pos = pos;
 		}
 
-		@Override
-		public __array_of_struct__ plus(int delta) {
+		public Adaptor2 plus(int delta) {
 			return new Adaptor2(pos + delta);
 		}
-		
+
 		@Override
 		public __struct__ getStruct() {
-			return ps2.plus(pos).getStruct();
+			return ps.plus(pos).getStruct();
 		}
 
 	}
 
 	@Override
-	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-		if (fieldName.equals("ps")) {
-			if (newData instanceof StarArrayOfStruct) {
-				StarArrayOfStruct newData2 = (StarArrayOfStruct) newData;
-				System.err.println("newData2B=" + newData2);
-				this.ps2 = new StarArrayOfPtr(new Adaptor(newData2, 0));
-				return ps2;
-			}
-			this.ps2 = (StarArrayOfPtr) newData;
-			return ps2;
-		}
-		return super.setPtr(fieldName, newData);
-	}
-
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("ps")) {
-			return ps2;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
-	public __array_of_struct__ getArrayOfStruct(String fieldName) {
-		if (fieldName.equals("ps")) {
-			return new Adaptor2(0);
-			// return ps2.getArrayOfStruct("ps");
-		}
-		return super.getArrayOfStruct(fieldName);
-	}
-
-	@Override
-	public __array_of_ptr__ getArrayOfPtr(String fieldName) {
-		if (fieldName.equals("ps")) {
-			return ps2.getInternalArray();
-		}
-		return super.getArrayOfPtr(fieldName);
-	}
-
-	@Override
 	public void memcopyFrom(Area source) {
 		ST_Ppoly_t source2 = (ST_Ppoly_t) source;
-		this.ps2 = source2.ps2;
+		this.ps = source2.ps;
 		this.pn = source2.pn;
 	}
 
@@ -193,56 +109,6 @@ public class ST_Ppoly_t extends UnsupportedStructAndPtr implements HardcodedStru
 		super.setInt(fieldName, data);
 	}
 
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("pn")) {
-			return pn;
-		}
-		return super.getInt(fieldName);
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-		@Override
-		public int getInt(String fieldName) {
-			if (fieldName.equals("pn")) {
-				return pn;
-			}
-			return super.getInt(fieldName);
-		}
-
-		@Override
-		public void setInt(String fieldName, int data) {
-			if (fieldName.equals("pn")) {
-				pn = data;
-				return;
-			}
-			super.setInt(fieldName, data);
-		}
-
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			if (fieldName.equals("ps")) {
-				return ps2;
-			}
-			return super.getPtr(fieldName);
-		}
-
-		@Override
-		public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-			if (fieldName.equals("ps")) {
-				ps2 = (StarArrayOfPtr) newData;
-				return newData;
-			}
-			return super.setPtr(fieldName, newData);
-		}
-	}
-
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "typedef struct Ppoly_t",
 	// "{",
diff --git a/src/h/ST_RTree.java b/src/h/ST_RTree.java
index dfb3db1..90b5013 100644
--- a/src/h/ST_RTree.java
+++ b/src/h/ST_RTree.java
@@ -45,12 +45,6 @@
  */
 package h;
 
-import h.ST_RTree.Amp;
-
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
@@ -69,56 +63,70 @@ public class ST_RTree extends UnsupportedStructAndPtr {
 
 	// "struct RTree",
 	// "{",
+	public ST_Node_t___ root;
 	// "Node_t *root",
-	// "SplitQ_t split",
-	// "int MinFill",
+	public final ST_SplitQ_t split = new ST_SplitQ_t(this);
+	public int MinFill;
 	// "long ElapsedTime",
 	// "float UserTime, SystemTime",
-	// "int Deleting",
-	// "int StatFlag",
+	public int Deleting;
+	public int StatFlag;
 	// "int InsertCount",
 	// "int DeleteCount",
 	// "int ReInsertCount",
 	// "int InSplitCount",
 	// "int DeSplitCount",
-	// "int ElimCount",
+	public int ElimCount;
 	// "int EvalCount",
 	// "int InTouchCount",
 	// "int DeTouchCount",
-	// "int SeTouchCount",
+	public int SeTouchCount;
 	// "int CallCount",
 	// "float SplitMeritSum",
-	// "int RectCount",
-	private int NodeCount;
-	// "int LeafCount, NonLeafCount",
-	// "int EntryCount",
+	public int RectCount;
+	public int NodeCount;
+	public int LeafCount, NonLeafCount;
+
+	public int EntryCount;
 	// "int SearchCount",
 	// "int HitCount",
 	// "}");
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
-	
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("NodeCount")) {
-			return NodeCount;
+	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+		if (fieldName.equals("root")) {
+			this.root = (ST_Node_t___) newData;
+			return root;
 		}
-		return super.getInt(fieldName);
+		return super.setPtr(fieldName, newData);
 	}
-	
+
 	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("NodeCount")) {
 			this.NodeCount = data;
 			return;
 		}
+		if (fieldName.equals("LeafCount")) {
+			this.LeafCount = data;
+			return;
+		}
+		if (fieldName.equals("RectCount")) {
+			this.RectCount = data;
+			return;
+		}
+		if (fieldName.equals("EntryCount")) {
+			this.EntryCount = data;
+			return;
+		}
+		if (fieldName.equals("SeTouchCount")) {
+			this.SeTouchCount = data;
+			return;
+		}
+		if (fieldName.equals("NonLeafCount")) {
+			this.NonLeafCount = data;
+			return;
+		}
 		super.setInt(fieldName, data);
 	}
 
diff --git a/src/h/Agsym_s.java b/src/h/ST_Rect_t.java
index 7c2b172..70358f2 100644
--- a/src/h/Agsym_s.java
+++ b/src/h/ST_Rect_t.java
@@ -44,33 +44,37 @@
  *
  */
 package h;
-import java.util.Arrays;
-import java.util.List;
 
-import smetana.core.__ptr__;
+import smetana.core.HardcodedStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
 
-//2 38c2s12koxcpi2c7vwl72qrsp
+public class ST_Rect_t extends UnsupportedStructAndPtr implements HardcodedStruct {
 
-public interface Agsym_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agsym_s",
-"{",
-"Dtlink_t link",
-"char *name",
-"char *defval",
-"int id",
-"unsigned char kind",
-"unsigned char fixed",
-"unsigned char print",
-"}");
-}
+	public final int[] boundary = new int[2 * 2];
+
+	public ST_Rect_t(StarStruct parent) {
+	}
+
+	public ST_Rect_t() {
+	}
 
-// struct Agsym_s {		/* symbol in one of the above dictionaries */
-//     Dtlink_t link;
-//     char *name;			/* attribute's name */
-//     char *defval;		/* its default value for initialization */
-//     int id;			/* its index in attr[] */
-//     unsigned char kind;		/* referent object type */
-//     unsigned char fixed;	/* immutable value */
-//     unsigned char print;	/* always print */
-// };
\ No newline at end of file
+	@Override
+	public void ___(__struct__ other) {
+		this.copyDataFrom(other);
+	}
+
+	@Override
+	public void copyDataFrom(__struct__ other) {
+		ST_Rect_t other2 = (ST_Rect_t) other;
+		this.boundary[0] = other2.boundary[0];
+		this.boundary[1] = other2.boundary[1];
+		this.boundary[2] = other2.boundary[2];
+		this.boundary[3] = other2.boundary[3];
+	}
+
+	// typedef struct Rect {
+	// int boundary[2*2];
+	// } Rect_t;
+}
diff --git a/src/h/ST_SplitQ_t.java b/src/h/ST_SplitQ_t.java
new file mode 100644
index 0000000..8349b1d
--- /dev/null
+++ b/src/h/ST_SplitQ_t.java
@@ -0,0 +1,171 @@
+/* ========================================================================
+ * PlantUML : a free UML diagram generator
+ * ========================================================================
+ *
+ * Project Info:  http://plantuml.com
+ * 
+ * If you like this project or if you find it useful, you can support us at:
+ * 
+ * http://plantuml.com/patreon (only 1$ per month!)
+ * http://plantuml.com/paypal
+ * 
+ * This file is part of Smetana.
+ * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
+ *
+ * (C) Copyright 2009-2017, Arnaud Roques
+ *
+ * This translation is distributed under the same Licence as the original C program:
+ * 
+ *************************************************************************
+ * Copyright (c) 2011 AT&T Intellectual Property 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: See CVS logs. Details at http://www.graphviz.org/
+ *************************************************************************
+ *
+ * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+ * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
+ * 
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
+ * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+ * 
+ * You may obtain a copy of the License at
+ * 
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package h;
+
+import smetana.core.UnsupportedArrayOfStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_SplitQ_t extends UnsupportedStructAndPtr {
+
+	private final StarStruct parent;
+
+	// typedef struct split_q_s {
+	// struct Branch BranchBuf[64 + 1];
+	// Sorry guys :-)
+	public final ST_Branch_t BranchBuf[] = new ST_Branch_t[] { new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(), new ST_Branch_t(),
+			new ST_Branch_t(), new ST_Branch_t() };
+
+	public final ST_Rect_t CoverSplit = new ST_Rect_t(this);
+	public int CoverSplitArea;
+
+	public final ST_PartitionVars Partitions[] = new ST_PartitionVars[] { new ST_PartitionVars() };
+
+	// struct PartitionVars Partitions[1];
+	// } SplitQ_t;
+
+	public ST_SplitQ_t() {
+		this(null);
+	}
+
+	@Override
+	public ST_Rect_t castTo(Class dest) {
+		if (dest == ST_Rect_t.class) {
+			return CoverSplit;
+		}
+		throw new UnsupportedOperationException();
+	}
+
+	public ST_SplitQ_t(StarStruct parent) {
+		this.parent = parent;
+	}
+
+	class ArrayOfSixtyFive extends UnsupportedArrayOfStruct {
+
+		final private int pos;
+
+		public ArrayOfSixtyFive(int pos) {
+			this.pos = pos;
+		}
+
+		public ArrayOfSixtyFive plus(int delta) {
+			return new ArrayOfSixtyFive(pos + delta);
+		}
+
+		@Override
+		public __struct__ getStruct() {
+			return BranchBuf[pos];
+		}
+
+		@Override
+		public void setStruct(__struct__ value) {
+			BranchBuf[pos].copyDataFrom(value);
+		}
+
+	}
+
+	class ArrayOfOne extends UnsupportedArrayOfStruct {
+
+		final private int pos;
+
+		public ArrayOfOne(int pos) {
+			this.pos = pos;
+		}
+
+		public ArrayOfOne plus(int delta) {
+			return new ArrayOfOne(pos + delta);
+		}
+
+		@Override
+		public __struct__ getStruct() {
+			return Partitions[pos];
+		}
+
+		@Override
+		public void setStruct(__struct__ value) {
+			Partitions[pos].copyDataFrom(value);
+		}
+
+	}
+
+	@Override
+	public void setInt(String fieldName, int data) {
+		if (fieldName.equals("CoverSplitArea")) {
+			this.CoverSplitArea = data;
+			return;
+		}
+		super.setInt(fieldName, data);
+	}
+
+	@Override
+	public void setStruct(String fieldName, __struct__ newData) {
+		if (fieldName.equals("CoverSplit")) {
+			this.CoverSplit.copyDataFrom(newData);
+			return;
+		}
+		super.setStruct(fieldName, newData);
+	}
+
+	// typedef struct split_q_s {
+	// struct Branch BranchBuf[64 + 1];
+	// struct Rect CoverSplit;
+	// unsigned int CoverSplitArea;
+	// struct PartitionVars Partitions[1];
+	// } SplitQ_t;
+}
diff --git a/src/h/ST_XLabels_t.java b/src/h/ST_XLabels_t.java
index 54ede9c..d1b189c 100644
--- a/src/h/ST_XLabels_t.java
+++ b/src/h/ST_XLabels_t.java
@@ -45,7 +45,6 @@
  */
 package h;
 
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
@@ -64,33 +63,30 @@ public class ST_XLabels_t extends UnsupportedStructAndPtr {
 
 	// "typedef struct XLabels_s",
 	// "{",
-	// "object_t *objs",
-	// "int n_objs",
-	// "xlabel_t *lbls",
-	// "int n_lbls",
-	// "label_params_t *params",
-	private ST_dt_s hdx;
-
-	// "RTree_t *spdx",
+	public ST_object_t.Array /*ST_object_t*/ objs;
+	public int n_objs;
+	public ST_xlabel_t.Array /*ST_xlabel_t*/ lbls;
+	public int n_lbls;
+	public ST_label_params_t /*ST_label_params_t*/ params;
+	public ST_dt_s hdx;
+	public ST_RTree spdx;
 	// "}",
 	// "XLabels_t");
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
+	public void setInt(String fieldName, int data) {
+		if (fieldName.equals("n_objs")) {
+			this.n_objs = data;
+			return;
+		}
+		if (fieldName.equals("n_lbls")) {
+			this.n_lbls = data;
+			return;
+		}
+		super.setInt(fieldName, data);
 	}
 
-	public class Amp extends UnsupportedStarStruct {
 
-	}
-
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("hdx")) {
-			return this.hdx;
-		}
-		return super.getPtr(fieldName);
-	}
 	
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
@@ -98,6 +94,22 @@ public class ST_XLabels_t extends UnsupportedStructAndPtr {
 			this.hdx = (ST_dt_s) newData;
 			return this.hdx;
 		}
+		if (fieldName.equals("spdx")) {
+			this.spdx = (ST_RTree) newData;
+			return this.spdx;
+		}
+//		if (fieldName.equals("objs")) {
+//			this.objs = newData;
+//			return this.objs;
+//		}
+//		if (fieldName.equals("lbls")) {
+//			this.lbls = newData;
+//			return this.lbls;
+//		}
+		if (fieldName.equals("params")) {
+			this.params = (ST_label_params_t) newData;
+			return this.params;
+		}
 		return super.setPtr(fieldName, newData);
 	}
 
diff --git a/src/h/ST_adjmatrix_t.java b/src/h/ST_adjmatrix_t.java
index 9f2bb46..be4e0bc 100644
--- a/src/h/ST_adjmatrix_t.java
+++ b/src/h/ST_adjmatrix_t.java
@@ -45,11 +45,7 @@
  */
 package h;
 
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__array_of_integer__;
-import smetana.core.__ptr__;
-import smetana.core.amiga.StarArrayOfInteger;
 import smetana.core.amiga.StarStruct;
 
 public class ST_adjmatrix_t extends UnsupportedStructAndPtr {
@@ -64,21 +60,12 @@ public class ST_adjmatrix_t extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
-
 	// "typedef struct adjmatrix_t",
 	// "{",
-	private int nrows, ncols;
+	public int nrows, ncols;
 
 	// "char *data",
-	private StarArrayOfInteger data;
+	public int[][] data;
 
 	// "}",
 	// "adjmatrix_t");
@@ -96,41 +83,6 @@ public class ST_adjmatrix_t extends UnsupportedStructAndPtr {
 		super.setInt(fieldName, data);
 	}
 
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("nrows")) {
-			return this.nrows;
-		}
-		if (fieldName.equals("ncols")) {
-			return this.ncols;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
-	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-		if (fieldName.equals("data")) {
-			this.data = (StarArrayOfInteger) newData;
-			return data;
-		}
-		return super.setPtr(fieldName, newData);
-	}
-
-	@Override
-	public __array_of_integer__ getArrayOfInteger(String fieldName) {
-		if (fieldName.equals("data")) {
-			return data.getInternalArray();
-		}
-		return super.getArrayOfInteger(fieldName);
-	}
-
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("data")) {
-			return data;
-		}
-		return super.getPtr(fieldName);
-	}
 }
 
 // typedef struct adjmatrix_t {
diff --git a/src/h/Agrec_s.java b/src/h/ST_arrowdir_t.java
index 60b7803..8c5af1e 100644
--- a/src/h/Agrec_s.java
+++ b/src/h/ST_arrowdir_t.java
@@ -44,24 +44,30 @@
  *
  */
 package h;
-import java.util.Arrays;
-import java.util.List;
 
-import smetana.core.__ptr__;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.amiga.StarStruct;
 
-//2 87jgefxbqnrx426i1quuhv9a1
+public class ST_arrowdir_t extends UnsupportedStructAndPtr {
 
-public interface Agrec_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct Agrec_s",
-"{",
-"char *name",
-"Agrec_t *next",
-"}");
-}
+	// char *dir;
+	public int sflag;
+	public int eflag;
+
+	private final StarStruct parent;
+
+	public ST_arrowdir_t() {
+		this(null);
+	}
 
-// struct Agrec_s {
-//     char *name;
-//     Agrec_t *next;
-//     /* following this would be any programmer-defined data */
-// };
\ No newline at end of file
+	public ST_arrowdir_t(StarStruct parent) {
+		this.parent = parent;
+	}
+
+	// typedef struct arrowdir_t {
+	// char *dir;
+	// int sflag;
+	// int eflag;
+	// } arrowdir_t;
+
+}
diff --git a/src/h/ST_arrowtype_t.java b/src/h/ST_arrowtype_t.java
index c3e2067..31fe508 100644
--- a/src/h/ST_arrowtype_t.java
+++ b/src/h/ST_arrowtype_t.java
@@ -47,7 +47,6 @@ package h;
 
 import smetana.core.CFunction;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__ptr__;
 import smetana.core.__struct__;
 
 public class ST_arrowtype_t extends UnsupportedStructAndPtr {
@@ -64,29 +63,29 @@ public class ST_arrowtype_t extends UnsupportedStructAndPtr {
 		gen = other2.gen;
 	}
 	
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("type")) {
-			return type;
-		}
-		return super.getInt(fieldName);
-	}
-	
-	@Override
-	public double getDouble(String fieldName) {
-		if (fieldName.equals("lenfact")) {
-			return lenfact;
-		}
-		return super.getDouble(fieldName);
-	}
-	
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("gen")) {
-			return gen;
-		}
-		return super.getPtr(fieldName);
-	}
+//	@Override
+//	public int getInt(String fieldName) {
+//		if (fieldName.equals("type")) {
+//			return type;
+//		}
+//		return super.getInt(fieldName);
+//	}
+//	
+//	@Override
+//	public double getDouble(String fieldName) {
+//		if (fieldName.equals("lenfact")) {
+//			return lenfact;
+//		}
+//		return super.getDouble(fieldName);
+//	}
+//	
+//	@Override
+//	public __ptr__ getPtr(String fieldName) {
+//		if (fieldName.equals("gen")) {
+//			return gen;
+//		}
+//		return super.getPtr(fieldName);
+//	}
 
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "typedef struct arrowtype_t",
diff --git a/src/h/ST_aspect_t.java b/src/h/ST_aspect_t.java
index 2ddd468..2f4063b 100644
--- a/src/h/ST_aspect_t.java
+++ b/src/h/ST_aspect_t.java
@@ -45,7 +45,6 @@
  */
 package h;
 
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.amiga.StarStruct;
 
@@ -61,40 +60,20 @@ public class ST_aspect_t extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
-
 	// "typedef struct aspect_t",
 	// "{",
 	// "double targetAR",
 	// "double combiAR",
-	private int prevIterations;
-	private int curIterations;
-	private int nextIter;
-	private int nPasses;
-	private int badGraph;
+	public int prevIterations;
+	public int curIterations;
+	public int nextIter;
+	public int nPasses;
+	public int badGraph;
 
 	// "}",
 	// "aspect_t");
 
 	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("nextIter")) {
-			return this.nextIter;
-		}
-		if (fieldName.equals("nPasses")) {
-			return this.nPasses;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("nextIter")) {
 			this.nextIter = data;
@@ -111,14 +90,6 @@ public class ST_aspect_t extends UnsupportedStructAndPtr {
 		super.setInt(fieldName, data);
 	}
 
-	@Override
-	public boolean getBoolean(String fieldName) {
-		if (fieldName.equals("badGraph")) {
-			return this.badGraph != 0;
-		}
-		return super.getBoolean(fieldName);
-	}
-
 }
 
 // typedef struct aspect_t {
diff --git a/src/h/ST_bezier.java b/src/h/ST_bezier.java
index c310ec8..90ddde0 100644
--- a/src/h/ST_bezier.java
+++ b/src/h/ST_bezier.java
@@ -45,14 +45,16 @@
  */
 package h;
 
-import smetana.core.UnsupportedSize_t;
-import smetana.core.UnsupportedStarStruct;
+import h.ST_pointf.Array;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import smetana.core.UnsupportedArrayOfPtr;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__array_of_ptr__;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
-import smetana.core.size_t;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_bezier extends UnsupportedStructAndPtr {
@@ -69,87 +71,123 @@ public class ST_bezier extends UnsupportedStructAndPtr {
 
 	// "{",
 	// "pointf *list",
-	private StarArrayOfPtr list;
+	public ST_pointf.Array list;
 
-	private int size;
-	private int sflag, eflag;
+	public int size;
+	public int sflag, eflag;
 
-	private final ST_pointf sp = new ST_pointf(this), ep = new ST_pointf(this);
+	public final ST_pointf sp = new ST_pointf(this), ep = new ST_pointf(this);
 
-	// "}",
-	// "bezier");
+	public static class Array2 extends UnsupportedArrayOfPtr implements __ptr__, __array_of_ptr__ {
 
-	@Override
-	public void ___(__struct__ other) {
-		ST_bezier this2 = (ST_bezier) other;
-		this.list = this2.list;
-		this.size = this2.size;
-		this.sflag = this2.sflag;
-		this.eflag = this2.eflag;
-		this.sp.copyDataFrom((__struct__) this2.sp);
-		this.ep.copyDataFrom((__struct__) this2.ep);
-	}
+		private final List<ST_bezier> data;
+		private final int pos;
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
+		public Array2(int size) {
+			this.data = new ArrayList<ST_bezier>();
+			this.pos = 0;
+			for (int i = 0; i < size; i++) {
+				data.add(new ST_bezier());
+			}
+		}
 
-	public class Amp extends UnsupportedStarStruct {
+		@Override
+		public ST_bezier getStruct() {
+			return data.get(pos);
+		}
 
 		@Override
-		public __ptr__ getPtr(String fieldName) {
-			return ST_bezier.this.getPtr(fieldName);
+		public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+			return getStruct().setPtr(fieldName, newData);
 		}
 
 		@Override
-		public int getInt(String fieldName) {
-			return ST_bezier.this.getInt(fieldName);
+		public void setStruct(String fieldName, __struct__ newData) {
+			getStruct().setStruct(fieldName, newData);
 		}
-		
+
 		@Override
-		public __array_of_ptr__ getArrayOfPtr(String fieldName) {
-			return ST_bezier.this.getArrayOfPtr(fieldName);
+		public void setInt(String fieldName, int data) {
+			getStruct().setInt(fieldName, data);
 		}
-		
+
+		// public void swap(int i, int j) {
+		// ST_bezier e1 = data.get(i);
+		// ST_bezier e2 = data.get(j);
+		// data.set(i, e2);
+		// data.set(j, e1);
+		// }
+
+		public Array2(List<ST_bezier> data, int pos) {
+			this.data = data;
+			this.pos = pos;
+		}
+
+		public Array2 reallocJ(int newsize) {
+			while (data.size() < newsize) {
+				data.add(new ST_bezier());
+			}
+			return this;
+		}
+
 		@Override
-		public boolean getBoolean(String fieldName) {
-			return ST_bezier.this.getBoolean(fieldName);
+		public Array2 plus(int delta) {
+			return new Array2(data, pos + delta);
 		}
 		
 		@Override
-		public __struct__ getStruct(String fieldName) {
-			return ST_bezier.this.getStruct(fieldName);
+		public Array2 asPtr() {
+			return this;
 		}
 
-	}
+		@Override
+		public void setPtr(__ptr__ value) {
+			this.data.set(pos, (ST_bezier) value);
+		}
 
-	@Override
-	public boolean getBoolean(String fieldName) {
-		if (fieldName.equals("sflag")) {
-			return this.sflag != 0;
+		@Override
+		public ST_bezier getPtr() {
+			return this.data.get(pos);
 		}
-		if (fieldName.equals("eflag")) {
-			return this.eflag != 0;
+		
+		public ST_bezier get(int i) {
+			return this.plus(i).getPtr();
+		}
+
+		@Override
+		public int comparePointer(__ptr__ other) {
+			final Array2 this2 = (Array2) other;
+			if (this.data != this2.data) {
+				throw new IllegalArgumentException();
+			}
+			return this.pos - this2.pos;
+		}
+
+		public boolean isSameThan2(Array2 other) {
+			if (this.data != other.data) {
+				throw new IllegalArgumentException();
+			}
+			return this.pos == other.pos;
 		}
-		return super.getBoolean(fieldName);
 	}
 
+	// "}",
+	// "bezier");
+
 	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("list")) {
-			return list;
-		}
-		return super.getPtr(fieldName);
+	public void ___(__struct__ other) {
+		ST_bezier this2 = (ST_bezier) other;
+		this.list = this2.list;
+		this.size = this2.size;
+		this.sflag = this2.sflag;
+		this.eflag = this2.eflag;
+		this.sp.copyDataFrom((__struct__) this2.sp);
+		this.ep.copyDataFrom((__struct__) this2.ep);
 	}
 
 	@Override
-	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-		if (fieldName.equals("list")) {
-			this.list = (StarArrayOfPtr) newData;
-			return list;
-		}
-		return super.setPtr(fieldName, newData);
+	public void ____(__ptr__ other) {
+		___(((ST_bezier) other).getStruct());
 	}
 
 	@Override
@@ -183,62 +221,22 @@ public class ST_bezier extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("size")) {
-			return this.size;
-		}
-		if (fieldName.equals("sflag")) {
-			return this.sflag;
-		}
-		if (fieldName.equals("eflag")) {
-			return this.eflag;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("sp")) {
-			return this.sp;
-		}
-		if (fieldName.equals("ep")) {
-			return this.ep;
-		}
-		return super.getStruct(fieldName);
-	}
-
-	@Override
-	public __array_of_ptr__ getArrayOfPtr(String fieldName) {
+	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("list")) {
-			return this.list.getInternalArray();
+			this.list = (Array) newData;
+			return this.list;
 		}
-		return super.getArrayOfPtr(fieldName);
+		return super.setPtr(fieldName, newData);
 	}
 
 	@Override
-	public __struct__ getStruct() {
+	public ST_bezier getStruct() {
 		return this;
 	}
 
-	public static size_t sizeof(final int nb) {
-		return new UnsupportedSize_t(nb) {
-			@Override
-			public Object malloc() {
-				return new StarArrayOfPtr(new STArray<ST_bezier>(nb, 0, ST_bezier.class));
-			}
-
-			@Override
-			public int getInternalNb() {
-				return nb;
-			}
-
-			@Override
-			public Object realloc(Object old) {
-				StarArrayOfPtr old2 = (StarArrayOfPtr) old;
-				old2.realloc(nb);
-				return old2;
-			}
-		};
+	@Override
+	public ST_bezier getPtr() {
+		return this;
 	}
 
 }
diff --git a/src/h/ST_boxf.java b/src/h/ST_boxf.java
index e097976..50db1e6 100644
--- a/src/h/ST_boxf.java
+++ b/src/h/ST_boxf.java
@@ -46,12 +46,8 @@
 package h;
 
 import smetana.core.HardcodedStruct;
-import smetana.core.UnsupportedSize_t;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__struct__;
-import smetana.core.size_t;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_boxf extends UnsupportedStructAndPtr implements HardcodedStruct {
@@ -72,6 +68,14 @@ public class ST_boxf extends UnsupportedStructAndPtr implements HardcodedStruct
 	// this.UR.setStruct(other.UR);
 	// }
 
+	public static ST_boxf[] malloc(int nb) {
+		final ST_boxf result[] = new ST_boxf[nb];
+		for (int i = 0; i < nb; i++) {
+			result[i] = new ST_boxf();
+		}
+		return result;
+	}
+
 	@Override
 	public __struct__ getStruct() {
 		return this;
@@ -82,17 +86,6 @@ public class ST_boxf extends UnsupportedStructAndPtr implements HardcodedStruct
 		copyDataFrom(value);
 	}
 
-	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("LL")) {
-			return LL;
-		}
-		if (fieldName.equals("UR")) {
-			return UR;
-		}
-		return super.getStruct(fieldName);
-	}
-
 	public __struct__ getStructInternal(String fieldName) {
 		if (fieldName.equals("LL")) {
 			return LL;
@@ -131,13 +124,6 @@ public class ST_boxf extends UnsupportedStructAndPtr implements HardcodedStruct
 		this.UR.setStruct(other.UR);
 	}
 
-	// @Override
-	// public void copyDataFrom(__ptr__ value) {
-	// final ST_boxf other = (ST_boxf) value;
-	// this.LL.setStruct(other.LL);
-	// this.UR.setStruct(other.UR);
-	// }
-
 	@Override
 	public void ___(__struct__ value) {
 		final ST_boxf other = (ST_boxf) value;
@@ -145,39 +131,7 @@ public class ST_boxf extends UnsupportedStructAndPtr implements HardcodedStruct
 		this.UR.setStruct(other.UR);
 	}
 
-	class Amp extends UnsupportedStarStruct {
-
-		@Override
-		public __struct__ getStruct(String fieldName) {
-			if (fieldName.equals("LL")) {
-				return LL;
-			}
-			if (fieldName.equals("UR")) {
-				return UR;
-			}
-			return super.getStruct(fieldName);
-		}
-
-		@Override
-		public __struct__ getStruct() {
-			return ST_boxf.this;
-		}
-
-	}
-
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
 
-	public static size_t sizeof(final int nb) {
-		return new UnsupportedSize_t(nb) {
-			@Override
-			public Object malloc() {
-				return new StarArrayOfPtr(new STArray<ST_boxf>(nb, 0, ST_boxf.class));
-			}
-		};
-	}
 
 	// public interface ST_boxf extends __ptr__ {
 	// public static List<String> DEFINITION = Arrays.asList(
diff --git a/src/h/textfont_t.java b/src/h/ST_cinfo_t.java
index 3161ece..451f11f 100644
--- a/src/h/textfont_t.java
+++ b/src/h/ST_cinfo_t.java
@@ -44,32 +44,54 @@
  *
  */
 package h;
-import java.util.Arrays;
-import java.util.List;
 
-import smetana.core.__ptr__;
+import smetana.core.HardcodedStruct;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__struct__;
+import smetana.core.amiga.StarStruct;
+
+public class ST_cinfo_t extends UnsupportedStructAndPtr implements HardcodedStruct {
+
+	public final ST_boxf bb = new ST_boxf(this);
+	public ST_object_t.Array objp;
+
+	public ST_cinfo_t(StarStruct parent) {
+	}
+
+	public ST_cinfo_t() {
+	}
+	
+	@Override
+	public void ___(__struct__ value) {
+		final ST_cinfo_t other = (ST_cinfo_t) value;
+		this.bb.setStruct(other.bb);
+		this.objp = other.objp;
+	}
+
+	@Override
+	public void setStruct(String fieldName, __struct__ newData) {
+		if (fieldName.equals("bb")) {
+			this.bb.setStruct(newData);
+			return;
+		}
+		super.setStruct(fieldName, newData);
+	}
+	
+	
+	@Override
+	public ST_cinfo_t copy() {
+		final ST_cinfo_t result = new ST_cinfo_t();
+		result.bb.copyDataFrom((__struct__) this.bb);
+		result.objp = this.objp;
+		return result;
+	}
+
+
 
-//2 7eimedro6z0j21rhmmxbqdssy
 
-public interface textfont_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"char*  name",
-"char*  color",
-"PostscriptAlias *postscript_alias",
-"double size",
-"unsigned int flags:7",
-"unsigned int cnt:(sizeof(unsigned int) * 8 - 7)",
-"}",
-"textfont_t");
 }
 
 // typedef struct {
-// 	char*  name;
-// 	char*  color;
-// 	PostscriptAlias *postscript_alias;
-// 	double size;
-// 	unsigned int flags:7;  /* HTML_UL, HTML_IF, HTML_BF, etc. */
-// 	unsigned int cnt:(sizeof(unsigned int) * 8 - 7);   /* reference count */
-//     } textfont_t;
\ No newline at end of file
+// boxf bb;
+// object_t* objp;
+// } cinfo_t;
\ No newline at end of file
diff --git a/src/h/ST_deque_t.java b/src/h/ST_deque_t.java
index 816465a..54595c2 100644
--- a/src/h/ST_deque_t.java
+++ b/src/h/ST_deque_t.java
@@ -47,13 +47,34 @@ package h;
 
 import smetana.core.HardcodedStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
 
 public class ST_deque_t extends UnsupportedStructAndPtr implements HardcodedStruct {
 
+	// ---------------
+	public ST_pointnlink_t pnlps[];
+
+	public boolean malloc(int newdqn) {
+		this.pnlps = new ST_pointnlink_t[newdqn];
+		return true;
+	}
+
+	public boolean realloc(int newdqn) {
+		if (pnlps.length >= newdqn) {
+			return true;
+		}
+		ST_pointnlink_t pnlps2[] = new ST_pointnlink_t[newdqn];
+		for (int i = 0; i < pnlps.length; i++) {
+			pnlps2[i] = pnlps[i];
+		}
+		this.pnlps = pnlps2;
+		return true;
+	}
+	// ---------------
+
+	
 	// "pointnlink_t **pnlps",
-	public __ptr__ pnlps;
+//	public __ptr__ pnlps;
 	public int pnlpn, fpnlpi, lpnlpi, apex;
 
 	public ST_deque_t() {
@@ -63,60 +84,60 @@ public class ST_deque_t extends UnsupportedStructAndPtr implements HardcodedStru
 	public ST_deque_t(StarStruct parent) {
 	}
 
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("pnlps")) {
-			return pnlps;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
-	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-		if (fieldName.equals("pnlps")) {
-			pnlps = newData;
-			return pnlps;
-		}
-		return super.setPtr(fieldName, newData);
-	}
+//	@Override
+//	public __ptr__ getPtr(String fieldName) {
+//		if (fieldName.equals("pnlps")) {
+//			return pnlps;
+//		}
+//		return super.getPtr(fieldName);
+//	}
+//
+//	@Override
+//	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+//		if (fieldName.equals("pnlps")) {
+//			pnlps = newData;
+//			return pnlps;
+//		}
+//		return super.setPtr(fieldName, newData);
+//	}
 
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("pnlpn")) {
-			return pnlpn;
-		}
-		if (fieldName.equals("fpnlpi")) {
-			return fpnlpi;
-		}
-		if (fieldName.equals("lpnlpi")) {
-			return lpnlpi;
-		}
-		if (fieldName.equals("apex")) {
-			return apex;
-		}
-		return super.getInt(fieldName);
-	}
+//	@Override
+//	public int getInt(String fieldName) {
+//		if (fieldName.equals("pnlpn")) {
+//			return pnlpn;
+//		}
+//		if (fieldName.equals("fpnlpi")) {
+//			return fpnlpi;
+//		}
+//		if (fieldName.equals("lpnlpi")) {
+//			return lpnlpi;
+//		}
+//		if (fieldName.equals("apex")) {
+//			return apex;
+//		}
+//		return super.getInt(fieldName);
+//	}
 
-	@Override
-	public void setInt(String fieldName, int data) {
-		if (fieldName.equals("pnlpn")) {
-			pnlpn = data;
-			return;
-		}
-		if (fieldName.equals("fpnlpi")) {
-			fpnlpi = data;
-			return;
-		}
-		if (fieldName.equals("lpnlpi")) {
-			lpnlpi = data;
-			return;
-		}
-		if (fieldName.equals("apex")) {
-			apex = data;
-			return;
-		}
-		super.setInt(fieldName, data);
-	}
+//	@Override
+//	public void setInt(String fieldName, int data) {
+//		if (fieldName.equals("pnlpn")) {
+//			pnlpn = data;
+//			return;
+//		}
+//		if (fieldName.equals("fpnlpi")) {
+//			fpnlpi = data;
+//			return;
+//		}
+//		if (fieldName.equals("lpnlpi")) {
+//			lpnlpi = data;
+//			return;
+//		}
+//		if (fieldName.equals("apex")) {
+//			apex = data;
+//			return;
+//		}
+//		super.setInt(fieldName, data);
+//	}
 
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "typedef struct deque_t",
diff --git a/src/h/ST_dt_s.java b/src/h/ST_dt_s.java
index c130c5d..10466ac 100644
--- a/src/h/ST_dt_s.java
+++ b/src/h/ST_dt_s.java
@@ -55,10 +55,10 @@ public class ST_dt_s extends UnsupportedStructAndPtr implements HardcodedStruct
 
 	public CFunction searchf;/* search function */
 
-	public ST_dtdisc_s.Amp disc; /* method to manipulate objs */
+	public ST_dtdisc_s disc; /* method to manipulate objs */
 	public ST_dtdata_s data; /* sharable data */
 	public CFunction memoryf;/* function to alloc/free memory */
-	public ST_dtmethod_s.Amp meth; /* dictionary method */
+	public ST_dtmethod_s meth; /* dictionary method */
 
 	public int type; /* type information */
 	public int nview; /* number of parent view dictionaries */
@@ -80,11 +80,11 @@ public class ST_dt_s extends UnsupportedStructAndPtr implements HardcodedStruct
 			return searchf;
 		}
 		if (fieldName.equals("meth")) {
-			this.meth = (ST_dtmethod_s.Amp) newData;
+			this.meth = (ST_dtmethod_s) newData;
 			return meth;
 		}
 		if (fieldName.equals("disc")) {
-			this.disc = (ST_dtdisc_s.Amp) newData;
+			this.disc = (ST_dtdisc_s) newData;
 			return disc;
 		}
 		if (fieldName.equals("memoryf")) {
@@ -111,42 +111,6 @@ public class ST_dt_s extends UnsupportedStructAndPtr implements HardcodedStruct
 	}
 
 	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("disc")) {
-			return disc;
-		}
-		if (fieldName.equals("data")) {
-			return data;
-		}
-		if (fieldName.equals("meth")) {
-			return meth;
-		}
-		if (fieldName.equals("view")) {
-			return view;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
-	public Object call(String fieldName, Object... args) {
-		if (fieldName.equals("memoryf")) {
-			return this.memoryf.exe(args);
-		}
-		if (fieldName.equals("searchf")) {
-			return this.searchf.exe(args);
-		}
-		return super.call(fieldName, args);
-	}
-
-	@Override
-	public __ptr__ castTo(Class dest) {
-		if (dest == _dt_s.class) {
-			return this;
-		}
-		return super.castTo(dest);
-	}
-
-	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("type")) {
 			this.type = data;
@@ -160,17 +124,6 @@ public class ST_dt_s extends UnsupportedStructAndPtr implements HardcodedStruct
 	}
 
 	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("type")) {
-			return type;
-		}
-		if (fieldName.equals("nview")) {
-			return nview;
-		}
-		return super.getInt(fieldName);
-	}
-	
-	@Override
 	public boolean isSameThan(StarStruct other) {
 		ST_dt_s other2 = (ST_dt_s) other;
 		return this == other2;
diff --git a/src/h/ST_dtdata_s.java b/src/h/ST_dtdata_s.java
index 4dfeba9..8206fc9 100644
--- a/src/h/ST_dtdata_s.java
+++ b/src/h/ST_dtdata_s.java
@@ -45,17 +45,18 @@
  */
 package h;
 
-import h.ST_dtdisc_s.Amp;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
 
 public class ST_dtdata_s extends UnsupportedStructAndPtr {
 
+	private final StarStruct parent;
+	
 	public int type; /* type of dictionary */
-	public ST_dtlink_s.Amp here; /* finger to last search element */
-	private __ptr__ _htab; /* hash table */
+	public ST_dtlink_s here; /* finger to last search element */
+	public __ptr__ _htab; /* hash table */
+	public ST_dtlink_s _head = null;
 	// Dtlink_t* _head; /* linked list */
 	// } hh;
 	public int ntab; /* number of hash slots */
@@ -63,7 +64,6 @@ public class ST_dtdata_s extends UnsupportedStructAndPtr {
 	public int loop; /* number of nested loops */
 	public int minp; /* min path before splay, always even */
 
-	private final StarStruct parent;
 
 	public ST_dtdata_s() {
 		this(null);
@@ -78,39 +78,6 @@ public class ST_dtdata_s extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-	}
-
-	@Override
-	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-		if (fieldName.equals("here")) {
-			if (newData instanceof ST_dtlink_s) {
-				this.here = (ST_dtlink_s.Amp) ((ST_dtlink_s) newData).amp();
-			} else {
-				this.here = (ST_dtlink_s.Amp) newData;
-			}
-			return here;
-		}
-		if (fieldName.equals("hh._htab")) {
-			this._htab = newData;
-			return _htab;
-		}
-		return super.setPtr(fieldName, newData);
-	}
-
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("here")) {
-			return here;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("type")) {
 			this.type = data;
@@ -135,20 +102,6 @@ public class ST_dtdata_s extends UnsupportedStructAndPtr {
 		super.setInt(fieldName, data);
 	}
 
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("type")) {
-			return type;
-		}
-		if (fieldName.equals("size")) {
-			return size;
-		}
-		if (fieldName.equals("minp")) {
-			return minp;
-		}
-		return super.getInt(fieldName);
-	}
-
 	// public interface ST_dtdata_s extends __ptr__ {
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "struct _dtdata_s",
diff --git a/src/h/ST_dtdisc_s.java b/src/h/ST_dtdisc_s.java
index 4998a7a..217a090 100644
--- a/src/h/ST_dtdisc_s.java
+++ b/src/h/ST_dtdisc_s.java
@@ -45,9 +45,7 @@
  */
 package h;
 
-import h.ST_dtmethod_s.Amp;
 import smetana.core.CFunction;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
@@ -72,64 +70,15 @@ public class ST_dtdisc_s extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public StarStruct amp() {
-		return new Amp(this);
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-		private final ST_dtdisc_s parent;
-
-		public Amp(ST_dtdisc_s me) {
-			parent = me;
-		}
-
-		@Override
-		public boolean isSameThan(StarStruct other) {
-			final Amp other2 = (Amp) other;
-			return parent == other2.parent;
-		}
-
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			if (fieldName.equals("memoryf")) {
-				return memoryf;
-			}
-			if (fieldName.equals("eventf")) {
-				return eventf;
-			}
-			if (fieldName.equals("comparf")) {
-				return comparf;
-			}
-			if (fieldName.equals("makef")) {
-				return makef;
-			}
-			return super.getPtr(fieldName);
-		}
-
-		@Override
-		public int getInt(String fieldName) {
-			if (fieldName.equals("key")) {
-				return key;
-			}
-			if (fieldName.equals("size")) {
-				return size;
-			}
-			if (fieldName.equals("link")) {
-				return link;
-			}
-			return super.getInt(fieldName);
-		}
-
-		@Override
-		public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-			if (fieldName.equals("memoryf")) {
-				memoryf = (CFunction) newData;
-				return newData;
-			}
-			return super.setPtr(fieldName, newData);
+	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+		if (fieldName.equals("memoryf")) {
+			memoryf = (CFunction) newData;
+			return newData;
 		}
+		return super.setPtr(fieldName, newData);
 	}
 
+
 }
 
 // struct _dtdisc_s
diff --git a/src/h/ST_dthold_s.java b/src/h/ST_dthold_s.java
index 50c8e68..5f63e2e 100644
--- a/src/h/ST_dthold_s.java
+++ b/src/h/ST_dthold_s.java
@@ -45,7 +45,6 @@
  */
 package h;
 
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
@@ -66,26 +65,17 @@ public class ST_dthold_s extends UnsupportedStructAndPtr {
 	// "{",
 	// "Dtlink_t hdr",
 	// "void*  obj",
-	private final ST_dtlink_s hdr = new ST_dtlink_s(this);
-	private __ptr__ obj;
+	public final ST_dtlink_s hdr = new ST_dtlink_s(this);
+	public __ptr__ obj;
 
 	// "}");
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
-
-	@Override
 	public __ptr__ castTo(Class dest) {
-		if (dest == _dthold_s.class) {
+		if (dest == ST_dthold_s.class) {
 			return this;
 		}
-		if (dest == _dtlink_s.class) {
+		if (dest == ST_dtlink_s.class) {
 			return hdr;
 		}
 		return super.castTo(dest);
@@ -100,13 +90,6 @@ public class ST_dthold_s extends UnsupportedStructAndPtr {
 		return super.setPtr(fieldName, newData);
 	}
 	
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("obj")) {
-			return this.obj;
-		}
-		return super.getPtr(fieldName);
-	}
 }
 
 // struct _dthold_s
diff --git a/src/h/ST_dtlink_s.java b/src/h/ST_dtlink_s.java
index a7ce688..11d54ea 100644
--- a/src/h/ST_dtlink_s.java
+++ b/src/h/ST_dtlink_s.java
@@ -46,8 +46,6 @@
 package h;
 
 import smetana.core.OFFSET;
-import smetana.core.UnsupportedC;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
@@ -55,10 +53,10 @@ import smetana.core.amiga.StarStruct;
 
 public class ST_dtlink_s extends UnsupportedStructAndPtr implements WithParent {
 
-	public ST_dtlink_s.Amp right;
-	public ST_dtlink_s.Amp _left;
+	public ST_dtlink_s right;
+	public ST_dtlink_s _left;
 	private final StarStruct parent;
-	
+
 	@Override
 	public void copyDataFrom(__struct__ other) {
 		ST_dtlink_s this2 = (ST_dtlink_s) other;
@@ -78,27 +76,44 @@ public class ST_dtlink_s extends UnsupportedStructAndPtr implements WithParent {
 		return parent;
 	}
 
+	// @Override
+	// public __ptr__ castTo(Class dest) {
+	// if (dest == ST_dtlink_s.class) {
+	// // return amp();
+	// return this;
+	// }
+	// if (dest == _dthold_s.class) {
+	// return new LinkTo_dthold_s();
+	// }
+	// return super.castTo(dest);
+	// }
+
 	@Override
 	public __ptr__ castTo(Class dest) {
-		if (dest == _dtlink_s.class) {
-			return amp();
-			// return this;
+		if (dest == ST_dtlink_s.class) {
+			return this;
 		}
-		if (dest == _dthold_s.class) {
-			return new LinkTo_dthold_s();
+		// if (dest == refstr_t.class && getParent() instanceof ST_refstr_t) {
+		// return (ST_refstr_t) getParent();
+		// }
+		if (dest == ST_dthold_s.class && getParent() instanceof ST_dthold_s) {
+			// System.err.println("ITSME");
+			// System.err.println("getParent()=" + getParent());
+			return (ST_dthold_s) getParent();
+
 		}
+		System.err.println("dest=" + dest);
 		return super.castTo(dest);
 	}
 
-	class LinkTo_dthold_s extends UnsupportedStructAndPtr {
-
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			if (fieldName.equals("obj")) {
-				return new LinkTo_Obj();
-			}
-			return super.getPtr(fieldName);
+	public ST_dthold_s castTo_ST_dthold_s() {
+		if (getParent() instanceof ST_dthold_s) {
+			return (ST_dthold_s) getParent();
 		}
+		throw new UnsupportedOperationException();
+	}
+
+	class LinkTo_dthold_s extends UnsupportedStructAndPtr {
 
 	}
 
@@ -107,102 +122,67 @@ public class ST_dtlink_s extends UnsupportedStructAndPtr implements WithParent {
 	}
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-		@Override
-		public __ptr__ castTo(Class dest) {
-			if (dest == _dtlink_s.class) {
-				return this;
+	public Object addVirtualBytes(int virtualBytes) {
+		if (virtualBytes == 0) {
+			return this;
+		}
+		if (virtualBytes < 0) {
+			final OFFSET offset = OFFSET.fromInt(-virtualBytes);
+			if (offset.toString().equals("h.ST_Agsubnode_s::id_link")) {
+				return ((ST_Agsubnode_s) parent).from_id_link(ST_dtlink_s.this);
 			}
-			if (dest == refstr_t.class && getParent() instanceof ST_refstr_t) {
-				return (ST_refstr_t) getParent();
+			if (offset.toString().equals("h.ST_Agsubnode_s::seq_link")) {
+				return ((ST_Agsubnode_s) parent).from_seq_link(ST_dtlink_s.this);
 			}
-			if (dest == _dthold_s.class && getParent() instanceof ST_dthold_s) {
-				// System.err.println("ITSME");
-				// System.err.println("getParent()=" + getParent());
-				return (ST_dthold_s) getParent();
-
+			if (offset.toString().equals("h.ST_Agsym_s::link")) {
+				return ((ST_Agsym_s) parent).from_link(ST_dtlink_s.this);
 			}
-			System.err.println("dest=" + dest);
-			return super.castTo(dest);
-		}
-
-		@Override
-		public Object addVirtualBytes(int virtualBytes) {
-			if (virtualBytes == 0) {
-				return this;
+			if (offset.toString().equals("h.ST_Agedge_s::seq_link")) {
+				return ((ST_Agedge_s) parent).from_seq_link(ST_dtlink_s.this);
 			}
-			if (virtualBytes < 0) {
-				final OFFSET offset = OFFSET.fromInt(-virtualBytes);
-				if (offset.toString().equals("h.Agsubnode_s::id_link")) {
-					return ((ST_Agsubnode_s) parent).from_id_link(ST_dtlink_s.this);
-				}
-				if (offset.toString().equals("h.Agsubnode_s::seq_link")) {
-					return ((ST_Agsubnode_s) parent).from_seq_link(ST_dtlink_s.this);
-				}
-				if (offset.toString().equals("h.Agsym_s::link")) {
-					return ((ST_Agsym_s) parent).from_link(ST_dtlink_s.this);
-				}
-				if (offset.toString().equals("h.Agedge_s::seq_link")) {
-					return ((ST_Agedge_s) parent).from_seq_link(ST_dtlink_s.this);
-				}
-				if (offset.toString().equals("h.Agedge_s::id_link")) {
-					return ((ST_Agedge_s) parent).from_id_link(ST_dtlink_s.this);
-				}
-				if (offset.toString().equals("h.Agraph_s::link")) {
-					return ((ST_Agraph_s) parent).from_link(ST_dtlink_s.this);
-				}
-				System.err.println("virtualBytes=" + virtualBytes);
-				System.err.println("offset=" + offset);
-				return super.addVirtualBytes(virtualBytes);
+			if (offset.toString().equals("h.ST_Agedge_s::id_link")) {
+				return ((ST_Agedge_s) parent).from_id_link(ST_dtlink_s.this);
 			}
-			final OFFSET offset = OFFSET.fromInt(virtualBytes);
-			if (offset.toString().equals("h.refstr_t::s") && parent instanceof ST_refstr_t) {
-				return ((ST_refstr_t) parent).to_s(ST_dtlink_s.this);
-
+			if (offset.toString().equals("h.ST_Agraph_s::link")) {
+				return ((ST_Agraph_s) parent).from_link(ST_dtlink_s.this);
 			}
 			System.err.println("virtualBytes=" + virtualBytes);
 			System.err.println("offset=" + offset);
 			return super.addVirtualBytes(virtualBytes);
 		}
+		final OFFSET offset = OFFSET.fromInt(virtualBytes);
+		if (offset.toString().equals("h.ST_refstr_t::s") && parent instanceof ST_refstr_t) {
+			return ((ST_refstr_t) parent).to_s(ST_dtlink_s.this);
 
-		@Override
-		public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-			return ST_dtlink_s.this.setPtr(fieldName, newData);
-		}
-
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			return ST_dtlink_s.this.getPtr(fieldName);
 		}
+		System.err.println("virtualBytes=" + virtualBytes);
+		System.err.println("offset=" + offset);
+		return super.addVirtualBytes(virtualBytes);
 	}
 
-	@Override
-	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-		if (fieldName.equals("hl._left")) {
-			this._left = (ST_dtlink_s.Amp) newData;
-			return _left;
-		}
-		if (fieldName.equals("right")) {
-			this.right = (ST_dtlink_s.Amp) newData;
-			return right;
-		}
-		return super.setPtr(fieldName, newData);
-	}
-
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("hl._left")) {
-			return _left;
-		}
-		if (fieldName.equals("right")) {
-			return right;
-		}
-		return super.getPtr(fieldName);
-	}
+	// @Override
+	// public __ptr__ setPtr(String fieldName, __ptr__ newData) {
+	// if (fieldName.equals("hl._left")) {
+	// this._left = (ST_dtlink_s) newData;
+	// return _left;
+	// }
+	// if (fieldName.equals("right")) {
+	// this.right = (ST_dtlink_s) newData;
+	// return right;
+	// }
+	// return super.setPtr(fieldName, newData);
+	// }
+
+	// @Override
+	// public __ptr__ getPtr(String fieldName) {
+	// // if (fieldName.equals("hl._left")) {
+	// // return _left;
+	// // }
+	// if (fieldName.equals("right")) {
+	// return right;
+	// }
+	// return super.getPtr(fieldName);
+	// }
 
 	// public interface ST_dtlink_s extends __ptr__ {
 	// public static List<String> DEFINITION = Arrays.asList(
diff --git a/src/h/ST_dtmethod_s.java b/src/h/ST_dtmethod_s.java
index d237f09..cb52c07 100644
--- a/src/h/ST_dtmethod_s.java
+++ b/src/h/ST_dtmethod_s.java
@@ -46,10 +46,8 @@
 package h;
 
 import smetana.core.CFunction;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
-import smetana.core.amiga.StarStruct;
 
 public class ST_dtmethod_s extends UnsupportedStructAndPtr {
 
@@ -70,35 +68,4 @@ public class ST_dtmethod_s extends UnsupportedStructAndPtr {
 		return result;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-		@Override
-		public int getInt(String fieldName) {
-			if (fieldName.equals("type")) {
-				return type;
-			}
-			return super.getInt(fieldName);
-		}
-
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			if (fieldName.equals("searchf")) {
-				return searchf;
-			}
-			return super.getPtr(fieldName);
-		}
-
-		@Override
-		public Object call(String fieldName, Object... args) {
-			if (fieldName.equals("searchf")) {
-				return searchf.exe(args);
-			}
-			return super.call(fieldName, args);
-		}
-	}
-
 }
\ No newline at end of file
diff --git a/src/h/ST_elist.java b/src/h/ST_elist.java
index 63736d8..0340578 100644
--- a/src/h/ST_elist.java
+++ b/src/h/ST_elist.java
@@ -49,10 +49,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import smetana.core.HardcodedStruct;
-import smetana.core.UnsupportedArrayOfPtr;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__array_of_ptr__;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
 import smetana.core.amiga.StarStruct;
@@ -60,7 +57,7 @@ import smetana.core.amiga.StarStruct;
 public class ST_elist extends UnsupportedStructAndPtr implements HardcodedStruct {
 
 	public int size;
-	private List list;
+	public List<ST_Agedge_s> list;
 
 	public ST_elist() {
 		this(null);
@@ -77,6 +74,11 @@ public class ST_elist extends UnsupportedStructAndPtr implements HardcodedStruct
 	}
 
 	@Override
+	public void setStruct(__struct__ value) {
+		copyDataFrom(value);
+	}
+
+	@Override
 	public void ___(__struct__ other) {
 		ST_elist other2 = (ST_elist) other;
 		this.size = other2.size;
@@ -95,129 +97,36 @@ public class ST_elist extends UnsupportedStructAndPtr implements HardcodedStruct
 		return list != null;
 	}
 
-	public void mallocEmpty(Class cl, int nb) {
-		list = new ArrayList();
+	public void mallocEmpty(int nb) {
+		list = new ArrayList<ST_Agedge_s>();
 		while (list.size() < nb) {
 			list.add(null);
 		}
 	}
 
-	class ArrayOfPtr extends UnsupportedArrayOfPtr {
-
-		private int pos;
-
-		private ArrayOfPtr(int pos) {
-			this.pos = pos;
-		}
-
-		@Override
-		public __array_of_ptr__ plus(int delta) {
-			return new ArrayOfPtr(pos + delta);
-		}
-
-		@Override
-		public void setPtr(__ptr__ value) {
-			list.set(pos, value);
-		}
-
-		@Override
-		public __ptr__ getPtr() {
-			return (__ptr__) list.get(pos);
-		}
-
-	}
-
-	class Amp extends UnsupportedStarStruct {
-
-		@Override
-		public int getInt(String fieldName) {
-			if (fieldName.equals("size")) {
-				return size;
-			}
-			return ST_elist.this.getInt(fieldName);
-		}
-
-		@Override
-		public void setInt(String fieldName, int data) {
-			if (fieldName.equals("size")) {
-				size = data;
-				return;
-			}
-			ST_elist.this.setInt(fieldName, data);
-		}
-
-		@Override
-		public __array_of_ptr__ getArrayOfPtr(String fieldName) {
-			if (fieldName.equals("list")) {
-				if (list == null) {
-					return null;
-				}
-				return new ArrayOfPtr(0);
-			}
-			return ST_elist.this.getArrayOfPtr(fieldName);
-		}
-
-	}
-
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
 
 	public void realloc(int nb) {
 		if (list == null) {
-			list = new ArrayList();
+			list = new ArrayList<ST_Agedge_s>();
 		}
 		while (list.size() < nb) {
 			list.add(null);
 		}
 	}
 
-	class Ptr extends UnsupportedStructAndPtr {
-
-		private final int pos;
-
-		public Ptr(int pos) {
-			this.pos = pos;
-		}
-
-		@Override
-		public __ptr__ plus(int pointerMove) {
-			return new Ptr(pos + pointerMove);
-		}
-
-		@Override
-		public __ptr__ getPtr() {
-			return (__ptr__) list.get(pos);
-		}
-
-	}
 
 	public void free() {
 		list = null;
 	}
 
 	public void setInList(int idx, Object value) {
-		list.set(idx, value);
+		list.set(idx, (ST_Agedge_s) value);
 	}
 
 	public __ptr__ getFromList(int i) {
 		return (__ptr__) list.get(i);
 	}
 
-	public __ptr__ getTheList() {
-		if (list == null) {
-			throw new IllegalStateException();
-		}
-		return new Ptr(0);
-	}
-
-	public __array_of_ptr__ getTheArray() {
-		if (list == null) {
-			throw new IllegalStateException();
-		}
-		return new ArrayOfPtr(0);
-	}
 
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "typedef struct elist",
diff --git a/src/h/ST_fontinfo.java b/src/h/ST_fontinfo.java
index f7e3392..cdc728a 100644
--- a/src/h/ST_fontinfo.java
+++ b/src/h/ST_fontinfo.java
@@ -46,7 +46,6 @@
 package h;
 
 import smetana.core.CString;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
@@ -63,57 +62,15 @@ public class ST_fontinfo extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-		@Override
-		public void setDouble(String fieldName, double data) {
-			ST_fontinfo.this.setDouble(fieldName, data);
-		}
-		
-		@Override
-		public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-			return ST_fontinfo.this.setPtr(fieldName, newData);
-		}
-		
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			return ST_fontinfo.this.getPtr(fieldName);
-		}
-		
-		@Override
-		public double getDouble(String fieldName) {
-			return ST_fontinfo.this.getDouble(fieldName);
-		}
-		
-		@Override
-		public CString getCString(String fieldName) {
-			return ST_fontinfo.this.getCString(fieldName);
-		}
-
-	}
-
 	// "struct fontinfo",
 	// "{",
-	private double fontsize;
-	private CString fontname;
-	private CString fontcolor;
+	public double fontsize;
+	public CString fontname;
+	public CString fontcolor;
 
 	// "}");
 
 	@Override
-	public double getDouble(String fieldName) {
-		if (fieldName.equals("fontsize")) {
-			return this.fontsize;
-		}
-		return super.getDouble(fieldName);
-	}
-
-	@Override
 	public void setDouble(String fieldName, double data) {
 		if (fieldName.equals("fontsize")) {
 			this.fontsize = data;
@@ -122,27 +79,6 @@ public class ST_fontinfo extends UnsupportedStructAndPtr {
 		super.setDouble(fieldName, data);
 	}
 
-	@Override
-	public CString getCString(String fieldName) {
-		if (fieldName.equals("fontname")) {
-			return this.fontname;
-		}
-		if (fieldName.equals("fontcolor")) {
-			return this.fontcolor;
-		}
-		return super.getCString(fieldName);
-	}
-	
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("fontname")) {
-			return this.fontname;
-		}
-		if (fieldName.equals("fontcolor")) {
-			return this.fontcolor;
-		}
-		return super.getPtr(fieldName);
-	}
 
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
diff --git a/src/h/ST_gvlayout_engine_s.java b/src/h/ST_gvlayout_engine_s.java
index 094212a..97b6713 100644
--- a/src/h/ST_gvlayout_engine_s.java
+++ b/src/h/ST_gvlayout_engine_s.java
@@ -46,15 +46,13 @@
 package h;
 
 import smetana.core.CFunction;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
-import smetana.core.amiga.StarStruct;
 
 public class ST_gvlayout_engine_s extends UnsupportedStructAndPtr {
 
-	private CFunction layout;
-	private CFunction cleanup;
+	public CFunction layout;
+	public CFunction cleanup;
 
 	// "struct gvlayout_engine_s",
 	// "{",
@@ -75,40 +73,7 @@ public class ST_gvlayout_engine_s extends UnsupportedStructAndPtr {
 		return super.setPtr(fieldName, newData);
 	}
 
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("layout")) {
-			return layout;
-		}
-		if (fieldName.equals("cleanup")) {
-			return cleanup;
-		}
-		return super.getPtr(fieldName);
-	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			return ST_gvlayout_engine_s.this.getPtr(fieldName);
-		}
-		
-		@Override
-		public Object call(String fieldName, Object... args) {
-			if (fieldName.equals("layout")) {
-				return layout.exe(args);
-			}
-			if (fieldName.equals("cleanup")) {
-				return cleanup.exe(args);
-			}
-			return super.call(fieldName, args);
-		}
-	}
 }
 
 // struct gvlayout_engine_s {
diff --git a/src/h/ST_gvlayout_features_t.java b/src/h/ST_gvlayout_features_t.java
index 05cdfd4..7d744e6 100644
--- a/src/h/ST_gvlayout_features_t.java
+++ b/src/h/ST_gvlayout_features_t.java
@@ -45,15 +45,13 @@
  */
 package h;
 
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.amiga.StarStruct;
 
 public class ST_gvlayout_features_t extends UnsupportedStructAndPtr {
 
 	// "typedef struct",
 	// "{",
-	private int flags;
+	public int flags;
 
 	// "}",
 	// "gvlayout_features_t");
@@ -67,21 +65,6 @@ public class ST_gvlayout_features_t extends UnsupportedStructAndPtr {
 		super.setInt(fieldName, data);
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-		@Override
-		public int getInt(String fieldName) {
-			if (fieldName.equals("flags")) {
-				return flags;
-			}
-			return super.getInt(fieldName);
-		}
-	}
 
 }
 
diff --git a/src/h/ST_gvplugin_active_layout_t.java b/src/h/ST_gvplugin_active_layout_t.java
index 9b602ae..421a620 100644
--- a/src/h/ST_gvplugin_active_layout_t.java
+++ b/src/h/ST_gvplugin_active_layout_t.java
@@ -51,10 +51,10 @@ import smetana.core.__ptr__;
 
 public class ST_gvplugin_active_layout_t extends UnsupportedStructAndPtr {
 
-	private ST_gvlayout_engine_s.Amp engine;
+	public ST_gvlayout_engine_s engine;
 	private int id;
-	private ST_gvlayout_features_t.Amp features;
-	private CString type;
+	public ST_gvlayout_features_t features;
+	public CString type;
 
 	// "}",
 
@@ -65,28 +65,17 @@ public class ST_gvplugin_active_layout_t extends UnsupportedStructAndPtr {
 			return newData;
 		}
 		if (fieldName.equals("engine")) {
-			this.engine = (ST_gvlayout_engine_s.Amp) newData;
+			this.engine = (ST_gvlayout_engine_s) newData;
 			return newData;
 		}
 		if (fieldName.equals("features")) {
-			this.features = (ST_gvlayout_features_t.Amp) newData;
+			this.features = (ST_gvlayout_features_t) newData;
 			return newData;
 		}
 		return super.setPtr(fieldName, newData);
 	}
 	
 	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("engine")) {
-			return engine;
-		}
-		if (fieldName.equals("features")) {
-			return features;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("id")) {
 			this.id = data;
diff --git a/src/h/gvplugin_available_s.java b/src/h/ST_gvplugin_available_s.java
index 50aad79..5923bec 100644
--- a/src/h/gvplugin_available_s.java
+++ b/src/h/ST_gvplugin_available_s.java
@@ -44,31 +44,38 @@
  *
  */
 package h;
-import java.util.Arrays;
-import java.util.List;
 
-import smetana.core.__ptr__;
+import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.amiga.StarStruct;
 
-//2 4mff7kl30vs5cmzxe47j17hex
+public class ST_gvplugin_available_s extends UnsupportedStructAndPtr {
 
-public interface gvplugin_available_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct gvplugin_available_s",
-"{",
-"gvplugin_available_t *next",
-"const char *typestr",
-"int quality",
-"gvplugin_package_t *package",
-"gvplugin_installed_t *typeptr",
-"}");
-}
+	private final StarStruct parent;
+
+	// gvplugin_available_t *next; /* next plugin in linked list, or NULL */
+	// const char *typestr; /* type string, e.g. "png" or "ps" */
+	// int quality; /* Programmer assigned quality ranking within type (+ve or -ve int).
+	// First implementation of type should be given "0" quality */
+	// gvplugin_package_t *package; /* details of library containing plugin */
+	// gvplugin_installed_t *typeptr; /* pointer to jumptable for plugin,
+	// or NULL if not yet loaded */
+
+	public ST_gvplugin_available_s() {
+		this(null);
+	}
 
-// struct gvplugin_available_s {
-// 	gvplugin_available_t *next;     /* next plugin in linked list, or NULL */
-// 	const char *typestr;		/* type string, e.g. "png" or "ps" */
-// 	int quality;			/* Programmer assigned quality ranking within type (+ve or -ve int).
-// 					First implementation of type should be given "0" quality */
-// 	gvplugin_package_t *package;	/* details of library containing plugin */
-// 	gvplugin_installed_t *typeptr;  /* pointer to jumptable for plugin,
-// 					or NULL if not yet loaded */
-//     };
\ No newline at end of file
+	public ST_gvplugin_available_s(StarStruct parent) {
+		this.parent = parent;
+	}
+
+	// struct gvplugin_available_s {
+	// gvplugin_available_t *next; /* next plugin in linked list, or NULL */
+	// const char *typestr; /* type string, e.g. "png" or "ps" */
+	// int quality; /* Programmer assigned quality ranking within type (+ve or -ve int).
+	// First implementation of type should be given "0" quality */
+	// gvplugin_package_t *package; /* details of library containing plugin */
+	// gvplugin_installed_t *typeptr; /* pointer to jumptable for plugin,
+	// or NULL if not yet loaded */
+	// };
+
+}
diff --git a/src/h/ST_gvplugin_installed_t.java b/src/h/ST_gvplugin_installed_t.java
index f07d223..0fac04b 100644
--- a/src/h/ST_gvplugin_installed_t.java
+++ b/src/h/ST_gvplugin_installed_t.java
@@ -62,12 +62,12 @@ public class ST_gvplugin_installed_t extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	private int id;
-	private CString type;
-	private int quality;
+	public int id;
+	public CString type;
+	public int quality;
 
-	private ST_gvlayout_engine_s.Amp engine;
-	private ST_gvlayout_features_t.Amp features;
+	public ST_gvlayout_engine_s engine;
+	public ST_gvlayout_features_t features;
 
 	@Override
 	public void setInt(String fieldName, int data) {
@@ -82,13 +82,6 @@ public class ST_gvplugin_installed_t extends UnsupportedStructAndPtr {
 		super.setInt(fieldName, data);
 	}
 
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("id")) {
-			return this.id;
-		}
-		return super.getInt(fieldName);
-	}
 
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
@@ -97,30 +90,16 @@ public class ST_gvplugin_installed_t extends UnsupportedStructAndPtr {
 			return newData;
 		}
 		if (fieldName.equals("engine")) {
-			this.engine = (ST_gvlayout_engine_s.Amp) newData;
+			this.engine = (ST_gvlayout_engine_s) newData;
 			return newData;
 		}
 		if (fieldName.equals("features")) {
-			this.features = (ST_gvlayout_features_t.Amp) newData;
+			this.features = (ST_gvlayout_features_t) newData;
 			return newData;
 		}
 		return super.setPtr(fieldName, newData);
 	}
 
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("type")) {
-			return type;
-		}
-		if (fieldName.equals("engine")) {
-			return engine;
-		}
-		if (fieldName.equals("features")) {
-			return features;
-		}
-		return super.getPtr(fieldName);
-	}
-
 }
 
 // typedef struct {
diff --git a/src/h/ST_inside_t.java b/src/h/ST_inside_t.java
index 9cbdc76..ee6e44e 100644
--- a/src/h/ST_inside_t.java
+++ b/src/h/ST_inside_t.java
@@ -46,10 +46,8 @@
 package h;
 
 import smetana.core.MutableDoublePtr;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
-import smetana.core.amiga.StarArrayOfStruct;
 import smetana.core.amiga.StarStruct;
 
 public class ST_inside_t extends UnsupportedStructAndPtr {
@@ -69,16 +67,16 @@ public class ST_inside_t extends UnsupportedStructAndPtr {
 	// "struct",
 	// "{",
 	// "pointf* p",
-	private StarArrayOfStruct p;
-	private MutableDoublePtr r;
+	public ST_pointf.Array a_p;
+	public MutableDoublePtr a_r;
 	// "double* r",
 	// "}",
 	// "a",
 	// "struct",
 	// "{",
 	// "node_t* n",
-	private ST_Agnode_s n;
-	private ST_boxf bp;
+	public ST_Agnode_s s_n;
+	public ST_boxf s_bp;
 
 	// "boxf*    bp",
 	// "}",
@@ -86,55 +84,28 @@ public class ST_inside_t extends UnsupportedStructAndPtr {
 	// "}",
 	// "inside_t");
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			return ST_inside_t.this.getPtr(fieldName);
-		}
-	}
 
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("s.n")) {
-			this.n = (ST_Agnode_s) newData;
-			return this.n;
+			this.s_n = (ST_Agnode_s) newData;
+			return this.s_n;
 		}
 		if (fieldName.equals("s.bp")) {
-			this.bp = (ST_boxf) newData;
-			return this.bp;
+			this.s_bp = (ST_boxf) newData;
+			return this.s_bp;
 		}
 		if (fieldName.equals("a.p")) {
-			this.p = (StarArrayOfStruct) newData;
-			return this.p;
+			this.a_p = (ST_pointf.Array) newData;
+			return this.a_p;
 		}
 		if (fieldName.equals("a.r")) {
-			this.r = (MutableDoublePtr) newData;
-			return this.r;
+			this.a_r = (MutableDoublePtr) newData;
+			return this.a_r;
 		}
 		return super.setPtr(fieldName, newData);
 	}
 
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("s.n")) {
-			return this.n;
-		}
-		if (fieldName.equals("s.bp")) {
-			return this.bp;
-		}
-		if (fieldName.equals("a.p")) {
-			return this.p;
-		}
-		if (fieldName.equals("a.r")) {
-			return this.r;
-		}
-		return super.getPtr(fieldName);
-	}
 
 }
 
diff --git a/src/h/ST_label_params_t.java b/src/h/ST_label_params_t.java
index 0da6975..ea3c859 100644
--- a/src/h/ST_label_params_t.java
+++ b/src/h/ST_label_params_t.java
@@ -45,14 +45,7 @@
  */
 package h;
 
-import h.ST_label_params_t.Amp;
-
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__ptr__;
 import smetana.core.__struct__;
 import smetana.core.amiga.StarStruct;
 
@@ -70,22 +63,13 @@ public class ST_label_params_t extends UnsupportedStructAndPtr {
 
 	// "typedef struct",
 	// "{",
-	private final ST_boxf bb = new ST_boxf(this);
-	private boolean force;
+	public final ST_boxf bb = new ST_boxf(this);
+	public boolean force;
 
 	// "}",
 	// "label_params_t");
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
-
-	@Override
 	public void setStruct(String fieldName, __struct__ newData) {
 		if (fieldName.equals("bb")) {
 			this.bb.copyDataFrom(newData);
@@ -93,15 +77,7 @@ public class ST_label_params_t extends UnsupportedStructAndPtr {
 		}
 		super.setStruct(fieldName, newData);
 	}
-
-	@Override
-	public void setBoolean(String fieldName, boolean data) {
-		if (fieldName.equals("force")) {
-			this.force = data;
-			return;
-		}
-		super.setBoolean(fieldName, data);
-	}
+	
 }
 
 // typedef struct {
diff --git a/src/h/ST_layout_t.java b/src/h/ST_layout_t.java
index fdd4a1e..74878d5 100644
--- a/src/h/ST_layout_t.java
+++ b/src/h/ST_layout_t.java
@@ -45,10 +45,8 @@
  */
 package h;
 
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
-import smetana.core.__struct__;
 import smetana.core.amiga.StarStruct;
 
 public class ST_layout_t extends UnsupportedStructAndPtr {
@@ -63,29 +61,21 @@ public class ST_layout_t extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-	}
-
-	private double quantum;
-	private double scale;
-	private double ratio;
-	private double dpi;
+	public double quantum;
+	public double scale;
+	public double ratio;
+	public double dpi;
 
-	private ST_pointf margin = new ST_pointf(this);
-	private ST_pointf page = new ST_pointf(this);
-	private ST_pointf size = new ST_pointf(this);
+	public ST_pointf margin = new ST_pointf(this);
+	public ST_pointf page = new ST_pointf(this);
+	public ST_pointf size = new ST_pointf(this);
 
-	private boolean filled;
-	private boolean landscape;
-	private boolean centered;
+	public boolean filled;
+	public boolean landscape;
+	public boolean centered;
 
 	// "ratio_t ratio_kind",
-	private int ratio_kind;
+	public int ratio_kind;
 	// "void* xdots",
 	// "char* id",
 
@@ -98,54 +88,6 @@ public class ST_layout_t extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("margin")) {
-			return margin;
-		}
-		if (fieldName.equals("page")) {
-			return page;
-		}
-		if (fieldName.equals("size")) {
-			return size;
-		}
-		return super.getStruct(fieldName);
-	}
-
-	@Override
-	public void setBoolean(String fieldName, boolean data) {
-		if (fieldName.equals("filled")) {
-			this.filled = data;
-			return;
-		}
-		if (fieldName.equals("landscape")) {
-			this.landscape = data;
-			return;
-		}
-		if (fieldName.equals("centered")) {
-			this.centered = data;
-			return;
-		}
-		super.setBoolean(fieldName, data);
-	}
-
-	@Override
-	public double getDouble(String fieldName) {
-		if (fieldName.equals("quantum")) {
-			return this.quantum;
-		}
-		if (fieldName.equals("scale")) {
-			return this.scale;
-		}
-		if (fieldName.equals("ratio")) {
-			return this.ratio;
-		}
-		if (fieldName.equals("dpi")) {
-			return this.dpi;
-		}
-		return super.getDouble(fieldName);
-	}
-
-	@Override
 	public void setDouble(String fieldName, double data) {
 		if (fieldName.equals("quantum")) {
 			this.quantum = data;
@@ -166,13 +108,6 @@ public class ST_layout_t extends UnsupportedStructAndPtr {
 		super.setDouble(fieldName, data);
 	}
 	
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("ratio_kind")) {
-			return this.ratio_kind;
-		}
-		return super.getInt(fieldName);
-	}
 }
 
 // typedef struct layout_t {
diff --git a/src/h/ST_nlist_t.java b/src/h/ST_nlist_t.java
index fe88a55..b543709 100644
--- a/src/h/ST_nlist_t.java
+++ b/src/h/ST_nlist_t.java
@@ -50,14 +50,13 @@ import java.util.List;
 
 import smetana.core.HardcodedStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
 
 public class ST_nlist_t extends UnsupportedStructAndPtr implements HardcodedStruct {
 
 	// public __ptr__ list;
 	public int size;
-	private final List data = new ArrayList();
+	private final List<ST_Agnode_s> data = new ArrayList<ST_Agnode_s>();
 
 	public ST_nlist_t(StarStruct parent) {
 	}
@@ -66,23 +65,23 @@ public class ST_nlist_t extends UnsupportedStructAndPtr implements HardcodedStru
 		this(null);
 	}
 
-	public void reallocEmpty(int n_nodes, Class<Agnode_s> class1) {
+	public void reallocEmpty(int n_nodes) {
 		while (data.size() < n_nodes) {
 			data.add(null);
 		}
 	}
 
-	public void allocEmpty(int n_nodes, Class<Agnode_s> class1) {
+	public void allocEmpty(int n_nodes) {
 		data.clear();
-		reallocEmpty(n_nodes, class1);
+		reallocEmpty(n_nodes);
 	}
 
-	public void setInList(int idx, Agnode_s value) {
+	public void setInList(int idx, ST_Agnode_s value) {
 		data.set(idx, value);
 	}
 
-	public __ptr__ getFromList(int i) {
-		return (__ptr__) data.get(i);
+	public ST_Agnode_s getFromList(int i) {
+		return data.get(i);
 	}
 
 	public void resetList() {
diff --git a/src/h/ST_nodequeue.java b/src/h/ST_nodequeue.java
index d6918cd..78fde72 100644
--- a/src/h/ST_nodequeue.java
+++ b/src/h/ST_nodequeue.java
@@ -45,11 +45,8 @@
  */
 package h;
 
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__array_of_ptr__;
 import smetana.core.__ptr__;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_nodequeue extends UnsupportedStructAndPtr {
@@ -64,22 +61,13 @@ public class ST_nodequeue extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
-
 	// "typedef struct nodequeue",
 	// "{",
 	// "node_t **store, **limit, **head, **tail",
-	private StarArrayOfPtr store;
-	private StarArrayOfPtr tail;
-	private StarArrayOfPtr head;
-	private StarArrayOfPtr limit;
+	public ST_Agnode_s.ArrayOfStar store;
+	public ST_Agnode_s.ArrayOfStar tail;
+	public ST_Agnode_s.ArrayOfStar head;
+	public ST_Agnode_s.ArrayOfStar limit;
 
 	// "}",
 	// "nodequeue");
@@ -87,57 +75,24 @@ public class ST_nodequeue extends UnsupportedStructAndPtr {
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("store")) {
-			this.store = (StarArrayOfPtr) newData;
+			this.store = (ST_Agnode_s.ArrayOfStar) newData;
 			return this.store;
 		}
 		if (fieldName.equals("tail")) {
-			this.tail = (StarArrayOfPtr) newData;
+			this.tail = (ST_Agnode_s.ArrayOfStar) newData;
 			return this.tail;
 		}
 		if (fieldName.equals("head")) {
-			this.head = (StarArrayOfPtr) newData;
+			this.head = (ST_Agnode_s.ArrayOfStar) newData;
 			return this.head;
 		}
 		if (fieldName.equals("limit")) {
-			this.limit = (StarArrayOfPtr) newData;
+			this.limit = (ST_Agnode_s.ArrayOfStar) newData;
 			return this.limit;
 		}
 		return super.setPtr(fieldName, newData);
 	}
 
-	@Override
-	public __array_of_ptr__ getArrayOfPtr(String fieldName) {
-		if (fieldName.equals("store")) {
-			return this.store.getInternalArray();
-		}
-		if (fieldName.equals("tail")) {
-			return this.tail.getInternalArray();
-		}
-		if (fieldName.equals("head")) {
-			return this.head.getInternalArray();
-		}
-		if (fieldName.equals("limit")) {
-			return this.limit.getInternalArray();
-		}
-		return super.getArrayOfPtr(fieldName);
-	}
-
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("store")) {
-			return this.store;
-		}
-		if (fieldName.equals("tail")) {
-			return this.tail;
-		}
-		if (fieldName.equals("head")) {
-			return this.head;
-		}
-		if (fieldName.equals("limit")) {
-			return this.limit;
-		}
-		return super.getPtr(fieldName);
-	}
 }
 
 // typedef struct nodequeue {
diff --git a/src/h/ST_object_t.java b/src/h/ST_object_t.java
index 8a3c45e..a8a55ac 100644
--- a/src/h/ST_object_t.java
+++ b/src/h/ST_object_t.java
@@ -45,21 +45,18 @@
  */
 package h;
 
-import h.ST_object_t.Amp;
-
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
 
-import smetana.core.UnsupportedSize_t;
-import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedArrayOfStruct2;
 import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_ptr__;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
 import smetana.core.size_t;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
-public class ST_object_t extends UnsupportedStructAndPtr {
+public class ST_object_t extends UnsupportedStructAndPtr implements ST_Node_t___or_object_t {
 
 	private final StarStruct parent;
 
@@ -73,20 +70,107 @@ public class ST_object_t extends UnsupportedStructAndPtr {
 
 	// "typedef struct",
 	// "{",
-	private final ST_pointf pos = new ST_pointf(this);
-	private final ST_pointf sz = new ST_pointf(this);
+	public final ST_pointf pos = new ST_pointf(this);
+	public final ST_pointf sz = new ST_pointf(this);
 	// "xlabel_t *lbl",
-	private StarArrayOfPtr lbl;
+	public ST_xlabel_t.Array lbl;
 
 	// "}",
 	// "object_t");
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
+	public ST_object_t getStruct() {
+		return this;
+	}
+
+	@Override
+	public ST_object_t getPtr() {
+		return this;
 	}
 
-	public class Amp extends UnsupportedStarStruct {
+	@Override
+	public boolean isSameThan(StarStruct other) {
+		ST_object_t other2 = (ST_object_t) other;
+		return this == other2;
+	}
+
+	public static class Array extends UnsupportedArrayOfStruct2 implements __ptr__, __array_of_ptr__ {
+
+		private final List<ST_object_t> data;
+		private final int pos;
+
+		@Override
+		public Array asPtr() {
+			return this;
+		}
+
+		@Override
+		public ST_object_t getStruct() {
+			return get(0);
+		}
+
+
+		@Override
+		public __ptr__ setPtr(String fieldName, __ptr__ data) {
+			return get(0).setPtr(fieldName, data);
+		}
+
+		@Override
+		public void setStruct(String fieldName, __struct__ data) {
+			get(0).setStruct(fieldName, data);
+		}
+
+		public Array(int size) {
+			this.data = new ArrayList<ST_object_t>();
+			this.pos = 0;
+			for (int i = 0; i < size; i++) {
+				data.add(new ST_object_t());
+			}
+		}
+
+		public Array reallocJ(int newsize) {
+			while (data.size() < newsize) {
+				data.add(new ST_object_t());
+			}
+			return this;
+		}
+
+		public Array plus(int delta) {
+			return plusJ(delta);
+		}
+
+		private Array(List<ST_object_t> data, int pos) {
+			this.data = data;
+			this.pos = pos;
+		}
+
+		public ST_object_t get(int i) {
+			return this.data.get(pos + i);
+		}
+
+		public Array plusJ(int i) {
+			return new Array(data, pos + i);
+		}
+
+		public int minus(Array other) {
+			if (this.data != other.data) {
+				throw new IllegalArgumentException();
+			}
+			return this.pos - other.pos;
+		}
+
+		public Array move(int delta) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+		public void realloc(size_t nb) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+		public int comparePointerInternal(__array_of_ptr__ other) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
 
 	}
 
@@ -97,24 +181,13 @@ public class ST_object_t extends UnsupportedStructAndPtr {
 			return newData;
 		}
 		if (fieldName.equals("lbl")) {
-			this.lbl = (StarArrayOfPtr) newData;
+			this.lbl = (ST_xlabel_t.Array) newData;
 			return this.lbl;
 		}
 		return super.setPtr(fieldName, newData);
 	}
 
 	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("pos")) {
-			return this.pos;
-		}
-		if (fieldName.equals("sz")) {
-			return this.sz;
-		}
-		return super.getStruct(fieldName);
-	}
-
-	@Override
 	public void setStruct(String fieldName, __struct__ newData) {
 		if (fieldName.equals("pos")) {
 			this.pos.copyDataFrom(newData);
@@ -127,38 +200,6 @@ public class ST_object_t extends UnsupportedStructAndPtr {
 		super.setStruct(fieldName, newData);
 	}
 
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("pos")) {
-			return this.pos;
-		}
-		if (fieldName.equals("sz")) {
-			return this.sz;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	public static size_t sizeof(final int nb) {
-		return new UnsupportedSize_t(nb) {
-			@Override
-			public Object malloc() {
-				return new StarArrayOfPtr(new STArray<ST_object_t>(nb, 0, ST_object_t.class));
-			}
-
-			@Override
-			public int getInternalNb() {
-				return nb;
-			}
-
-			@Override
-			public Object realloc(Object old) {
-				StarArrayOfPtr old2 = (StarArrayOfPtr) old;
-				old2.realloc(nb);
-				return old2;
-			}
-		};
-	}
-
 }
 
 // typedef struct {
diff --git a/src/h/ST_pack_info.java b/src/h/ST_pack_info.java
index 5aae6d5..aafed5f 100644
--- a/src/h/ST_pack_info.java
+++ b/src/h/ST_pack_info.java
@@ -45,12 +45,6 @@
  */
 package h;
 
-import h.ST_pack_info.Amp;
-
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
@@ -67,50 +61,24 @@ public class ST_pack_info extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
-
 	// "typedef struct",
 	// "{",
 	// "float aspect",
-	private int sz;
-	private int margin;
+	public int sz;
+	public int margin;
 	private int doSplines;
 	// "pack_mode mode",
-	private int mode;
+	public int mode;
 	private __ptr__ fixed;
 	// "boolean *fixed",
 	// "packval_t* vals",
-	private __ptr__ vals;
-	private int flags;
+	public __ptr__ vals;
+	public int flags;
 
 	// "}",
 	// "pack_info");
 
 	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("flags")) {
-			return this.flags;
-		}
-		if (fieldName.equals("mode")) {
-			return this.mode;
-		}
-		if (fieldName.equals("sz")) {
-			return this.sz;
-		}
-		if (fieldName.equals("margin")) {
-			return this.margin;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("flags")) {
 			this.flags = data;
diff --git a/src/h/ST_path.java b/src/h/ST_path.java
index dc87643..5e4c8b8 100644
--- a/src/h/ST_path.java
+++ b/src/h/ST_path.java
@@ -45,12 +45,8 @@
  */
 package h;
 
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__array_of_ptr__;
 import smetana.core.__ptr__;
-import smetana.core.__struct__;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_path extends UnsupportedStructAndPtr {
@@ -65,23 +61,14 @@ public class ST_path extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
-
 	// "typedef struct path",
 	// "{",
-	final ST_port start = new ST_port(this), end = new ST_port(this);
-	private int nbox;
+	final public ST_port start = new ST_port(this), end = new ST_port(this);
+	public int nbox;
 	// "boxf *boxes",
-	private StarArrayOfPtr boxes;
+	public ST_boxf boxes[];
 
-	private ST_Agedge_s.Amp data;
+	public ST_Agedge_s data;
 
 	// "void *data",
 	// "}",
@@ -89,67 +76,13 @@ public class ST_path extends UnsupportedStructAndPtr {
 
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-		if (fieldName.equals("boxes")) {
-			this.boxes = (StarArrayOfPtr) newData;
-			return this.boxes;
-		}
 		if (fieldName.equals("data")) {
-			if (newData instanceof ST_Agedge_s) {
-				newData = ((ST_Agedge_s) newData).amp();
-			}
-			this.data = (ST_Agedge_s.Amp) newData;
+			this.data = (ST_Agedge_s) newData;
 			return this.data;
 		}
 		return super.setPtr(fieldName, newData);
 	}
 
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("data")) {
-			return this.data;
-		}
-		if (fieldName.equals("boxes")) {
-			return this.boxes;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("start")) {
-			return start;
-		}
-		if (fieldName.equals("end")) {
-			return end;
-		}
-		return super.getStruct(fieldName);
-	}
-
-	@Override
-	public __array_of_ptr__ getArrayOfPtr(String fieldName) {
-		if (fieldName.equals("boxes")) {
-			return boxes.getInternalArray();
-		}
-		return super.getArrayOfPtr(fieldName);
-	}
-
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("nbox")) {
-			return this.nbox;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
-	public void setInt(String fieldName, int data) {
-		if (fieldName.equals("nbox")) {
-			this.nbox = data;
-			return;
-		}
-		super.setInt(fieldName, data);
-	}
-
 }
 
 // typedef struct path { /* internal specification for an edge spline */
diff --git a/src/h/ST_pathend_t.java b/src/h/ST_pathend_t.java
index 9976232..0a1f172 100644
--- a/src/h/ST_pathend_t.java
+++ b/src/h/ST_pathend_t.java
@@ -45,10 +45,8 @@
  */
 package h;
 
-import smetana.core.UnsupportedArrayOfStruct;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__array_of_struct__;
+import smetana.core.__ptr__;
 import smetana.core.__struct__;
 import smetana.core.amiga.StarStruct;
 
@@ -66,12 +64,12 @@ public class ST_pathend_t extends UnsupportedStructAndPtr {
 
 	// "typedef struct pathend_t",
 	// "{",
-	private final ST_boxf nb = new ST_boxf(this);
-	private final ST_pointf np = new ST_pointf(this);
-	private int sidemask;
-	private int boxn;
+	public final ST_boxf nb = new ST_boxf(this);
+	public final ST_pointf np = new ST_pointf(this);
+	public int sidemask;
+	public int boxn;
 
-	private final ST_boxf boxes[] = new ST_boxf[] { new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(),
+	public final ST_boxf boxes[] = new ST_boxf[] { new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(),
 			new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(),
 			new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(), new ST_boxf(),
 			new ST_boxf(), new ST_boxf() };
@@ -80,67 +78,9 @@ public class ST_pathend_t extends UnsupportedStructAndPtr {
 	// "}",
 	// "pathend_t");
 
-	class ArrayOfTwenty extends UnsupportedArrayOfStruct {
-
-		final private int pos;
-
-		public ArrayOfTwenty(int pos) {
-			this.pos = pos;
-		}
-
-		@Override
-		public __array_of_struct__ plus(int delta) {
-			return new ArrayOfTwenty(pos + delta);
-		}
-
-		@Override
-		public __struct__ getStruct() {
-			return boxes[pos];
-		}
-
-		@Override
-		public void setStruct(__struct__ value) {
-			boxes[pos].copyDataFrom(value);
-		}
-
-		@Override
-		public double getDouble(String fieldName) {
-			return getStruct().getDouble(fieldName);
-		}
-
-	}
-
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-		@Override
-		public void setStruct(String fieldName, __struct__ newData) {
-			ST_pathend_t.this.setStruct(fieldName, newData);
-		}
-
-		@Override
-		public __array_of_struct__ getArrayOfStruct(String fieldName) {
-			return ST_pathend_t.this.getArrayOfStruct(fieldName);
-		}
-
-		@Override
-		public int getInt(String fieldName) {
-			return ST_pathend_t.this.getInt(fieldName);
-		}
-
-		@Override
-		public void setInt(String fieldName, int data) {
-			ST_pathend_t.this.setInt(fieldName, data);
-		}
-
-		@Override
-		public __struct__ getStruct(String fieldName) {
-			return ST_pathend_t.this.getStruct(fieldName);
-		}
-
+	public __ptr__ getPtr() {
+		return this;
 	}
 
 	@Override
@@ -157,28 +97,6 @@ public class ST_pathend_t extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("nb")) {
-			return this.nb;
-		}
-		if (fieldName.equals("np")) {
-			return this.np;
-		}
-		return super.getStruct(fieldName);
-	}
-
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("boxn")) {
-			return this.boxn;
-		}
-		if (fieldName.equals("sidemask")) {
-			return this.sidemask;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("boxn")) {
 			this.boxn = data;
@@ -191,14 +109,6 @@ public class ST_pathend_t extends UnsupportedStructAndPtr {
 		super.setInt(fieldName, data);
 	}
 
-	@Override
-	public __array_of_struct__ getArrayOfStruct(String fieldName) {
-		if (fieldName.equals("boxes")) {
-			return new ArrayOfTwenty(0);
-		}
-		return super.getArrayOfStruct(fieldName);
-	}
-
 }
 
 // typedef struct pathend_t {
diff --git a/src/h/ST_point.java b/src/h/ST_point.java
index 8d0c580..f450411 100644
--- a/src/h/ST_point.java
+++ b/src/h/ST_point.java
@@ -45,7 +45,6 @@
  */
 package h;
 
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__struct__;
 import smetana.core.amiga.StarStruct;
@@ -62,18 +61,10 @@ public class ST_point extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
 
 	// "typedef struct",
 	// "{",
-	private int x, y;
+	public int x, y;
 
 	// "}",
 	// "point");
@@ -94,17 +85,6 @@ public class ST_point extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("x")) {
-			return this.x;
-		}
-		if (fieldName.equals("y")) {
-			return this.y;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("x")) {
 			this.x = data;
diff --git a/src/h/ST_pointf.java b/src/h/ST_pointf.java
index d4d426a..9f36f0a 100644
--- a/src/h/ST_pointf.java
+++ b/src/h/ST_pointf.java
@@ -45,70 +45,144 @@
  */
 package h;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import smetana.core.CString;
 import smetana.core.HardcodedStruct;
-import smetana.core.UnsupportedSize_t;
-import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedArrayOfStruct2;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__array_of_ptr__;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
 import smetana.core.size_t;
 import smetana.core.amiga.Area;
-import smetana.core.amiga.StarArrayOfPtr;
-import smetana.core.amiga.StarArrayOfStruct;
 import smetana.core.amiga.StarStruct;
 
 public class ST_pointf extends UnsupportedStructAndPtr implements HardcodedStruct {
 
 	public double x;
 	public double y;
-
-	public ST_pointf() {
-		this(null);
+	
+	@Override
+	public boolean isSameThan(StarStruct other) {
+		return this==(ST_pointf)other;
 	}
 
-	public class Amp extends UnsupportedStarStruct {
+	public static class Array extends UnsupportedArrayOfStruct2 implements __ptr__,
+			__array_of_ptr__ {
 
-		public double getX() {
-			return x;
-		}
+		private final List<ST_pointf> data;
+		private final int pos;
 
-		public double getY() {
-			return y;
+		@Override
+		public void setStruct(__struct__ value) {
+			getStruct().___(value);
 		}
 
-		public void setX(double value) {
-			x = value;
+		@Override
+		public Array asPtr() {
+			return this;
 		}
 
-		public void setY(double value) {
-			y = value;
+		@Override
+		public void setDouble(String fieldName, double value) {
+			getStruct().setDouble(fieldName, value);
 		}
 
 		@Override
-		public __struct__ getStruct() {
-			return ST_pointf.this;
+		public ST_pointf getStruct() {
+			return get(0).getStruct();
 		}
 
 		@Override
-		public double getDouble(String fieldName) {
-			return ST_pointf.this.getDouble(fieldName);
+		public ST_pointf getPtr() {
+			return get(0);
 		}
 
-		@Override
-		public void setStruct(__struct__ value) {
-			ST_pointf.this.setStruct(value);
+		public Array(int size) {
+			this.data = new ArrayList<ST_pointf>();
+			this.pos = 0;
+			for (int i = 0; i < size; i++) {
+				data.add(new ST_pointf());
+			}
 		}
 
-		@Override
-		public boolean isSameThan(StarStruct other) {
-			ST_pointf.Amp other2 = (Amp) other;
-			return this.getStruct() == other2.getStruct();
+		public Array reallocJ(int newsize) {
+			while (data.size() < newsize) {
+				data.add(new ST_pointf());
+			}
+			return this;
+		}
+
+		public Array plus(int delta) {
+			return plusJ(delta);
+		}
+
+		private Array(List<ST_pointf> data, int pos) {
+			this.data = data;
+			this.pos = pos;
+		}
+
+		public ST_pointf get(int i) {
+			return this.data.get(pos + i);
+		}
+
+		public Array plusJ(int i) {
+			return new Array(data, pos + i);
+		}
+
+		public int minus(Array other) {
+			if (this.data != other.data) {
+				throw new IllegalArgumentException();
+			}
+			return this.pos - other.pos;
+		}
+
+		public Array move(int delta) {
+			throw new UnsupportedOperationException(getClass().toString());
 		}
+
+		public void realloc(size_t nb) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+		public int comparePointerInternal(__array_of_ptr__ other) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+		public void setCString(CString value) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
 	}
 
+	public static ST_pointf[] malloc(int nb) {
+		final ST_pointf result[] = new ST_pointf[nb];
+		for (int i = 0; i < nb; i++) {
+			result[i] = new ST_pointf();
+		}
+		return result;
+	}
+
+	public static ST_pointf[] realloc(ST_pointf[] old, int nb) {
+		if (nb <= old.length) {
+			return old;
+		}
+		final ST_pointf result[] = new ST_pointf[nb];
+		for (int i = 0; i < nb; i++) {
+			result[i] = i < old.length ? old[i] : new ST_pointf();
+		}
+		return result;
+	}
+
+	public ST_pointf() {
+		this(null);
+	}
+
+
 	@Override
-	public __struct__ copy() {
+	public ST_pointf copy() {
 		final ST_pointf result = new ST_pointf();
 		result.x = this.x;
 		result.y = this.y;
@@ -121,28 +195,28 @@ public class ST_pointf extends UnsupportedStructAndPtr implements HardcodedStruc
 		this.x = other2.x;
 		this.y = other2.y;
 	}
-	
+
 	@Override
 	public void copyDataFrom(__ptr__ value) {
 		final ST_pointf other2 = (ST_pointf) value;
 		this.x = other2.x;
 		this.y = other2.y;
 	}
-	
+
 	@Override
-	public __struct__ getStruct() {
+	public ST_pointf getStruct() {
 		return this;
 	}
 
 	@Override
 	public void memcopyFrom(Area source) {
-		if (source instanceof StarArrayOfPtr) {
-			final Amp other2 = (Amp) ((StarArrayOfPtr) source).getPtr();
-			this.x = other2.getX();
-			this.y = other2.getY();
-			return;
-
-		}
+//		if (source instanceof StarArrayOfPtr) {
+//			final Amp other2 = (Amp) ((StarArrayOfPtr) source).getPtr();
+//			this.x = other2.getX();
+//			this.y = other2.getY();
+//			return;
+//
+//		}
 		final ST_pointf other2 = (ST_pointf) source;
 		this.x = other2.x;
 		this.y = other2.y;
@@ -157,22 +231,34 @@ public class ST_pointf extends UnsupportedStructAndPtr implements HardcodedStruc
 
 	@Override
 	public void ____(__ptr__ other) {
-		if (other instanceof __array_of_ptr__) {
-			Amp other2 = (Amp) other.getPtr();
-			this.x = other2.getX();
-			this.y = other2.getY();
+		if (other instanceof ST_pointf.Array) {
+			ST_pointf.Array other2 = (ST_pointf.Array) other;
+			this.x = other2.get(0).x;
+			this.y = other2.get(0).y;
 			return;
 		}
-		if (other instanceof StarArrayOfPtr) {
-			Amp other2 = (Amp) other.getPtr();
-			this.x = other2.getX();
-			this.y = other2.getY();
-			return;
-		}
-		if (other instanceof StarArrayOfStruct) {
-			Amp other2 = (Amp) other.getPtr();
-			this.x = other2.getX();
-			this.y = other2.getY();
+//		if (other instanceof __array_of_ptr__) {
+//			Amp other2 = (Amp) other.getPtr();
+//			this.x = other2.getX();
+//			this.y = other2.getY();
+//			return;
+//		}
+//		if (other instanceof StarArrayOfPtr) {
+//			Amp other2 = (Amp) other.getPtr();
+//			this.x = other2.getX();
+//			this.y = other2.getY();
+//			return;
+//		}
+//		if (other instanceof Amp) {
+//			Amp other2 = (Amp) other;
+//			this.x = other2.getX();
+//			this.y = other2.getY();
+//			return;
+//		}
+		if (other instanceof ST_pointf) {
+			ST_pointf other2 = (ST_pointf) other;
+			this.x = other2.x;
+			this.y = other2.y;
 			return;
 		}
 		System.err.println("other=" + other.getClass());
@@ -188,22 +274,6 @@ public class ST_pointf extends UnsupportedStructAndPtr implements HardcodedStruc
 	}
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	@Override
-	public double getDouble(String fieldName) {
-		if (fieldName.equals("x")) {
-			return x;
-		}
-		if (fieldName.equals("y")) {
-			return y;
-		}
-		return super.getDouble(fieldName);
-	}
-
-	@Override
 	public void setDouble(String fieldName, double data) {
 		if (fieldName.equals("x")) {
 			this.x = data;
@@ -219,27 +289,6 @@ public class ST_pointf extends UnsupportedStructAndPtr implements HardcodedStruc
 	public ST_pointf(StarStruct parent) {
 	}
 
-	public static size_t sizeof(final int nb) {
-		return new UnsupportedSize_t(nb) {
-			@Override
-			public Object malloc() {
-				return new StarArrayOfPtr(new STArray<ST_pointf>(nb, 0, ST_pointf.class));
-			}
-
-			@Override
-			public int getInternalNb() {
-				return nb;
-			}
-			
-			@Override
-			public Object realloc(Object old) {
-				StarArrayOfPtr old2 = (StarArrayOfPtr) old;
-				old2.realloc(nb);
-				return old2;
-			}
-		};
-	}
-
 	// public interface ST_pointf extends __ptr__ {
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "typedef struct pointf_s",
diff --git a/src/h/ST_pointnlink_t.java b/src/h/ST_pointnlink_t.java
index 12285b6..c8a9d57 100644
--- a/src/h/ST_pointnlink_t.java
+++ b/src/h/ST_pointnlink_t.java
@@ -46,20 +46,14 @@
 package h;
 
 import smetana.core.HardcodedStruct;
-import smetana.core.UnsupportedSize_t;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
-import smetana.core.__struct__;
-import smetana.core.size_t;
-import smetana.core.amiga.StarArrayOfPtr;
-import smetana.core.amiga.StarArrayOfStruct;
 import smetana.core.amiga.StarStruct;
 
 public class ST_pointnlink_t extends UnsupportedStructAndPtr implements HardcodedStruct {
 
-	public ST_pointf.Amp pp;
-	public ST_pointnlink_t.Amp link;
+	public ST_pointf pp;
+	public ST_pointnlink_t link;
 
 	public ST_pointnlink_t() {
 		this(null);
@@ -68,70 +62,17 @@ public class ST_pointnlink_t extends UnsupportedStructAndPtr implements Hardcode
 	public ST_pointnlink_t(StarStruct parent) {
 	}
 
-	public class Amp extends UnsupportedStarStruct {
-
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			if (fieldName.equals("pp")) {
-				return pp;
-			}
-			if (fieldName.equals("link")) {
-				return link;
-			}
-			return super.getPtr(fieldName);
-		}
-
-		@Override
-		public __struct__ getStruct() {
-			return ST_pointnlink_t.this;
-		}
-
-		@Override
-		public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-			return ST_pointnlink_t.this.setPtr(fieldName, newData);
-		}
-
-		@Override
-		public boolean isSameThan(StarStruct other) {
-			ST_pointnlink_t.Amp other2 = (Amp) other;
-			return this.getStruct() == other2.getStruct();
-		}
-
-		@Override
-		public Class getRealClass() {
-			return ST_pointnlink_t.class;
-		}
-
-	}
-
 	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("pp")) {
-			return pp;
-		}
-		if (fieldName.equals("link")) {
-			return link;
-		}
-		return super.getPtr(fieldName);
+	public boolean isSameThan(StarStruct other) {
+		ST_pointnlink_t other2 = (ST_pointnlink_t) other;
+		return this == other2;
 	}
 
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("pp")) {
-			if (newData instanceof StarArrayOfPtr) {
-				StarArrayOfPtr tmp = (StarArrayOfPtr) newData;
-				ST_pointf data = (ST_pointf) tmp.getStruct();
-				pp = (ST_pointf.Amp) data.amp();
-				return pp;
-			}
-			if (newData instanceof StarArrayOfStruct) {
-				StarArrayOfStruct tmp = (StarArrayOfStruct) newData;
-				ST_pointf data = (ST_pointf) tmp.getStruct();
-				pp = (ST_pointf.Amp) data.amp();
-				return pp;
-			}
 			System.err.println("newData1=" + newData.getClass());
-			pp = (ST_pointf.Amp) newData;
+			pp = (ST_pointf) newData;
 			return pp;
 		}
 		if (fieldName.equals("link")) {
@@ -139,20 +80,8 @@ public class ST_pointnlink_t extends UnsupportedStructAndPtr implements Hardcode
 				link = null;
 				return link;
 			}
-			if (newData instanceof StarArrayOfPtr) {
-				StarArrayOfPtr tmp = (StarArrayOfPtr) newData;
-				ST_pointnlink_t data = (ST_pointnlink_t) tmp.getStruct();
-				link = (ST_pointnlink_t.Amp) data.amp();
-				return link;
-			}
-			if (newData instanceof StarArrayOfStruct) {
-				StarArrayOfStruct tmp = (StarArrayOfStruct) newData;
-				ST_pointnlink_t data = (ST_pointnlink_t) tmp.getStruct();
-				link = (ST_pointnlink_t.Amp) data.amp();
-				return link;
-			}
-			if (newData instanceof ST_pointnlink_t.Amp) {
-				ST_pointnlink_t.Amp tmp = (ST_pointnlink_t.Amp) newData;
+			if (newData instanceof ST_pointnlink_t) {
+				ST_pointnlink_t tmp = (ST_pointnlink_t) newData;
 				link = tmp;
 				return link;
 			}
@@ -162,62 +91,10 @@ public class ST_pointnlink_t extends UnsupportedStructAndPtr implements Hardcode
 	}
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public static size_t sizeof(final int nb) {
-		return new UnsupportedSize_t(nb) {
-			@Override
-			public Object malloc() {
-				return new StarArrayOfPtr(new STArray<ST_pointnlink_t>(nb, 0, ST_pointnlink_t.class));
-			}
-
-			@Override
-			public int getInternalNb() {
-				return nb;
-			}
-		};
-	}
-
-	@Override
-	public __struct__ getStruct() {
+	public ST_pointnlink_t getStruct() {
 		return this;
 	}
 
-	class StarStructAdaptor extends UnsupportedStarStruct {
-		private final ST_pointnlink_t me;
-
-		public StarStructAdaptor(ST_pointnlink_t me) {
-			this.me = me;
-		}
-
-		@Override
-		public boolean isSameThan(StarStruct other) {
-			StarStructAdaptor other2 = (StarStructAdaptor) other;
-			return this.me == other2.me;
-		}
-	}
-
-	@Override
-	public StarStruct getInternalData() {
-		return new StarStructAdaptor(this);
-	}
-
-	public static size_t sizeof_starstar_empty(final int nb) {
-		return new UnsupportedSize_t(nb) {
-			@Override
-			public Object malloc() {
-				return STStarArrayOfPointer.malloc(nb);
-			}
-
-			@Override
-			public int getInternalNb() {
-				return nb;
-			}
-		};
-	}
-
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "typedef struct pointnlink_t",
 	// "{",
diff --git a/src/h/ST_polygon_t.java b/src/h/ST_polygon_t.java
index 621fbb3..89cf65d 100644
--- a/src/h/ST_polygon_t.java
+++ b/src/h/ST_polygon_t.java
@@ -46,10 +46,7 @@
 package h;
 
 import smetana.core.HardcodedStruct;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__ptr__;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_polygon_t extends UnsupportedStructAndPtr implements HardcodedStruct {
@@ -61,7 +58,7 @@ public class ST_polygon_t extends UnsupportedStructAndPtr implements HardcodedSt
 	public double distortion;
 	public double skew;
 	public int option;
-	private StarArrayOfPtr vertices;
+	public ST_pointf.Array vertices;
 
 	// "pointf *vertices",
 
@@ -72,51 +69,7 @@ public class ST_polygon_t extends UnsupportedStructAndPtr implements HardcodedSt
 	public ST_polygon_t(StarStruct parent) {
 	}
 
-	public class Amp extends UnsupportedStarStruct {
 
-		@Override
-		public boolean getBoolean(String fieldName) {
-			if (fieldName.equals("regular")) {
-				return regular != 0;
-			}
-			return super.getBoolean(fieldName);
-		}
-
-		@Override
-		public int getInt(String fieldName) {
-			if (fieldName.equals("peripheries")) {
-				return peripheries;
-			}
-			if (fieldName.equals("sides")) {
-				return sides;
-			}
-			return super.getInt(fieldName);
-		}
-
-		@Override
-		public double getDouble(String fieldName) {
-			if (fieldName.equals("orientation")) {
-				return orientation;
-			}
-			if (fieldName.equals("skew")) {
-				return skew;
-			}
-			if (fieldName.equals("distortion")) {
-				return distortion;
-			}
-			return super.getDouble(fieldName);
-		}
-
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			return ST_polygon_t.this.getPtr(fieldName);
-		}
-	}
-
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
 
 	@Override
 	public void setInt(String fieldName, int data) {
@@ -136,20 +89,6 @@ public class ST_polygon_t extends UnsupportedStructAndPtr implements HardcodedSt
 	}
 
 	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("option")) {
-			return option;
-		}
-		if (fieldName.equals("sides")) {
-			return sides;
-		}
-		if (fieldName.equals("peripheries")) {
-			return peripheries;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
 	public void setDouble(String fieldName, double data) {
 		if (fieldName.equals("orientation")) {
 			this.orientation = data;
@@ -166,33 +105,6 @@ public class ST_polygon_t extends UnsupportedStructAndPtr implements HardcodedSt
 		super.setDouble(fieldName, data);
 	}
 
-	private __ptr__ getVertices() {
-		if (vertices == null) {
-			return null;
-		}
-		throw new IllegalStateException();
-	}
-
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("vertices")) {
-			return vertices;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
-	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-		if (fieldName.equals("vertices") && newData == null) {
-			this.vertices = null;
-			return null;
-		}
-		if (fieldName.equals("vertices") && newData instanceof StarArrayOfPtr) {
-			this.vertices = (StarArrayOfPtr) newData;
-			return null;
-		}
-		return super.setPtr(fieldName, newData);
-	}
 
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "typedef struct polygon_t",
diff --git a/src/h/ST_port.java b/src/h/ST_port.java
index 1f84319..36092cf 100644
--- a/src/h/ST_port.java
+++ b/src/h/ST_port.java
@@ -47,7 +47,6 @@ package h;
 
 import smetana.core.CString;
 import smetana.core.HardcodedStruct;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
@@ -58,7 +57,7 @@ public class ST_port extends UnsupportedStructAndPtr implements HardcodedStruct
 
 	public final ST_pointf p = new ST_pointf(this);
 	public double theta;
-	public ST_boxf.Amp bp;
+	public ST_boxf bp;
 	public int defined;
 	public int constrained;
 	public int clip;
@@ -135,14 +134,6 @@ public class ST_port extends UnsupportedStructAndPtr implements HardcodedStruct
 	}
 
 	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("p")) {
-			return p;
-		}
-		return super.getStruct(fieldName);
-	}
-
-	@Override
 	public void setStruct(String fieldName, __struct__ newData) {
 		if (fieldName.equals("p")) {
 			p.copyDataFrom(newData);
@@ -152,26 +143,6 @@ public class ST_port extends UnsupportedStructAndPtr implements HardcodedStruct
 	}
 
 	@Override
-	public boolean getBoolean(String fieldName) {
-		if (fieldName.equals("constrained")) {
-			return constrained != 0;
-		}
-		if (fieldName.equals("dyna")) {
-			return dyna != 0;
-		}
-		return super.getBoolean(fieldName);
-	}
-
-	@Override
-	public void setBoolean(String fieldName, boolean data) {
-		if (fieldName.equals("constrained")) {
-			constrained = data ? 1 : 0;
-			return;
-		}
-		super.setBoolean(fieldName, data);
-	}
-
-	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("constrained")) {
 			constrained = data;
@@ -180,35 +151,6 @@ public class ST_port extends UnsupportedStructAndPtr implements HardcodedStruct
 		super.setInt(fieldName, data);
 	}
 
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("clip")) {
-			return clip;
-		}
-		if (fieldName.equals("order")) {
-			return order;
-		}
-		if (fieldName.equals("side")) {
-			return side;
-		}
-		return super.getInt(fieldName);
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-	}
-
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("bp")) {
-			return bp;
-		}
-		return super.getPtr(fieldName);
-	}
 
 	@Override
 	public void setDouble(String fieldName, double data) {
@@ -219,14 +161,6 @@ public class ST_port extends UnsupportedStructAndPtr implements HardcodedStruct
 		super.setDouble(fieldName, data);
 	}
 
-	@Override
-	public double getDouble(String fieldName) {
-		if (fieldName.equals("theta")) {
-			return theta;
-		}
-		return super.getDouble(fieldName);
-	}
-
 	// "typedef struct port",
 	// "{",
 	// "pointf p",
diff --git a/src/h/ST_rank_t.java b/src/h/ST_rank_t.java
index 13d98e5..1f33609 100644
--- a/src/h/ST_rank_t.java
+++ b/src/h/ST_rank_t.java
@@ -45,15 +45,14 @@
  */
 package h;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import smetana.core.UnsupportedArrayOfPtr;
-import smetana.core.UnsupportedSize_t;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__array_of_ptr__;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
-import smetana.core.size_t;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_rank_t extends UnsupportedStructAndPtr {
@@ -68,184 +67,136 @@ public class ST_rank_t extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	private int n;
+	public int n;
 
 	// "node_t **v",
-	private STStarArrayOfPointer v;
-	private int an;
+	public ST_Agnode_s.ArrayOfStar v;
+	public int an;
 	// "node_t **av",
-	private STStarArrayOfPointer av;
+	public ST_Agnode_s.ArrayOfStar av;
 
-	private double ht1, ht2;
-	private double pht1, pht2;
-	private boolean candidate;
-	private int valid;
+	public double ht1, ht2;
+	public double pht1, pht2;
+	public boolean candidate;
+	public int valid;
 
-	private int cache_nc;
-	private ST_adjmatrix_t flat;
+	public int cache_nc;
+	public ST_adjmatrix_t flat;
 
 	// "}",
 	// "rank_t");
+	
+	
+	public static class Array2 extends UnsupportedArrayOfPtr implements __ptr__, __array_of_ptr__ {
 
-	@Override
-	public void setStruct(__struct__ value) {
-		ST_rank_t this2 = (ST_rank_t) value;
-		this.n = this2.n;
-		this.v = this2.v;
-		this.an = this2.an;
-		this.av = this2.av;
-		this.ht1 = this2.ht1;
-		this.ht2 = this2.ht2;
-		this.pht1 = this2.pht1;
-		this.pht2 = this2.pht2;
-		this.candidate = this2.candidate;
-		this.valid = this2.valid;
-		this.cache_nc = this2.cache_nc;
-		this.flat = this2.flat;
-	}
-
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-		@Override
-		public int getInt(String fieldName) {
-			return ST_rank_t.this.getInt(fieldName);
-		}
-
-		@Override
-		public __array_of_ptr__ getArrayOfPtr(String fieldName) {
-			return ST_rank_t.this.getArrayOfPtr(fieldName);
-		}
+		private final List<ST_rank_t> data;
+		private final int pos;
 
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			return ST_rank_t.this.getPtr(fieldName);
+		public Array2(int size) {
+			this.data = new ArrayList<ST_rank_t>();
+			this.pos = 0;
+			for (int i = 0; i < size; i++) {
+				data.add(new ST_rank_t());
+			}
 		}
-
+		
 		@Override
-		public __struct__ getStruct() {
-			return ST_rank_t.this.getStruct();
+		public void setInt(String fieldName, int data) {
+			getPtr().setInt(fieldName, data);
 		}
-
+		
 		@Override
 		public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-			return ST_rank_t.this.setPtr(fieldName, newData);
+			return getPtr().setPtr(fieldName, newData);
 		}
-
+		
 		@Override
-		public void setBoolean(String fieldName, boolean data) {
-			ST_rank_t.this.setBoolean(fieldName, data);
+		public void setDouble(String fieldName, double data) {
+			getPtr().setDouble(fieldName, data);
 		}
-
-		@Override
-		public boolean getBoolean(String fieldName) {
-			return ST_rank_t.this.getBoolean(fieldName);
+		
+		public ST_rank_t get(int i) {
+			return plus(i).getPtr();
 		}
-
-		@Override
-		public void setInt(String fieldName, int data) {
-			ST_rank_t.this.setInt(fieldName, data);
+		
+		public void swap(int i, int j) {
+			ST_rank_t e1 = data.get(i);
+			ST_rank_t e2 = data.get(j);
+			data.set(i, e2);
+			data.set(j, e1);
 		}
 
-		@Override
-		public double getDouble(String fieldName) {
-			return ST_rank_t.this.getDouble(fieldName);
-		}
-
-		@Override
-		public void setStruct(__struct__ value) {
-			ST_rank_t.this.setStruct(value);
+		public Array2(List<ST_rank_t> data, int pos) {
+			this.data = data;
+			this.pos = pos;
 		}
-
-	}
-
-	@Override
-	public __array_of_ptr__ getArrayOfPtr(String fieldName) {
-		if (fieldName.equals("v")) {
-			return new ArrayOfPtr(v, 0);
+		
+		public Array2 reallocJ(int newsize) {
+			while (data.size() < newsize) {
+				data.add(new ST_rank_t());
+			}
+			return this;
 		}
-		return super.getArrayOfPtr(fieldName);
-	}
-
-	static class ArrayOfPtr extends UnsupportedArrayOfPtr {
-
-		private final int pos;
-		private final STStarArrayOfPointer tab;
 
-		private ArrayOfPtr(STStarArrayOfPointer tab, int pos) {
-			this.pos = pos;
-			this.tab = tab;
+		@Override
+		public Array2 plus(int delta) {
+			return new Array2(data, pos + delta);
 		}
-
+		
 		@Override
-		public __array_of_ptr__ plus(int delta) {
-			return new ArrayOfPtr(tab, pos + delta);
+		public Array2 asPtr() {
+			return this;
 		}
 
 		@Override
 		public void setPtr(__ptr__ value) {
-			tab.plus(pos).setPtr(value);
+//			if (value instanceof Amp) {
+//				value = value.getPtr();
+//			}
+			this.data.set(pos, (ST_rank_t) value);
 		}
-
+		
 		@Override
-		public __ptr__ getPtr() {
-			return tab.plus(pos).getPtr();
+		public ST_rank_t getPtr() {
+			return this.data.get(pos);
 		}
 
 		@Override
-		public __ptr__ asPtr() {
-			if (pos == 0) {
-				return tab;
+		public int comparePointer(__ptr__ other) {
+			final Array2 this2 = (Array2) other;
+			if (this.data != this2.data) {
+				throw new IllegalArgumentException();
 			}
-			return super.asPtr();
+			return this.pos - this2.pos;
 		}
 
-	}
-
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("n")) {
-			return n;
-		}
-		if (fieldName.equals("an")) {
-			return an;
-		}
-		if (fieldName.equals("cache_nc")) {
-			return cache_nc;
+		public boolean isSameThan2(Array2 other) {
+			if (this.data != other.data) {
+				throw new IllegalArgumentException();
+			}
+			return this.pos == other.pos;
 		}
-		return super.getInt(fieldName);
 	}
 
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("v")) {
-			return v;
-		}
-		if (fieldName.equals("av")) {
-			return av;
-		}
-		if (fieldName.equals("flat")) {
-			return flat;
-		}
-		return super.getPtr(fieldName);
-	}
 
 	@Override
-	public void setBoolean(String fieldName, boolean data) {
-		if (fieldName.equals("candidate")) {
-			this.candidate = data;
-			return;
-		}
-		if (fieldName.equals("valid")) {
-			this.valid = data ? 1 : 0;
-			return;
-		}
-		super.setBoolean(fieldName, data);
+	public void setStruct(__struct__ value) {
+		ST_rank_t this2 = (ST_rank_t) value;
+		this.n = this2.n;
+		this.v = this2.v;
+		this.an = this2.an;
+		this.av = this2.av;
+		this.ht1 = this2.ht1;
+		this.ht2 = this2.ht2;
+		this.pht1 = this2.pht1;
+		this.pht2 = this2.pht2;
+		this.candidate = this2.candidate;
+		this.valid = this2.valid;
+		this.cache_nc = this2.cache_nc;
+		this.flat = this2.flat;
 	}
 
+
 	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("n")) {
@@ -268,34 +219,6 @@ public class ST_rank_t extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public boolean getBoolean(String fieldName) {
-		if (fieldName.equals("valid")) {
-			return valid != 0;
-		}
-		if (fieldName.equals("candidate")) {
-			return candidate;
-		}
-		return super.getBoolean(fieldName);
-	}
-
-	@Override
-	public double getDouble(String fieldName) {
-		if (fieldName.equals("pht1")) {
-			return pht1;
-		}
-		if (fieldName.equals("pht2")) {
-			return pht2;
-		}
-		if (fieldName.equals("ht1")) {
-			return ht1;
-		}
-		if (fieldName.equals("ht2")) {
-			return ht2;
-		}
-		return super.getDouble(fieldName);
-	}
-
-	@Override
 	public void setDouble(String fieldName, double data) {
 		if (fieldName.equals("pht1")) {
 			this.pht1 = data;
@@ -324,11 +247,11 @@ public class ST_rank_t extends UnsupportedStructAndPtr {
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("v")) {
-			this.v = (STStarArrayOfPointer) newData;
+			this.v = (ST_Agnode_s.ArrayOfStar) newData;
 			return v;
 		}
 		if (fieldName.equals("av")) {
-			this.av = (STStarArrayOfPointer) newData;
+			this.av = (ST_Agnode_s.ArrayOfStar) newData;
 			return av;
 		}
 		if (fieldName.equals("flat")) {
@@ -338,26 +261,26 @@ public class ST_rank_t extends UnsupportedStructAndPtr {
 		return super.setPtr(fieldName, newData);
 	}
 
-	public static size_t sizeof(final int nb) {
-		return new UnsupportedSize_t(nb) {
-			@Override
-			public Object malloc() {
-				return new StarArrayOfPtr(new STArray<ST_rank_t>(nb, 0, ST_rank_t.class));
-			}
-
-			@Override
-			public int getInternalNb() {
-				return nb;
-			}
-
-			@Override
-			public Object realloc(Object old) {
-				StarArrayOfPtr old2 = (StarArrayOfPtr) old;
-				old2.realloc(nb);
-				return old2;
-			}
-		};
-	}
+//	public static size_t sizeof(final int nb) {
+//		return new UnsupportedSize_t(nb) {
+//			@Override
+//			public Array2 malloc() {
+//				return new Array2(nb);
+//			}
+//
+//			@Override
+//			public int getInternalNb() {
+//				return nb;
+//			}
+//
+//			@Override
+//			public Array2 realloc(Object old) {
+//				Array2 old2 = (Array2) old;
+//				old2.reallocJ(nb);
+//				return old2;
+//			}
+//		};
+//	}
 
 }
 
diff --git a/src/h/ST_refstr_t.java b/src/h/ST_refstr_t.java
index 60b4831..7309653 100644
--- a/src/h/ST_refstr_t.java
+++ b/src/h/ST_refstr_t.java
@@ -47,74 +47,12 @@ package h;
 
 import smetana.core.CString;
 import smetana.core.OFFSET;
-import smetana.core.UnsupportedStarStruct;
-import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__ptr__;
-import smetana.core.amiga.StarStruct;
 
-public class ST_refstr_t extends UnsupportedStructAndPtr /* implements WithParent */{
+public class ST_refstr_t extends ST_dtlink_s /* implements WithParent */{
 
-	public final ST_dtlink_s link = new ST_dtlink_s(this);
 	public int refcnt;
 	public CString s;
 
-	private final StarStruct parent;
-
-	public ST_refstr_t() {
-		this(null);
-	}
-
-	public ST_refstr_t(StarStruct parent) {
-		this.parent = parent;
-	}
-
-	@Override
-	public void setInt(String fieldName, int data) {
-		if (fieldName.equals("refcnt")) {
-			this.refcnt = data;
-			return;
-		}
-		super.setInt(fieldName, data);
-	}
-
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("refcnt")) {
-			return refcnt;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("s")) {
-			return s;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-		@Override
-		public Object addVirtualBytes(int virtualBytes) {
-			if (virtualBytes == 0) {
-				return this;
-			}
-			final OFFSET offset = OFFSET.fromInt(virtualBytes);
-			if (offset.toString().equals("h.refstr_t::s")) {
-				return s;
-			}
-			System.err.println("virtualBytes=" + virtualBytes);
-			System.err.println("offset=" + offset);
-			return super.addVirtualBytes(virtualBytes);
-		}
-
-	}
-
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
 
 	@Override
 	public Object addVirtualBytes(int virtualBytes) {
@@ -122,7 +60,7 @@ public class ST_refstr_t extends UnsupportedStructAndPtr /* implements WithParen
 			return this;
 		}
 		final OFFSET offset = OFFSET.fromInt(virtualBytes);
-		if (offset.toString().equals("h.refstr_t::s")) {
+		if (offset.toString().equals("h.ST_refstr_t::s")) {
 			return s;
 		}
 		System.err.println("virtualBytes=" + virtualBytes);
@@ -130,56 +68,22 @@ public class ST_refstr_t extends UnsupportedStructAndPtr /* implements WithParen
 		return super.addVirtualBytes(virtualBytes);
 	}
 
-	@Override
-	public __ptr__ castTo(Class dest) {
-		// if (dest == refstr_t.class) {
-		// return this;
-		// }
-		if (dest == _dtlink_s.class) {
-			return link;
-		}
-		return super.castTo(dest);
-	}
-
-	@Override
-	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-		if (fieldName.equals("s")) {
-			this.s = (CString) newData;
-			this.s.setMyFather(this);
-			return s;
-		}
-		return super.setPtr(fieldName, newData);
-	}
-
-	@Override
-	public CString getCString(String fieldName) {
-		if (fieldName.equals("s")) {
-			return s;
-		}
-		return super.getCString(fieldName);
+	public void setString(CString newData) {
+		this.s = newData;
+		this.s.setParent(this);
 	}
 
 	public CString to_s(ST_dtlink_s from) {
-		if (from == link) {
+//		if (from == link) {
 			return s;
-		}
-		throw new IllegalArgumentException();
+//		}
+//		throw new IllegalArgumentException();
 	}
 
 	@Override
 	public Class getRealClass() {
-		return refstr_t.class;
+		return ST_refstr_t.class;
 	}
-
-	// public static List<String> DEFINITION = Arrays.asList(
-	// "typedef struct refstr_t",
-	// "{",
-	// "Dtlink_t link",
-	// "unsigned long refcnt",
-	// "char *s",
-	// "char store[1]",
-	// "}",
-	// "refstr_t");
 }
 
 // typedef struct refstr_t {
diff --git a/src/h/ST_shape_desc.java b/src/h/ST_shape_desc.java
index 0c3586b..b4de2df 100644
--- a/src/h/ST_shape_desc.java
+++ b/src/h/ST_shape_desc.java
@@ -61,8 +61,8 @@ public class ST_shape_desc extends UnsupportedStructAndPtr implements HardcodedS
 	}
 
 	public CString name;
-	public ST_shape_functions.Amp fns;
-	public ST_polygon_t.Amp polygon;
+	public ST_shape_functions fns;
+	public ST_polygon_t polygon;
 	public boolean usershape;
 
 	@Override
@@ -72,43 +72,16 @@ public class ST_shape_desc extends UnsupportedStructAndPtr implements HardcodedS
 			return newData;
 		}
 		if (fieldName.equals("fns")) {
-			this.fns = (ST_shape_functions.Amp) newData;
+			this.fns = (ST_shape_functions) newData;
 			return newData;
 		}
 		if (fieldName.equals("polygon")) {
-			this.polygon = (ST_polygon_t.Amp) newData;
+			this.polygon = (ST_polygon_t) newData;
 			return newData;
 		}
 		return super.setPtr(fieldName, newData);
 	}
 
-	@Override
-	public CString getCString(String fieldName) {
-		if (fieldName.equals("name")) {
-			return name;
-		}
-		return super.getCString(fieldName);
-	}
-
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("fns")) {
-			return fns;
-		}
-		if (fieldName.equals("polygon")) {
-			return polygon;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
-	public boolean getBoolean(String fieldName) {
-		if (fieldName.equals("usershape")) {
-			return usershape;
-		}
-		return super.getBoolean(fieldName);
-	}
-
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "typedef struct shape_desc",
 	// "{",
diff --git a/src/h/ST_shape_functions.java b/src/h/ST_shape_functions.java
index 1245685..3efa332 100644
--- a/src/h/ST_shape_functions.java
+++ b/src/h/ST_shape_functions.java
@@ -46,7 +46,6 @@
 package h;
 
 import smetana.core.CFunction;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
@@ -66,47 +65,6 @@ public class ST_shape_functions extends UnsupportedStructAndPtr {
 
 	public ST_shape_functions(StarStruct parent) {
 	}
-	
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			return ST_shape_functions.this.getPtr(fieldName);
-		}
-
-		@Override
-		public Object call(String fieldName, Object... args) {
-			return ((CFunction) getPtr(fieldName)).exe(args);
-		}
-	}
-
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("initfn")) {
-			return initfn;
-		}
-		if (fieldName.equals("freefn")) {
-			return freefn;
-		}
-		if (fieldName.equals("portfn")) {
-			return portfn;
-		}
-		if (fieldName.equals("insidefn")) {
-			return insidefn;
-		}
-		if (fieldName.equals("pboxfn")) {
-			return pboxfn;
-		}
-		if (fieldName.equals("codefn")) {
-			return codefn;
-		}
-		return super.getPtr(fieldName);
-	}
 
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
diff --git a/src/h/ST_splineInfo.java b/src/h/ST_splineInfo.java
index 44db831..4ae18c3 100644
--- a/src/h/ST_splineInfo.java
+++ b/src/h/ST_splineInfo.java
@@ -46,7 +46,6 @@
 package h;
 
 import smetana.core.CFunction;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.amiga.StarStruct;
@@ -66,24 +65,6 @@ public class ST_splineInfo extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-		@Override
-		public boolean getBoolean(String fieldName) {
-			return ST_splineInfo.this.getBoolean(fieldName);
-		}
-
-		@Override
-		public Object call(String fieldName, Object... args) {
-			return ST_splineInfo.this.call(fieldName, args);
-		}
-	}
-
-	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("swapEnds")) {
 			this.swapEnds = (CFunction) newData;
@@ -96,28 +77,6 @@ public class ST_splineInfo extends UnsupportedStructAndPtr {
 		return super.setPtr(fieldName, newData);
 	}
 
-	@Override
-	public Object call(String fieldName, Object... args) {
-		if (fieldName.equals("swapEnds")) {
-			return swapEnds.exe(args);
-		}
-		if (fieldName.equals("splineMerge")) {
-			return splineMerge.exe(args);
-		}
-		return super.call(fieldName, args);
-	}
-
-	@Override
-	public boolean getBoolean(String fieldName) {
-		if (fieldName.equals("ignoreSwap")) {
-			return ignoreSwap;
-		}
-		if (fieldName.equals("isOrtho")) {
-			return isOrtho;
-		}
-		return super.getBoolean(fieldName);
-	}
-
 	// public interface ST_splineInfo extends __ptr__ {
 	// public static List<String> DEFINITION = Arrays.asList(
 	// "typedef struct",
diff --git a/src/h/ST_spline_info_t.java b/src/h/ST_spline_info_t.java
index 05dc735..3e2e221 100644
--- a/src/h/ST_spline_info_t.java
+++ b/src/h/ST_spline_info_t.java
@@ -45,10 +45,7 @@
  */
 package h;
 
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__ptr__;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_spline_info_t extends UnsupportedStructAndPtr {
@@ -63,68 +60,15 @@ public class ST_spline_info_t extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	// public static List<String> DEFINITION = Arrays.asList(
 	// "typedef struct",
 	// "{",
-	private int LeftBound, RightBound, Splinesep, Multisep;
-	private StarArrayOfPtr Rank_box;
+	public int LeftBound, RightBound, Splinesep, Multisep;
+	public ST_boxf Rank_box[];
 
 	// "}",
 	// "spline_info_t");
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-		@Override
-		public int getInt(String fieldName) {
-			return ST_spline_info_t.this.getInt(fieldName);
-		}
-		
-		@Override
-		public __ptr__ getPtr(String fieldName) {
-			return ST_spline_info_t.this.getPtr(fieldName);
-		}
-
-	}
-
-	@Override
-	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-		if (fieldName.equals("Rank_box")) {
-			this.Rank_box = (StarArrayOfPtr) newData;
-			return this.Rank_box;
-		}
-		return super.setPtr(fieldName, newData);
-	}
-
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("Rank_box")) {
-			return this.Rank_box;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("LeftBound")) {
-			return this.LeftBound;
-		}
-		if (fieldName.equals("RightBound")) {
-			return this.RightBound;
-		}
-		if (fieldName.equals("Splinesep")) {
-			return this.Splinesep;
-		}
-		if (fieldName.equals("Multisep")) {
-			return this.Multisep;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("LeftBound")) {
 			this.LeftBound = data;
diff --git a/src/h/ST_splines.java b/src/h/ST_splines.java
index aca80e3..ee93330 100644
--- a/src/h/ST_splines.java
+++ b/src/h/ST_splines.java
@@ -45,11 +45,7 @@
  */
 package h;
 
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__array_of_ptr__;
-import smetana.core.__ptr__;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_splines extends UnsupportedStructAndPtr {
@@ -64,20 +60,11 @@ public class ST_splines extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
-
 	// "typedef struct splines",
 	// "{",
 // 	bezier *list;
-	private StarArrayOfPtr list;
-	private int size;
+	public ST_bezier.Array2 list;
+	public int size;
 
 	// "boxf bb",
 	// "}",
@@ -92,38 +79,6 @@ public class ST_splines extends UnsupportedStructAndPtr {
 		super.setInt(fieldName, data);
 	}
 
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("size")) {
-			return this.size;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
-	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-		if (fieldName.equals("list")) {
-			this.list = (StarArrayOfPtr) newData;
-			return list;
-		}
-		return super.setPtr(fieldName, newData);
-	}
-
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("list")) {
-			return this.list;
-		}
-		return super.getPtr(fieldName);
-	}
-	
-	@Override
-	public __array_of_ptr__ getArrayOfPtr(String fieldName) {
-		if (fieldName.equals("list")) {
-			return this.list.getInternalArray();
-		}
-		return super.getArrayOfPtr(fieldName);
-	}
 }
 
 // typedef struct splines {
diff --git a/src/h/ST_tedge_t.java b/src/h/ST_tedge_t.java
index 09806aa..e646dc7 100644
--- a/src/h/ST_tedge_t.java
+++ b/src/h/ST_tedge_t.java
@@ -45,18 +45,8 @@
  */
 package h;
 
-import h.ST_Agclos_s.ArrayOfThreePtrDict_t;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import smetana.core.UnsupportedArrayOfPtr;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__array_of_ptr__;
 import smetana.core.__ptr__;
-import smetana.core.amiga.Area;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_tedge_t extends UnsupportedStructAndPtr {
@@ -71,45 +61,34 @@ public class ST_tedge_t extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
-
 	// "typedef struct tedge_t",
 	// "{",
-	private __ptr__ pnl0p;
-	private __ptr__ pnl1p;
-	// private ST_pointnlink_t.Amp pnl0p;
-	// private ST_pointnlink_t.Amp pnl1p;
+	public ST_pointnlink_t pnl0p;
+	public ST_pointnlink_t pnl1p;
+
+	public ST_triangle_t.Array lrp;
+	public ST_triangle_t.Array rtp;
 
-	private StarArrayOfPtr ltp;
-	private StarArrayOfPtr rtp;
+	// public StarArrayOfPtr ltp;
+	// public StarArrayOfPtr rtp;
 
 	// "struct triangle_t *ltp",
 	// "struct triangle_t *rtp",
 	// "}",
 	// "tedge_t");
 
+
 	@Override
-	public __ptr__ getPtr(String fieldName) {
+	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("pnl0p")) {
+			this.pnl0p = ((ST_pointnlink_t) newData);
 			return this.pnl0p;
 		}
 		if (fieldName.equals("pnl1p")) {
+			this.pnl1p = ((ST_pointnlink_t) newData);
 			return this.pnl1p;
 		}
-		if (fieldName.equals("ltp")) {
-			return this.ltp;
-		}
-		if (fieldName.equals("rtp")) {
-			return this.rtp;
-		}
-		return super.getPtr(fieldName);
+		return super.setPtr(fieldName, newData);
 	}
 
 	// class Singleton extends UnsupportedArrayOfPtr implements __array_of_ptr__ {
@@ -153,49 +132,6 @@ public class ST_tedge_t extends UnsupportedStructAndPtr {
 	//
 	// }
 
-	@Override
-	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
-		// if (fieldName.equals("pnl0p")) {
-		// this.pnl0p = (ST_pointnlink_t.Amp) newData;
-		// return this.pnl0p;
-		// }
-		if (fieldName.equals("pnl0p")) {
-			if (newData instanceof ST_pointnlink_t.Amp) {
-				this.pnl0p = (ST_pointnlink_t.Amp) newData;
-				// newData = new StarArrayOfPtr(new Singleton((h.ST_pointnlink_t.Amp) newData));
-			} else {
-				this.pnl0p = (StarArrayOfPtr) newData;
-			}
-			return this.pnl0p;
-		}
-		if (fieldName.equals("pnl1p")) {
-			if (newData instanceof ST_pointnlink_t.Amp) {
-				// newData = new StarArrayOfPtr(new Singleton((h.ST_pointnlink_t.Amp) newData));
-				this.pnl1p = (ST_pointnlink_t.Amp) newData;
-			} else {
-				this.pnl1p = (StarArrayOfPtr) newData;
-			}
-			return this.pnl1p;
-		}
-		// if (fieldName.equals("pnl1p")) {
-		// this.pnl1p = (ST_pointnlink_t.Amp) newData;
-		// return this.pnl1p;
-		// }
-		if (fieldName.equals("ltp")) {
-			this.ltp = (StarArrayOfPtr) newData;
-			return this.ltp;
-		}
-		if (fieldName.equals("rtp")) {
-			this.rtp = (StarArrayOfPtr) newData;
-			return this.rtp;
-		}
-		return super.setPtr(fieldName, newData);
-	}
-
-	public String foo(StarArrayOfPtr data) {
-		__array_of_ptr__ array = data.getInternalArray();
-		return array.toString();
-	}
 }
 
 // typedef struct tedge_t {
diff --git a/src/h/ST_textlabel_t.java b/src/h/ST_textlabel_t.java
index ab15a47..069749e 100644
--- a/src/h/ST_textlabel_t.java
+++ b/src/h/ST_textlabel_t.java
@@ -46,7 +46,6 @@
 package h;
 
 import smetana.core.CString;
-import smetana.core.UnsupportedStarStruct;
 import smetana.core.UnsupportedStructAndPtr;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
@@ -64,60 +63,38 @@ public class ST_textlabel_t extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	private CString text, fontname, fontcolor;
-	private int charset;
-	private double fontsize;
+	public CString text, fontname, fontcolor;
+	public int charset;
+	public double fontsize;
 
-	private final ST_pointf dimen = new ST_pointf(this);
-	private final ST_pointf space = new ST_pointf(this);
-	private final ST_pointf pos = new ST_pointf(this);
+	public final ST_pointf dimen = new ST_pointf(this);
+	public final ST_pointf space = new ST_pointf(this);
+	public final ST_pointf pos = new ST_pointf(this);
 
 	// "union",
 	// "{",
 	// "struct",
 	// "{",
 	// private ST_textspan_t span;
-	private __ptr__ span;
-	private int nspans;
+	public ST_textspan_t.Array span;
+	public int nspans;
 
 	// "}",
 	// "txt",
 	// "htmllabel_t *html",
-	private final __ptr__ html = null;
+	public final __ptr__ html__ = null;
 	// "}",
 	// "u",
-	private int valign;
+	public int valign;
 
-	private int set;
+	public int set;
 
+	public boolean html;
 	// "boolean html",
 	// "}",
 	// "textlabel_t");
 
 	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
-
-	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("dimen")) {
-			return dimen;
-		}
-		if (fieldName.equals("space")) {
-			return space;
-		}
-		if (fieldName.equals("pos")) {
-			return pos;
-		}
-		return super.getStruct(fieldName);
-	}
-
-	@Override
 	public void setStruct(String fieldName, __struct__ newData) {
 		if (fieldName.equals("space")) {
 			space.copyDataFrom(newData);
@@ -145,46 +122,13 @@ public class ST_textlabel_t extends UnsupportedStructAndPtr {
 			return fontcolor;
 		}
 		if (fieldName.equals("u.txt.span")) {
-			this.span = newData;
+			this.span = (ST_textspan_t.Array) newData;
 			return span;
 		}
 		return super.setPtr(fieldName, newData);
 	}
 
 	@Override
-	public CString getCString(String fieldName) {
-		if (fieldName.equals("text")) {
-			return text;
-		}
-		return super.getCString(fieldName);
-	}
-
-	@Override
-	public __ptr__ getPtr(String fieldName) {
-		if (fieldName.equals("text")) {
-			return text;
-		}
-		if (fieldName.equals("u.txt.span")) {
-			return span;
-		}
-		if (fieldName.equals("fontname")) {
-			return fontname;
-		}
-		return super.getPtr(fieldName);
-	}
-
-	@Override
-	public boolean getBoolean(String fieldName) {
-		if (fieldName.equals("html")) {
-			return html != null;
-		}
-		if (fieldName.equals("set")) {
-			return set != 0;
-		}
-		return super.getBoolean(fieldName);
-	}
-
-	@Override
 	public void setDouble(String fieldName, double data) {
 		if (fieldName.equals("fontsize")) {
 			this.fontsize = data;
@@ -194,14 +138,6 @@ public class ST_textlabel_t extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public double getDouble(String fieldName) {
-		if (fieldName.equals("fontsize")) {
-			return this.fontsize;
-		}
-		return super.getDouble(fieldName);
-	}
-
-	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("charset")) {
 			this.charset = data;
@@ -215,18 +151,13 @@ public class ST_textlabel_t extends UnsupportedStructAndPtr {
 			this.nspans = data;
 			return;
 		}
-		super.setInt(fieldName, data);
-	}
-
-	@Override
-	public void setBoolean(String fieldName, boolean data) {
 		if (fieldName.equals("set")) {
-			this.set = data ? 1 : 0;
+			this.set = data;
 			return;
 		}
-		super.setBoolean(fieldName, data);
+		super.setInt(fieldName, data);
 	}
-	
+
 	@Override
 	public boolean isSameThan(StarStruct other) {
 		ST_textlabel_t other2 = (ST_textlabel_t) other;
@@ -234,23 +165,6 @@ public class ST_textlabel_t extends UnsupportedStructAndPtr {
 	}
 
 
-	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("charset")) {
-			return this.charset;
-		}
-		if (fieldName.equals("valign")) {
-			return this.valign;
-		}
-		if (fieldName.equals("u.txt.nspans")) {
-			return this.nspans;
-		}
-		if (fieldName.equals("set")) {
-			return this.set;
-		}
-		return super.getInt(fieldName);
-	}
-	
 }
 
 // typedef struct textlabel_t {
diff --git a/src/h/ST_textspan_t.java b/src/h/ST_textspan_t.java
index 1a9c651..dcf4a39 100644
--- a/src/h/ST_textspan_t.java
+++ b/src/h/ST_textspan_t.java
@@ -45,16 +45,19 @@
  */
 package h;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import smetana.core.CString;
-import smetana.core.UnsupportedSize_t;
-import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedArrayOfStruct2;
 import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_ptr__;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
 import smetana.core.size_t;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
+// UNUSED ?
 public class ST_textspan_t extends UnsupportedStructAndPtr {
 
 	private final StarStruct parent;
@@ -67,32 +70,100 @@ public class ST_textspan_t extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	private CString str;
+	public CString str;
 
 	// "textfont_t *font",
 	// "void *layout",
 	// "void (*free_layout) (void *layout)",
 	// "double yoffset_layout, yoffset_centerline",
-	private final ST_pointf size = new ST_pointf(this);
-	private int just;
+	public final ST_pointf size = new ST_pointf(this);
+	public int just;
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
+	public static class Array extends UnsupportedArrayOfStruct2 implements __ptr__, __array_of_ptr__{
 
-	public class Amp extends UnsupportedStarStruct {
+		private final List<ST_textspan_t> data;
+		private final int pos;
+	
+		@Override
+		public __ptr__ setPtr(String fieldName, __ptr__ data) {
+			return getStruct().setPtr(fieldName, data);
+		}
+		
+		@Override
+		public void setInt(String fieldName, int data) {
+			getStruct().setInt(fieldName, data);
+		}
+		
+		@Override
+		public void setStruct(String fieldName, __struct__ data) {
+			getStruct().setStruct(fieldName, data);
+		}
+		
+		@Override
+		public Array asPtr() {
+			return this;
+		}
+		
+		@Override
+		public ST_textspan_t getStruct() {
+			return data.get(pos);
+		}
+		
+		public Array(int size) {
+			this.data = new ArrayList<ST_textspan_t>();
+			this.pos = 0;
+			for (int i = 0; i < size; i++) {
+				data.add(new ST_textspan_t());
+			}
+		}
 
-	}
+		public Array reallocJ(int newsize) {
+			while (data.size() < newsize) {
+				data.add(new ST_textspan_t());
+			}
+			return this;
+		}
+		
+		public Array plus(int delta) {
+			return plusJ(delta);
+		}
 
-	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("size")) {
-			return size;
+		private Array(List<ST_textspan_t> data, int pos) {
+			this.data = data;
+			this.pos = pos;
+		}
+
+		public ST_textspan_t get(int i) {
+			return this.data.get(pos + i);
+		}
+
+		public Array plusJ(int i) {
+			return new Array(data, pos + i);
+		}
+
+		public int minus(Array other) {
+			if (this.data != other.data) {
+				throw new IllegalArgumentException();
+			}
+			return this.pos - other.pos;
 		}
-		return super.getStruct(fieldName);
+
+		public Array move(int delta) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+		public void realloc(size_t nb) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+		public int comparePointerInternal(__array_of_ptr__ other) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+
 	}
 
+
 	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("just")) {
@@ -103,14 +174,6 @@ public class ST_textspan_t extends UnsupportedStructAndPtr {
 	}
 
 	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("just")) {
-			return this.just;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("str")) {
 			this.str = (CString) newData;
@@ -119,27 +182,6 @@ public class ST_textspan_t extends UnsupportedStructAndPtr {
 		return super.setPtr(fieldName, newData);
 	}
 
-	public static size_t sizeof(final int nb) {
-		return new UnsupportedSize_t(nb) {
-			@Override
-			public Object malloc() {
-				return new StarArrayOfPtr(new STArray<ST_textspan_t>(nb, 0, ST_textspan_t.class));
-			}
-
-			@Override
-			public int getInternalNb() {
-				return nb;
-			}
-
-			@Override
-			public Object realloc(Object old) {
-				StarArrayOfPtr old2 = (StarArrayOfPtr) old;
-				old2.realloc(nb);
-				return old2;
-			}
-		};
-	}
-
 }
 
 // typedef struct {
diff --git a/src/h/ST_tna_t.java b/src/h/ST_tna_t.java
index f2c74d8..9d75f9d 100644
--- a/src/h/ST_tna_t.java
+++ b/src/h/ST_tna_t.java
@@ -45,21 +45,15 @@
  */
 package h;
 
-import h.ST_tna_t.Amp;
-import h.ST_triangle_t.ArrayOfThree;
-
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
 
-import smetana.core.UnsupportedArrayOfStruct;
-import smetana.core.UnsupportedSize_t;
-import smetana.core.UnsupportedStarStruct;
+import smetana.core.UnsupportedArrayOfStruct2;
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__array_of_struct__;
+import smetana.core.__array_of_ptr__;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
 import smetana.core.size_t;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_tna_t extends UnsupportedStructAndPtr {
@@ -74,69 +68,85 @@ public class ST_tna_t extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
-
 	// "typedef struct tna_t",
 	// "{",
 	// "Ppoint_t a[2]",
 	// "}",
 	// "tna_t");
-	private double t;
-	private final ST_pointf a[] = new ST_pointf[] { new ST_pointf(), new ST_pointf() };
-
-	class ArrayOfTwo extends UnsupportedArrayOfStruct {
+	public double t;
+	public final ST_pointf a[] = new ST_pointf[] { new ST_pointf(), new ST_pointf() };
+	
+	public static class Array extends UnsupportedArrayOfStruct2 implements __ptr__, __array_of_ptr__{
+
+		private final List<ST_tna_t> data;
+		private final int pos;
+		
+		
+		@Override
+		public Array asPtr() {
+			return this;
+		}
+		
+		@Override
+		public ST_tna_t getStruct() {
+			return data.get(pos);
+		}
+		
+		public Array(int size) {
+			this.data = new ArrayList<ST_tna_t>();
+			this.pos = 0;
+			for (int i = 0; i < size; i++) {
+				data.add(new ST_tna_t());
+			}
+		}
 
-		final private int pos;
+		public Array reallocJ(int newsize) {
+			while (data.size() < newsize) {
+				data.add(new ST_tna_t());
+			}
+			return this;
+		}
+		
+		public Array plus(int delta) {
+			return plusJ(delta);
+		}
 
-		public ArrayOfTwo(int pos) {
+		private Array(List<ST_tna_t> data, int pos) {
+			this.data = data;
 			this.pos = pos;
 		}
 
-		@Override
-		public __array_of_struct__ plus(int delta) {
-			return new ArrayOfTwo(pos + delta);
+		public ST_tna_t get(int i) {
+			return this.data.get(pos + i);
 		}
 
-		@Override
-		public __struct__ getStruct() {
-			return a[pos];
+		public Array plusJ(int i) {
+			return new Array(data, pos + i);
 		}
 
-		@Override
-		public void setStruct(__struct__ value) {
-			a[pos].copyDataFrom(value);
+		public int minus(Array other) {
+			if (this.data != other.data) {
+				throw new IllegalArgumentException();
+			}
+			return this.pos - other.pos;
 		}
 
-		@Override
-		public double getDouble(String fieldName) {
-			return getStruct().getDouble(fieldName);
+		public Array move(int delta) {
+			throw new UnsupportedOperationException(getClass().toString());
 		}
 
-	}
-
-	@Override
-	public __array_of_struct__ getArrayOfStruct(String fieldName) {
-		if (fieldName.equals("a")) {
-			return new ArrayOfTwo(0);
+		public void realloc(size_t nb) {
+			throw new UnsupportedOperationException(getClass().toString());
 		}
-		return super.getArrayOfStruct(fieldName);
-	}
 
-	@Override
-	public double getDouble(String fieldName) {
-		if (fieldName.equals("t")) {
-			return this.t;
+		public int comparePointerInternal(__array_of_ptr__ other) {
+			throw new UnsupportedOperationException(getClass().toString());
 		}
-		return super.getDouble(fieldName);
+
+
 	}
 
+
 	@Override
 	public void setDouble(String fieldName, double data) {
 		if (fieldName.equals("t")) {
@@ -151,27 +161,6 @@ public class ST_tna_t extends UnsupportedStructAndPtr {
 		return this;
 	}
 
-	public static size_t sizeof(final int nb) {
-		return new UnsupportedSize_t(nb) {
-			@Override
-			public Object malloc() {
-				return new StarArrayOfPtr(new STArray<ST_tna_t>(nb, 0, ST_tna_t.class));
-			}
-
-			@Override
-			public int getInternalNb() {
-				return nb;
-			}
-
-			@Override
-			public Object realloc(Object old) {
-				StarArrayOfPtr old2 = (StarArrayOfPtr) old;
-				old2.realloc(nb);
-				return old2;
-			}
-		};
-	}
-
 }
 
 // typedef struct tna_t {
diff --git a/src/h/ST_triangle_t.java b/src/h/ST_triangle_t.java
index b3eb359..248b2a4 100644
--- a/src/h/ST_triangle_t.java
+++ b/src/h/ST_triangle_t.java
@@ -45,15 +45,10 @@
  */
 package h;
 
-import h.ST_pathend_t.ArrayOfTwenty;
-import smetana.core.UnsupportedArrayOfStruct;
-import smetana.core.UnsupportedSize_t;
-import smetana.core.UnsupportedStarStruct;
+import java.util.ArrayList;
+import java.util.List;
+
 import smetana.core.UnsupportedStructAndPtr;
-import smetana.core.__array_of_struct__;
-import smetana.core.__struct__;
-import smetana.core.size_t;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_triangle_t extends UnsupportedStructAndPtr {
@@ -68,64 +63,59 @@ public class ST_triangle_t extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
+	public static class Array {
 
-	}
+		private final List<ST_triangle_t> data;
+		private final int pos;
 
-	// "typedef struct triangle_t",
-	// "{",
-	private int mark;
-
-	private final ST_tedge_t e[] = new ST_tedge_t[] { new ST_tedge_t(), new ST_tedge_t(), new ST_tedge_t() };
-
-	class ArrayOfThree extends UnsupportedArrayOfStruct {
-
-		final private int pos;
+		public Array(int size) {
+			this.data = new ArrayList<ST_triangle_t>();
+			this.pos = 0;
+			for (int i = 0; i < size; i++) {
+				data.add(new ST_triangle_t());
+			}
+		}
 
-		public ArrayOfThree(int pos) {
-			this.pos = pos;
+		public Array reallocJ(int newsize) {
+			while (data.size() < newsize) {
+				data.add(new ST_triangle_t());
+			}
+			return this;
 		}
 
-		@Override
-		public __array_of_struct__ plus(int delta) {
-			return new ArrayOfThree(pos + delta);
+		private Array(List<ST_triangle_t> data, int pos) {
+			this.data = data;
+			this.pos = pos;
 		}
 
-		@Override
-		public __struct__ getStruct() {
-			return e[pos];
+		public ST_triangle_t get(int i) {
+			return this.data.get(pos + i);
 		}
 
-		@Override
-		public void setStruct(__struct__ value) {
-			e[pos].copyDataFrom(value);
+		public Array plusJ(int i) {
+			return new Array(data, pos + i);
 		}
 
-		@Override
-		public double getDouble(String fieldName) {
-			return getStruct().getDouble(fieldName);
+		public int minus(Array other) {
+			if (this.data != other.data) {
+				throw new IllegalArgumentException();
+			}
+			return this.pos - other.pos;
 		}
 
 	}
 
+	// "typedef struct triangle_t",
+	// "{",
+	public int mark;
+
+	public final ST_tedge_t e[] = new ST_tedge_t[] { new ST_tedge_t(), new ST_tedge_t(), new ST_tedge_t() };
+
 	// "struct tedge_t e[3]",
 	// "}",
 	// "triangle_t");
 
 	@Override
-	public int getInt(String fieldName) {
-		if (fieldName.equals("mark")) {
-			return this.mark;
-		}
-		return super.getInt(fieldName);
-	}
-
-	@Override
 	public void setInt(String fieldName, int data) {
 		if (fieldName.equals("mark")) {
 			this.mark = data;
@@ -134,43 +124,6 @@ public class ST_triangle_t extends UnsupportedStructAndPtr {
 		super.setInt(fieldName, data);
 	}
 
-	@Override
-	public boolean getBoolean(String fieldName) {
-		if (fieldName.equals("mark")) {
-			return this.mark != 0;
-		}
-		return super.getBoolean(fieldName);
-	}
-
-	@Override
-	public __array_of_struct__ getArrayOfStruct(String fieldName) {
-		if (fieldName.equals("e")) {
-			return new ArrayOfThree(0);
-		}
-		return super.getArrayOfStruct(fieldName);
-	}
-
-	public static size_t sizeof(final int nb) {
-		return new UnsupportedSize_t(nb) {
-			@Override
-			public Object malloc() {
-				return new StarArrayOfPtr(new STArray<ST_triangle_t>(nb, 0, ST_triangle_t.class));
-			}
-
-			@Override
-			public int getInternalNb() {
-				return nb;
-			}
-
-			@Override
-			public Object realloc(Object old) {
-				StarArrayOfPtr old2 = (StarArrayOfPtr) old;
-				old2.realloc(nb);
-				return old2;
-			}
-		};
-	}
-
 }
 
 // typedef struct triangle_t {
diff --git a/src/h/ST_xlabel_t.java b/src/h/ST_xlabel_t.java
index dbd1b13..ffaee08 100644
--- a/src/h/ST_xlabel_t.java
+++ b/src/h/ST_xlabel_t.java
@@ -45,13 +45,15 @@
  */
 package h;
 
-import smetana.core.UnsupportedSize_t;
-import smetana.core.UnsupportedStarStruct;
+import java.util.ArrayList;
+import java.util.List;
+
+import smetana.core.UnsupportedArrayOfStruct2;
 import smetana.core.UnsupportedStructAndPtr;
+import smetana.core.__array_of_ptr__;
 import smetana.core.__ptr__;
 import smetana.core.__struct__;
 import smetana.core.size_t;
-import smetana.core.amiga.StarArrayOfPtr;
 import smetana.core.amiga.StarStruct;
 
 public class ST_xlabel_t extends UnsupportedStructAndPtr {
@@ -66,27 +68,109 @@ public class ST_xlabel_t extends UnsupportedStructAndPtr {
 		this.parent = parent;
 	}
 
-	@Override
-	public StarStruct amp() {
-		return new Amp();
-	}
-
-	public class Amp extends UnsupportedStarStruct {
-
-	}
-
 	// "typedef struct",
 	// "{",
-	final private ST_pointf sz = new ST_pointf(this);
-	final private ST_pointf pos = new ST_pointf(this);
+	final public ST_pointf sz = new ST_pointf(this);
+	final public ST_pointf pos = new ST_pointf(this);
 
 	// "void *lbl",
-	private ST_textlabel_t lbl;
-	private int set;
+	public ST_textlabel_t lbl;
+	public int set;
 
 	// "unsigned char set",
 	// "}",
 	// "xlabel_t");
+	
+	public static class Array extends UnsupportedArrayOfStruct2 implements __ptr__, __array_of_ptr__{
+
+		private final List<ST_xlabel_t> data;
+		private final int pos_;
+		
+		@Override
+		public void setInt(String fieldName, int data) {
+			get(0).setInt(fieldName, data);
+		}
+		
+		@Override
+		public void setStruct(__struct__ value) {
+			get(0).___(value);
+		}
+		
+		@Override
+		public Array asPtr() {
+			return this;
+		}
+		
+		@Override
+		public void setDouble(String fieldName, double value) {
+			get(0).setDouble(fieldName, value);
+		}
+		
+		@Override
+		public ST_xlabel_t getStruct() {
+			return get(0).getStruct();
+		}
+		
+		@Override
+		public __ptr__ getPtr() {
+			return get(0);
+		}
+
+		public Array(int size) {
+			this.data = new ArrayList<ST_xlabel_t>();
+			this.pos_ = 0;
+			for (int i = 0; i < size; i++) {
+				data.add(new ST_xlabel_t());
+			}
+		}
+
+		public Array reallocJ(int newsize) {
+			while (data.size() < newsize) {
+				data.add(new ST_xlabel_t());
+			}
+			return this;
+		}
+		
+		public Array plus(int delta) {
+			return plusJ(delta);
+		}
+
+		private Array(List<ST_xlabel_t> data, int pos) {
+			this.data = data;
+			this.pos_ = pos;
+		}
+
+		public ST_xlabel_t get(int i) {
+			return this.data.get(pos_ + i);
+		}
+
+		public Array plusJ(int i) {
+			return new Array(data, pos_ + i);
+		}
+
+		public int minus(Array other) {
+			if (this.data != other.data) {
+				throw new IllegalArgumentException();
+			}
+			return this.pos_ - other.pos_;
+		}
+
+		public Array move(int delta) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+
+		public void realloc(size_t nb) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+		public int comparePointerInternal(__array_of_ptr__ other) {
+			throw new UnsupportedOperationException(getClass().toString());
+		}
+
+
+	}
+	
 
 	@Override
 	public void setInt(String fieldName, int data) {
@@ -96,7 +180,7 @@ public class ST_xlabel_t extends UnsupportedStructAndPtr {
 		}
 		super.setInt(fieldName, data);
 	}
-
+	
 	@Override
 	public __ptr__ setPtr(String fieldName, __ptr__ newData) {
 		if (fieldName.equals("lbl")) {
@@ -105,16 +189,10 @@ public class ST_xlabel_t extends UnsupportedStructAndPtr {
 		}
 		return super.setPtr(fieldName, newData);
 	}
-
+	
 	@Override
-	public __struct__ getStruct(String fieldName) {
-		if (fieldName.equals("sz")) {
-			return this.sz;
-		}
-		if (fieldName.equals("pos")) {
-			return this.pos;
-		}
-		return super.getStruct(fieldName);
+	public ST_xlabel_t getStruct() {
+		return this;
 	}
 
 	@Override
@@ -130,26 +208,26 @@ public class ST_xlabel_t extends UnsupportedStructAndPtr {
 		super.setStruct(fieldName, newData);
 	}
 
-	public static size_t sizeof(final int nb) {
-		return new UnsupportedSize_t(nb) {
-			@Override
-			public Object malloc() {
-				return new StarArrayOfPtr(new STArray<ST_xlabel_t>(nb, 0, ST_xlabel_t.class));
-			}
-
-			@Override
-			public int getInternalNb() {
-				return nb;
-			}
-
-			@Override
-			public Object realloc(Object old) {
-				StarArrayOfPtr old2 = (StarArrayOfPtr) old;
-				old2.realloc(nb);
-				return old2;
-			}
-		};
-	}
+//	public static size_t sizeof(final int nb) {
+//		return new UnsupportedSize_t(nb) {
+//			@Override
+//			public Object malloc() {
+//				return new StarArrayOfPtr(new STArray<ST_xlabel_t>(nb, 0, ST_xlabel_t.class));
+//			}
+//
+//			@Override
+//			public int getInternalNb() {
+//				return nb;
+//			}
+//
+//			@Override
+//			public Object realloc(Object old) {
+//				StarArrayOfPtr old2 = (StarArrayOfPtr) old;
+//				old2.realloc(nb);
+//				return old2;
+//			}
+//		};
+//	}
 
 }
 
diff --git a/src/h/SplitQ_t.java b/src/h/SplitQ_t.java
deleted file mode 100644
index 99bd3c3..0000000
--- a/src/h/SplitQ_t.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 5la7qmeq461s77rfwh637x31k
-
-public interface SplitQ_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct split_q_s",
-"{",
-"struct Branch BranchBuf[64 + 1]",
-"struct Rect CoverSplit",
-"unsigned int CoverSplitArea",
-"struct PartitionVars Partitions[1]",
-"}",
-"SplitQ_t");
-}
-
-// typedef struct split_q_s {
-//     struct Branch BranchBuf[64 + 1];
-//     struct Rect CoverSplit;
-//     unsigned int CoverSplitArea;
-//     struct PartitionVars Partitions[1];
-// } SplitQ_t;
\ No newline at end of file
diff --git a/src/h/XLabels_t.java b/src/h/XLabels_t.java
deleted file mode 100644
index 402e117..0000000
--- a/src/h/XLabels_t.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 5g5jopfxwib4iq0tncmxengai
-
-public interface XLabels_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct XLabels_s",
-"{",
-"object_t *objs",
-"int n_objs",
-"xlabel_t *lbls",
-"int n_lbls",
-"label_params_t *params",
-"Dt_t *hdx",
-"RTree_t *spdx",
-"}",
-"XLabels_t");
-}
-
-// typedef struct XLabels_s {
-//     object_t *objs;
-//     int n_objs;
-//     xlabel_t *lbls;
-//     int n_lbls;
-//     label_params_t *params;
-// 
-//     Dt_t *hdx;			// splay tree keyed with hilbert spatial codes
-//     RTree_t *spdx;		// rtree
-// 
-// } XLabels_t;
\ No newline at end of file
diff --git a/src/h/_Node_t___.java b/src/h/_Node_t___.java
deleted file mode 100644
index 388c425..0000000
--- a/src/h/_Node_t___.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 aqoki3wwzhqcy2mpz21vzdona
-
-public interface _Node_t___ extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Node",
-"{",
-"int count",
-"int level",
-"struct Branch branch[64]",
-"}",
-"Node_t");
-}
-
-// typedef struct Node {
-//     int count;
-//     int level;			/* 0 is leaf, others positive */
-//     struct Branch branch[64];
-// } Node_t;
\ No newline at end of file
diff --git a/src/h/_dt_s.java b/src/h/_dt_s.java
deleted file mode 100644
index 12be796..0000000
--- a/src/h/_dt_s.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 926gualwyh744kklf86qw5qsj
-
-public interface _dt_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct _dt_s",
-"{",
-"Dtsearch_f searchf",
-"Dtdisc_t* disc",
-"Dtdata_t* data",
-"Dtmemory_f memoryf",
-"Dtmethod_t* meth",
-"int  type",
-"int  nview",
-"Dt_t*  view",
-"Dt_t*  walk",
-"void*  user",
-"}");
-}
-
-// struct _dt_s
-// {	Dtsearch_f	searchf;/* search function			*/
-// 	Dtdisc_t*	disc;	/* method to manipulate objs		*/
-// 	Dtdata_t*	data;	/* sharable data			*/
-// 	Dtmemory_f	memoryf;/* function to alloc/free memory	*/
-// 	Dtmethod_t*	meth;	/* dictionary method			*/
-// 	int		type;	/* type information			*/
-// 	int		nview;	/* number of parent view dictionaries	*/
-// 	Dt_t*		view;	/* next on viewpath			*/
-// 	Dt_t*		walk;	/* dictionary being walked		*/
-// 	void*		user;	/* for user's usage			*/
-// };
\ No newline at end of file
diff --git a/src/h/_dtdata_s.java b/src/h/_dtdata_s.java
deleted file mode 100644
index 0cb395a..0000000
--- a/src/h/_dtdata_s.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 2ncfjhm10yijctdn20pwnelos
-
-public interface _dtdata_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct _dtdata_s",
-"{",
-"int  type",
-"Dtlink_t* here",
-"union",
-"{",
-"Dtlink_t** _htab",
-"Dtlink_t* _head",
-"}",
-"hh",
-"int  ntab",
-"int  size",
-"int  loop",
-"int  minp",
-"}");
-}
-
-// struct _dtdata_s
-// {	int		type;	/* type of dictionary			*/
-// 	Dtlink_t*	here;	/* finger to last search element	*/
-// 	union
-// 	{ Dtlink_t**	_htab;	/* hash table				*/
-// 	  Dtlink_t*	_head;	/* linked list				*/
-// 	} hh;
-// 	int		ntab;	/* number of hash slots			*/
-// 	int		size;	/* number of objects			*/
-// 	int		loop;	/* number of nested loops		*/
-// 	int		minp;	/* min path before splay, always even	*/
-// 				/* for hash dt, > 0: fixed table size 	*/
-// };
\ No newline at end of file
diff --git a/src/h/_dtdisc_s.java b/src/h/_dtdisc_s.java
deleted file mode 100644
index 3bd7e79..0000000
--- a/src/h/_dtdisc_s.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 7uiwhqnseej0oaqiv35vi47k1
-
-public interface _dtdisc_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct _dtdisc_s",
-"{",
-"int  key",
-"int  size",
-"int  link",
-"Dtmake_f makef",
-"Dtfree_f freef",
-"Dtcompar_f comparf",
-"Dthash_f hashf",
-"Dtmemory_f memoryf",
-"Dtevent_f eventf",
-"}");
-}
-
-// struct _dtdisc_s
-// {	int		key;	/* where the key begins in an object	*/
-// 	int		size;	/* key size and type			*/
-// 	int		link;	/* offset to Dtlink_t field		*/
-// 	Dtmake_f	makef;	/* object constructor			*/
-// 	Dtfree_f	freef;	/* object destructor			*/
-// 	Dtcompar_f	comparf;/* to compare two objects		*/
-// 	Dthash_f	hashf;	/* to compute hash value of an object	*/
-// 	Dtmemory_f	memoryf;/* to allocate/free memory		*/
-// 	Dtevent_f	eventf;	/* to process events			*/
-// };
\ No newline at end of file
diff --git a/src/h/_dthold_s.java b/src/h/_dthold_s.java
deleted file mode 100644
index a33c625..0000000
--- a/src/h/_dthold_s.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 bj5vks4vb3mb95f68v6qwe1q
-
-public interface _dthold_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct _dthold_s",
-"{",
-"Dtlink_t hdr",
-"void*  obj",
-"}");
-}
-
-// struct _dthold_s
-// {	Dtlink_t	hdr;	/* header		*/
-// 	void*		obj;	/* user object		*/
-// };
\ No newline at end of file
diff --git a/src/h/_dtlink_s.java b/src/h/_dtlink_s.java
deleted file mode 100644
index 12dba24..0000000
--- a/src/h/_dtlink_s.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 6b881ar4wz3iwu5spghy0ocnj
-
-public interface _dtlink_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct _dtlink_s",
-"{",
-"Dtlink_t* right",
-"union",
-"{",
-"unsigned int _hash",
-"Dtlink_t* _left",
-"}",
-"hl",
-"}");
-}
-
-// struct _dtlink_s
-// {	Dtlink_t*	right;	/* right child		*/
-// 	union
-// 	{ unsigned int	_hash;	/* hash value		*/
-// 	  Dtlink_t*	_left;	/* left child		*/
-// 	} hl;
-// };
\ No newline at end of file
diff --git a/src/h/_dtmethod_s.java b/src/h/_dtmethod_s.java
deleted file mode 100644
index 2375484..0000000
--- a/src/h/_dtmethod_s.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 4djfx98e5oxk0jjryvk4600wt
-
-public interface _dtmethod_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct _dtmethod_s",
-"{",
-"Dtsearch_f searchf",
-"int  type",
-"}");
-}
-
-// struct _dtmethod_s 
-// {	Dtsearch_f	searchf; /* search function	*/
-// 	int		type;	/* type of operation	*/
-// };
\ No newline at end of file
diff --git a/src/h/aag_buffer_state.java b/src/h/aag_buffer_state.java
deleted file mode 100644
index c869b87..0000000
--- a/src/h/aag_buffer_state.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 e7lgo132acoi1iqay15jxdzl9
-
-public interface aag_buffer_state extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct aag_buffer_state *YY_BUFFER_STATE");
-}
-
-// typedef struct aag_buffer_state *YY_BUFFER_STATE;
\ No newline at end of file
diff --git a/src/h/aag_trans_info.java b/src/h/aag_trans_info.java
deleted file mode 100644
index 5a25dfa..0000000
--- a/src/h/aag_trans_info.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 8hrh4p1c1600bqkq54h8v51u7
-
-public interface aag_trans_info extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct aag_trans_info",
-"{",
-"flex_int32_t aag_verify",
-"flex_int32_t aag_nxt",
-"}");
-}
-
-// struct aag_trans_info
-// 	{
-// 	flex_int32_t aag_verify;
-// 	flex_int32_t aag_nxt;
-// 	};
\ No newline at end of file
diff --git a/src/h/adjmatrix_t.java b/src/h/adjmatrix_t.java
deleted file mode 100644
index 3de4a60..0000000
--- a/src/h/adjmatrix_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 lba1kw4oxusponhglgarjnj1
-
-public interface adjmatrix_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct adjmatrix_t",
-"{",
-"int nrows, ncols",
-"char *data",
-"}",
-"adjmatrix_t");
-}
-
-// typedef struct adjmatrix_t {
-// 	int nrows, ncols;
-// 	char *data;
-//     } adjmatrix_t;
\ No newline at end of file
diff --git a/src/h/agerrlevel_t.java b/src/h/agerrlevel_t.java
deleted file mode 100644
index bbd97c7..0000000
--- a/src/h/agerrlevel_t.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 eplx3pd5fkm68aeae4k6rwmj7
-
-public interface agerrlevel_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef enum",
-"{",
-"AGWARN, AGERR, AGMAX, AGPREV",
-"}",
-"agerrlevel_t");
-}
-
-// typedef enum { AGWARN, AGERR, AGMAX, AGPREV } agerrlevel_t;
\ No newline at end of file
diff --git a/src/h/agobjsearchfn_t.java b/src/h/agobjsearchfn_t.java
deleted file mode 100644
index 9d1170f..0000000
--- a/src/h/agobjsearchfn_t.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 dr9rtwhzssf8aypcenb0z3tfy
-
-public interface agobjsearchfn_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef Agobj_t *(*agobjsearchfn_t) (Agraph_t * g, Agobj_t * obj)");
-}
-
-// typedef Agobj_t *(*agobjsearchfn_t) (Agraph_t * g, Agobj_t * obj);
\ No newline at end of file
diff --git a/src/h/ainfo.java b/src/h/ainfo.java
deleted file mode 100644
index 86d664e..0000000
--- a/src/h/ainfo.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 aqlnras6a8pluk7ulr2jzajlz
-
-public interface ainfo extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"double width, height",
-"int index",
-"}",
-"ainfo");
-}
-
-// typedef struct {
-//     double width, height;
-//     int index;			/* index in original array */
-// } ainfo;
\ No newline at end of file
diff --git a/src/h/arrowdir_t.java b/src/h/arrowdir_t.java
deleted file mode 100644
index 7e174ef..0000000
--- a/src/h/arrowdir_t.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 5ghieyxthirf2pc6x8z6vuj05
-
-public interface arrowdir_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct arrowdir_t",
-"{",
-"char *dir",
-"int sflag",
-"int eflag",
-"}",
-"arrowdir_t");
-}
-
-// typedef struct arrowdir_t {
-//     char *dir;
-//     int sflag;
-//     int eflag;
-// } arrowdir_t;
\ No newline at end of file
diff --git a/src/h/arrowname_t.java b/src/h/arrowname_t.java
deleted file mode 100644
index d9df990..0000000
--- a/src/h/arrowname_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 9xua47nwla43qv3cmy92tx1mr
-
-public interface arrowname_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct arrowname_t",
-"{",
-"char *name",
-"int type",
-"}",
-"arrowname_t");
-}
-
-// typedef struct arrowname_t {
-//     char *name;
-//     int type;
-// } arrowname_t;
\ No newline at end of file
diff --git a/src/h/arrowtype_t.java b/src/h/arrowtype_t.java
deleted file mode 100644
index fa0d511..0000000
--- a/src/h/arrowtype_t.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 cvw01xnbdvcxj00pawmicyx3p
-
-public interface arrowtype_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct arrowtype_t",
-"{",
-"int type",
-"double lenfact",
-"void (*gen) (GVJ_t * job, pointf p, pointf u, double arrowsize, double penwidth, int flag)",
-"}",
-"arrowtype_t");
-}
-
-// typedef struct arrowtype_t {
-//     int type;
-//     double lenfact;		/* ratio of length of this arrow type to standard arrow */
-//     void (*gen) (GVJ_t * job, pointf p, pointf u, double arrowsize, double penwidth, int flag);	/* generator function for type */
-// } arrowtype_t;
\ No newline at end of file
diff --git a/src/h/aspect_t.java b/src/h/aspect_t.java
deleted file mode 100644
index 5eb8d91..0000000
--- a/src/h/aspect_t.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 7ric227rdgzts8ajl8qu4g4r3
-
-public interface aspect_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct aspect_t",
-"{",
-"double targetAR",
-"double combiAR",
-"int prevIterations",
-"int curIterations",
-"int nextIter",
-"int nPasses",
-"int badGraph",
-"}",
-"aspect_t");
-}
-
-// typedef struct aspect_t {
-//     double targetAR;      /* target aspect ratio */
-//     double combiAR;
-//     int prevIterations;   /* no. of iterations in previous pass */
-//     int curIterations;    /* no. of iterations in current pass */
-//     int nextIter;         /* dynamically adjusted no. of iterations */
-//     int nPasses;          /* bound on no. of top-level passes */
-//     int badGraph;         /* hack: set if graph is disconnected or has
-//                            * clusters. If so, turn off aspect */
-// } aspect_t;
\ No newline at end of file
diff --git a/src/h/attrsym_t.java b/src/h/attrsym_t.java
deleted file mode 100644
index 0620b71..0000000
--- a/src/h/attrsym_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 d4orkcxq0xaek87mt94led8jv
-
-public interface attrsym_t extends Agsym_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agsym_s attrsym_t");
-}
-
-// typedef struct Agsym_s attrsym_t;
\ No newline at end of file
diff --git a/src/h/bend.java b/src/h/bend.java
deleted file mode 100644
index 481dc82..0000000
--- a/src/h/bend.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 5vksevapsq3dmbrs630cwnpqp
-
-public interface bend extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef enum",
-"{",
-"B_NODE, B_UP, B_LEFT, B_DOWN, B_RIGHT",
-"}",
-"bend");
-}
-
-// typedef enum {B_NODE, B_UP, B_LEFT, B_DOWN, B_RIGHT} bend;
\ No newline at end of file
diff --git a/src/h/bezier.java b/src/h/bezier.java
deleted file mode 100644
index eff314e..0000000
--- a/src/h/bezier.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 2rm8pcuhkjly1xk9haledn1k9
-
-public interface bezier extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct bezier",
-"{",
-"pointf *list",
-"int size",
-"int sflag, eflag",
-"pointf sp, ep",
-"}",
-"bezier");
-}
-
-// typedef struct bezier {
-// 	pointf *list;
-// 	int size;
-// 	int sflag, eflag;
-// 	pointf sp, ep;
-//     } bezier;
\ No newline at end of file
diff --git a/src/h/blk_t.java b/src/h/blk_t.java
deleted file mode 100644
index fbc6f73..0000000
--- a/src/h/blk_t.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 az8jvz0appwxv09fzo6ia7pw2
-
-public interface blk_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct blk_t",
-"{",
-"Agnode_t **data",
-"Agnode_t **endp",
-"struct blk_t *prev",
-"struct blk_t *next",
-"}",
-"blk_t");
-}
-
-// typedef struct blk_t {
-//     Agnode_t **data;
-//     Agnode_t **endp;
-//     struct blk_t *prev;
-//     struct blk_t *next;
-// } blk_t;
\ No newline at end of file
diff --git a/src/h/block.java b/src/h/block.java
deleted file mode 100644
index bf068be..0000000
--- a/src/h/block.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 aeiesb8xknt6qv58gj7tdny3l
-
-public interface block extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct block",
-"{",
-"Agnode_t *child",
-"block_t *next",
-"Agraph_t *sub_graph",
-"double radius",
-"double rad0",
-"nodelist_t *circle_list",
-"blocklist_t children",
-"double parent_pos",
-"int flags",
-"}");
-}
-
-// struct block {
-// 	Agnode_t *child;	/* if non-null, points to node in parent block */
-// 	block_t *next;		/* sibling block */
-// 	Agraph_t *sub_graph;	/* nodes and edges in this block */
-// 	double radius;		/* radius of block and subblocks */
-// 	double rad0;		/* radius of block */
-// 	nodelist_t *circle_list;	/* ordered list of nodes in block */
-// 	blocklist_t children;	/* child blocks */
-// 	double parent_pos;	/* if block has 1 node, angle to place parent */
-// 	int flags;
-//     };
\ No newline at end of file
diff --git a/src/h/block_t.java b/src/h/block_t.java
deleted file mode 100644
index 24b0269..0000000
--- a/src/h/block_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 9hb5i7kwpg2hbs4jpz9n14is
-
-public interface block_t extends block {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct block block_t");
-}
-
-// typedef struct block block_t;
\ No newline at end of file
diff --git a/src/h/blocklist_t.java b/src/h/blocklist_t.java
deleted file mode 100644
index 22b2554..0000000
--- a/src/h/blocklist_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 4fuyio1lh8xw103g3n4akljx4
-
-public interface blocklist_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"block_t *first",
-"block_t *last",
-"}",
-"blocklist_t");
-}
-
-// typedef struct {
-// 	block_t *first;
-// 	block_t *last;
-//     } blocklist_t;
\ No newline at end of file
diff --git a/src/h/box.java b/src/h/box.java
deleted file mode 100644
index d74d211..0000000
--- a/src/h/box.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 ecciois6ttiu20v5ds6ne801k
-
-public interface box extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"point LL, UR",
-"}",
-"box");
-}
-
-// typedef struct { point LL, UR; } box;
\ No newline at end of file
diff --git a/src/h/boxf.java b/src/h/boxf.java
deleted file mode 100644
index d840303..0000000
--- a/src/h/boxf.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 5ixaxdj4kxutnllqftpefs67r
-
-public interface boxf extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"pointf LL, UR",
-"}",
-"boxf");
-}
-
-// typedef struct { pointf LL, UR; } boxf;
\ No newline at end of file
diff --git a/src/h/bport_t.java b/src/h/bport_t.java
deleted file mode 100644
index 675e36f..0000000
--- a/src/h/bport_t.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 enjd0328nmx4raj6kmm6ktq7y
-
-public interface bport_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct bport_s",
-"{",
-"edge_t *e",
-"node_t *n",
-"double alpha",
-"}",
-"bport_t");
-}
-
-// typedef struct bport_s {
-//     edge_t *e;
-//     node_t *n;
-//     double alpha;
-// } bport_t;
\ No newline at end of file
diff --git a/src/h/bsearch_cmpf.java b/src/h/bsearch_cmpf.java
deleted file mode 100644
index 11d87eb..0000000
--- a/src/h/bsearch_cmpf.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 dw2o83im6nk4bxd64xd6z2z00
-
-public interface bsearch_cmpf extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef int (*bsearch_cmpf) (const void *, const void *)");
-}
-
-// typedef int (*bsearch_cmpf) (const void *, const void *);
\ No newline at end of file
diff --git a/src/h/buff_s.java b/src/h/buff_s.java
deleted file mode 100644
index 98ea374..0000000
--- a/src/h/buff_s.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 f33zs2sbhgsvvrelmw2nq6vt3
-
-public interface buff_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct buff_s",
-"{",
-"int fd",
-"fpos_t pos",
-"char *template",
-"}");
-}
-
-// struct buff_s {
-//     int fd;
-//     fpos_t pos;
-//     char *template;
-// };
\ No newline at end of file
diff --git a/src/h/ccgnodeinfo_t.java b/src/h/ccgnodeinfo_t.java
deleted file mode 100644
index 65fe565..0000000
--- a/src/h/ccgnodeinfo_t.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 e6r3vblqbmjwwqavuqcrl06zb
-
-public interface ccgnodeinfo_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"Agrec_t h",
-"char mark",
-"union",
-"{",
-"Agraph_t* g",
-"Agnode_t* n",
-"void*     v",
-"}",
-"ptr",
-"}",
-"ccgnodeinfo_t");
-}
-
-// typedef struct {
-//     Agrec_t h;
-//     char mark;
-//     union {
-// 	Agraph_t* g;
-// 	Agnode_t* n;
-// 	void*     v;
-//     } ptr;
-// } ccgnodeinfo_t;
\ No newline at end of file
diff --git a/src/h/ccgraphinfo_t.java b/src/h/ccgraphinfo_t.java
deleted file mode 100644
index f9835e1..0000000
--- a/src/h/ccgraphinfo_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 b28r73e4bd3fdpfewruggsvk1
-
-public interface ccgraphinfo_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"Agrec_t h",
-"char cc_subg",
-"}",
-"ccgraphinfo_t");
-}
-
-// typedef struct {
-//     Agrec_t h;
-//     char cc_subg;   /* true iff subgraph corresponds to a component */
-// } ccgraphinfo_t;
\ No newline at end of file
diff --git a/src/h/cdata.java b/src/h/cdata.java
deleted file mode 100644
index e527bc1..0000000
--- a/src/h/cdata.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 39c66ffd2kgahvaaf8e61dspv
-
-public interface cdata extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"union",
-"{",
-"Agraph_t *g",
-"Agnode_t *np",
-"}",
-"orig",
-"int flags",
-"node_t *parent",
-"block_t *block",
-"union",
-"{",
-"struct",
-"{",
-"node_t *next",
-"int val",
-"int low_val",
-"}",
-"bc",
-"node_t *clone",
-"struct",
-"{",
-"node_t *tparent",
-"node_t *first",
-"node_t *second",
-"int fdist",
-"int sdist",
-"}",
-"t",
-"struct",
-"{",
-"int pos",
-"double psi",
-"}",
-"f",
-"}",
-"u",
-"}",
-"cdata");
-}
-
-// typedef struct {
-//     union {			/* Pointer to node/cluster in original graph */
-// 	Agraph_t *g;
-// 	Agnode_t *np;
-//     } orig;
-//     int flags;
-//     node_t *parent;		/* parent in block-cutpoint traversal (1,2,4) */
-//     block_t *block;		/* Block containing node (1,2,3,4) */
-//     union {
-// 	struct {		/* Pass  1 */
-// 	    node_t *next;	/* used for stack */
-// 	    int val;
-// 	    int low_val;
-// 	} bc;
-// 	node_t *clone;		/* Cloned node (3a) */
-// 	struct {		/* Spanning tree and longest path (3b) */
-// 	    node_t *tparent;	/* Parent in tree */
-// 	    node_t *first;	/* Leaf on longest path from node */
-// 	    node_t *second;	/* Leaf on 2nd longest path from node */
-// 	    int fdist;		/* Length of longest path from node */
-// 	    int sdist;		/* Length of 2nd longest path from node */
-// 	} t;
-// 	struct {
-// 	    int pos;		/* Index of node in block circle (3c,4) */
-// 	    double psi;		/* Offset angle of children (4) */
-// 	} f;
-//     } u;
-// } cdata;
\ No newline at end of file
diff --git a/src/h/cell.java b/src/h/cell.java
deleted file mode 100644
index 2e4bd22..0000000
--- a/src/h/cell.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 5st453umnwqp8rukqzc30apk6
-
-public interface cell extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"gridpt p",
-"node_list *nodes",
-"Dtlink_t link",
-"}",
-"cell");
-}
-
-// typedef struct {
-// 	gridpt p;		/* index of cell */
-// 	node_list *nodes;	/* nodes in cell */
-// 	Dtlink_t link;		/* cdt data */
-//     } cell;
\ No newline at end of file
diff --git a/src/h/chanItem.java b/src/h/chanItem.java
deleted file mode 100644
index 45ca41e..0000000
--- a/src/h/chanItem.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 caod2kxpi4xwamq1g7wm3mm6o
-
-public interface chanItem extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"Dtlink_t  link",
-"double    v",
-"Dt_t*     chans",
-"}",
-"chanItem");
-}
-
-// typedef struct {
-//     Dtlink_t  link;
-//     double    v;
-//     Dt_t*     chans;
-// } chanItem;
\ No newline at end of file
diff --git a/src/h/channel.java b/src/h/channel.java
deleted file mode 100644
index 9f96d3d..0000000
--- a/src/h/channel.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 71crbqpwuxwtsnppsp39wccqp
-
-public interface channel extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"Dtlink_t link",
-"paird p",
-"int cnt",
-"segment** seg_list",
-"rawgraph* G",
-"struct cell* cp",
-"}",
-"channel");
-}
-
-// typedef struct {
-//   Dtlink_t link;
-//   paird p;   /* extrema of channel */
-//   int cnt;   /* number of segments */
-//   segment** seg_list; /* array of segment pointers */
-//   rawgraph* G;
-//   struct cell* cp;
-// } channel;
\ No newline at end of file
diff --git a/src/h/cinfo_t.java b/src/h/cinfo_t.java
deleted file mode 100644
index 04d3566..0000000
--- a/src/h/cinfo_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 9i2jwknpgmej0gz38zz670oa
-
-public interface cinfo_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"boxf bb",
-"object_t* objp",
-"}",
-"cinfo_t");
-}
-
-// typedef struct {
-//     boxf bb;
-//     object_t* objp;
-// } cinfo_t;
\ No newline at end of file
diff --git a/src/h/circ_state.java b/src/h/circ_state.java
deleted file mode 100644
index 4680576..0000000
--- a/src/h/circ_state.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 3lnrtud6sukofbfngncbfav33
-
-public interface circ_state extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"blocklist_t bl",
-"int orderCount",
-"int blockCount",
-"attrsym_t *N_artpos",
-"attrsym_t *N_root",
-"char *rootname",
-"double min_dist",
-"}",
-"circ_state");
-}
-
-// typedef struct {
-//     blocklist_t bl;
-//     int orderCount;
-//     int blockCount;
-//     attrsym_t *N_artpos;
-//     attrsym_t *N_root;
-//     char *rootname;
-//     double min_dist;
-// } circ_state;
\ No newline at end of file
diff --git a/src/h/clist_t.java b/src/h/clist_t.java
deleted file mode 100644
index 97e4c4b..0000000
--- a/src/h/clist_t.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 2ibe0en9njq1f3z4y5g2kzaj2
-
-public interface clist_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"graph_t **cl",
-"int sz",
-"int cnt",
-"}",
-"clist_t");
-}
-
-// typedef struct {
-//     graph_t **cl;
-//     int sz;
-//     int cnt;
-// } clist_t;
\ No newline at end of file
diff --git a/src/h/deque_t.java b/src/h/deque_t.java
deleted file mode 100644
index a062686..0000000
--- a/src/h/deque_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 15n6mbjkpo4mjswqo3d30dej6
-
-public interface deque_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct deque_t",
-"{",
-"pointnlink_t **pnlps",
-"int pnlpn, fpnlpi, lpnlpi, apex",
-"}",
-"deque_t");
-}
-
-// typedef struct deque_t {
-//     pointnlink_t **pnlps;
-//     int pnlpn, fpnlpi, lpnlpi, apex;
-// } deque_t;
\ No newline at end of file
diff --git a/src/h/edge_t.java b/src/h/edge_t.java
deleted file mode 100644
index 54f1258..0000000
--- a/src/h/edge_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 1fsfdd86c8isg6ylp15pwknbu
-
-public interface edge_t extends Agedge_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agedge_s edge_t");
-}
-
-// typedef struct Agedge_s edge_t;
\ No newline at end of file
diff --git a/src/h/elist.java b/src/h/elist.java
deleted file mode 100644
index 28aa6a4..0000000
--- a/src/h/elist.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 8lw80si2xjoivlskhxdmff5mu
-
-public interface elist extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct elist",
-"{",
-"edge_t **list",
-"int size",
-"}",
-"elist");
-}
-
-// typedef struct elist {
-// 	edge_t **list;
-// 	int size;
-//     } elist;
\ No newline at end of file
diff --git a/src/h/elist_t.java b/src/h/elist_t.java
deleted file mode 100644
index a7a7989..0000000
--- a/src/h/elist_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 8ya2p1uqesbvs87po5upckzn0
-
-public interface elist_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct elist_t",
-"{",
-"Pedge_t *ep",
-"struct elist_t *next, *prev",
-"}",
-"elist_t");
-}
-
-// typedef struct elist_t {
-//     Pedge_t *ep;
-//     struct elist_t *next, *prev;
-// } elist_t;
\ No newline at end of file
diff --git a/src/h/fail_stack_type.java b/src/h/fail_stack_type.java
deleted file mode 100644
index 423eeda..0000000
--- a/src/h/fail_stack_type.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 el5ktmij22s6d4cvfe81842jd
-
-public interface fail_stack_type extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"fail_stack_elt_t *stack",
-"unsigned size",
-"unsigned avail",
-"}",
-"fail_stack_type");
-}
-
-// typedef struct
-// {
-//     fail_stack_elt_t *stack;
-//     unsigned size;
-//     unsigned avail;                     /* Offset of next open position.  */
-// } fail_stack_type;
\ No newline at end of file
diff --git a/src/h/fdpParms_s.java b/src/h/fdpParms_s.java
deleted file mode 100644
index 26a046a..0000000
--- a/src/h/fdpParms_s.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 f7uv7vj69dm0khl1b380tapm
-
-public interface fdpParms_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct fdpParms_s",
-"{",
-"int useGrid",
-"int useNew",
-"int numIters",
-"int unscaled",
-"double C",
-"double Tfact",
-"double K",
-"double T0",
-"}");
-}
-
-// struct fdpParms_s {
-//         int useGrid;            /* use grid for speed up */
-//         int useNew;             /* encode x-K into attractive force */
-//         int numIters;           /* actual iterations in layout */
-//         int unscaled;           /* % of iterations used in pass 1 */
-//         double C;               /* Repulsion factor in xLayout */
-//         double Tfact;           /* scale temp from default expression */
-//         double K;               /* spring constant; ideal distance */
-//         double T0;              /* initial temperature */
-// };
\ No newline at end of file
diff --git a/src/h/fdpParms_t.java b/src/h/fdpParms_t.java
deleted file mode 100644
index 16f97f3..0000000
--- a/src/h/fdpParms_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 8unwxxsfji1yz0v4p07nrybhu
-
-public interface fdpParms_t extends fdpParms_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct fdpParms_s fdpParms_t");
-}
-
-// typedef struct fdpParms_s fdpParms_t;
\ No newline at end of file
diff --git a/src/h/field_t.java b/src/h/field_t.java
deleted file mode 100644
index e7657a7..0000000
--- a/src/h/field_t.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 5slbuxsxkyuboijzrnorwqjk4
-
-public interface field_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct field_t",
-"{",
-"pointf size",
-"boxf b",
-"int n_flds",
-"textlabel_t *lp",
-"struct field_t **fld",
-"char *id",
-"unsigned char LR",
-"unsigned char sides",
-"}",
-"field_t");
-}
-
-// typedef struct field_t {
-// 	pointf size;		/* its dimension */
-// 	boxf b;			/* its placement in node's coordinates */
-// 	int n_flds;
-// 	textlabel_t *lp;	/* n_flds == 0 */
-// 	struct field_t **fld;	/* n_flds > 0 */
-// 	char *id;		/* user's identifier */
-// 	unsigned char LR;	/* if box list is horizontal (left to right) */
-// 	unsigned char sides;    /* sides of node exposed to field */
-//     } field_t;
\ No newline at end of file
diff --git a/src/h/fill_type.java b/src/h/fill_type.java
deleted file mode 100644
index 3d11854..0000000
--- a/src/h/fill_type.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 7yr1sspvlqw3sgiyhkr854cd
-
-public interface fill_type extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef enum",
-"{",
-"FILL_NONE, FILL_SOLID, FILL_LINEAR, FILL_RADIAL",
-"}",
-"fill_type");
-}
-
-// typedef enum { FILL_NONE, FILL_SOLID, FILL_LINEAR, FILL_RADIAL } fill_type;
\ No newline at end of file
diff --git a/src/h/fitem.java b/src/h/fitem.java
deleted file mode 100644
index 97dd22c..0000000
--- a/src/h/fitem.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 2w2z3tmg7hmxrqko2dt5rsqag
-
-public interface fitem extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"Dtlink_t    link",
-"textspan_t  ti",
-"}",
-"fitem");
-}
-
-// typedef struct {
-//     Dtlink_t    link;
-//     textspan_t  ti;
-// } fitem;
\ No newline at end of file
diff --git a/src/h/flushfn.java b/src/h/flushfn.java
deleted file mode 100644
index a5a1611..0000000
--- a/src/h/flushfn.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 6co8gnhn5xjhq4c6lyebol0jr
-
-public interface flushfn extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef int (*flushfn) (void *chan)");
-}
-
-// typedef int (*flushfn) (void *chan);
\ No newline at end of file
diff --git a/src/h/font_type.java b/src/h/font_type.java
deleted file mode 100644
index 4ddfa1f..0000000
--- a/src/h/font_type.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 2xdqtc3a2c3n08rywh1rm8cjw
-
-public interface font_type extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef enum",
-"{",
-"FONT_REGULAR, FONT_BOLD, FONT_ITALIC",
-"}",
-"font_type");
-}
-
-// typedef enum { FONT_REGULAR, FONT_BOLD, FONT_ITALIC } font_type;
\ No newline at end of file
diff --git a/src/h/fontinfo.java b/src/h/fontinfo.java
deleted file mode 100644
index 8c36531..0000000
--- a/src/h/fontinfo.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 964775l6tcok47z2sykyt451v
-
-public interface fontinfo extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct fontinfo",
-"{",
-"double fontsize",
-"char *fontname",
-"char *fontcolor",
-"}");
-}
-
-// struct fontinfo {
-//     double fontsize;
-//     char *fontname;
-//     char *fontcolor;
-// };
\ No newline at end of file
diff --git a/src/h/format_type.java b/src/h/format_type.java
deleted file mode 100644
index 29b0818..0000000
--- a/src/h/format_type.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 48gvd3f5a7qs6f6eid493tvyl
-
-public interface format_type extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef enum",
-"{",
-"FORMAT_PNG_XDOT, FORMAT_GIF_XDOT, FORMAT_JPEG_XDOT, FORMAT_SVG_XDOT, FORMAT_PS_XDOT,     FORMAT_PNG_DOT,  FORMAT_GIF_DOT,  FORMAT_JPEG_DOT,  FORMAT_SVG_DOT,  FORMAT_PS_DOT,     FORMAT_PNG_MAP,  FORMAT_GIF_MAP,  FORMAT_JPEG_MAP,  FORMAT_SVG_MAP,  FORMAT_PS_MAP,     FORMAT_PNG_SVG,  FORMAT_GIF_SVG,  FORMAT_JPEG_SVG,  FORMAT_SVG_SVG,     FORMAT_PNG_FIG,  FORMAT_GIF_FIG,  FORMAT_JPEG_FIG,     FORMAT_PNG_VRML, FORMAT_GIF_VRML, FORMAT_JPEG_VRML,     FORMAT_PS_PS, FORMAT_PSLIB_PS,      FORMAT_PNG_VML, FORMAT_GIF_VML, FORMAT_JPEG_VML,      FORMAT_GIF_TK,",
-"}",
-"format_type");
-}
-
-// typedef enum {
-//     FORMAT_PNG_XDOT, FORMAT_GIF_XDOT, FORMAT_JPEG_XDOT, FORMAT_SVG_XDOT, FORMAT_PS_XDOT,
-//     FORMAT_PNG_DOT,  FORMAT_GIF_DOT,  FORMAT_JPEG_DOT,  FORMAT_SVG_DOT,  FORMAT_PS_DOT,
-//     FORMAT_PNG_MAP,  FORMAT_GIF_MAP,  FORMAT_JPEG_MAP,  FORMAT_SVG_MAP,  FORMAT_PS_MAP,
-//     FORMAT_PNG_SVG,  FORMAT_GIF_SVG,  FORMAT_JPEG_SVG,  FORMAT_SVG_SVG,
-//     FORMAT_PNG_FIG,  FORMAT_GIF_FIG,  FORMAT_JPEG_FIG,
-//     FORMAT_PNG_VRML, FORMAT_GIF_VRML, FORMAT_JPEG_VRML,
-//     FORMAT_PS_PS, FORMAT_PSLIB_PS, 
-//     FORMAT_PNG_VML, FORMAT_GIF_VML, FORMAT_JPEG_VML, 
-//     FORMAT_GIF_TK,
-// } format_type;
\ No newline at end of file
diff --git a/src/h/freefunc_t.java b/src/h/freefunc_t.java
deleted file mode 100644
index b932d55..0000000
--- a/src/h/freefunc_t.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 e8aa7nh48ajm604b51pz19bub
-
-public interface freefunc_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef void (*freefunc_t)(xdot_op*)");
-}
-
-// typedef void (*freefunc_t)(xdot_op*);
\ No newline at end of file
diff --git a/src/h/fspan.java b/src/h/fspan.java
deleted file mode 100644
index 00dd251..0000000
--- a/src/h/fspan.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 ey73hen3l0l82tzpokzw8heu4
-
-public interface fspan extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"Dtlink_t     link",
-"htextspan_t  lp",
-"}",
-"fspan");
-}
-
-// typedef struct {
-//     Dtlink_t     link;
-//     htextspan_t  lp;
-// } fspan;
\ No newline at end of file
diff --git a/src/h/gdata.java b/src/h/gdata.java
deleted file mode 100644
index 0518e95..0000000
--- a/src/h/gdata.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 2ruxso0qdpjclz5edssp197zm
-
-public interface gdata extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"bport_t *ports",
-"int nports",
-"boxf bb",
-"int flags",
-"int level",
-"graph_t *parent",
-"}",
-"gdata");
-}
-
-// typedef struct {
-//     bport_t *ports;		/* boundary ports. 0-terminated */
-//     int nports;			/* no. of ports */
-//     boxf bb;			/* bounding box of graph */
-//     int flags;
-//     int level;			/* depth in graph hierarchy */
-//     graph_t *parent;		/* smallest containing cluster */
-// 
-//     
-// 
-// } gdata;
\ No newline at end of file
diff --git a/src/h/ginfo.java b/src/h/ginfo.java
deleted file mode 100644
index 3438bfc..0000000
--- a/src/h/ginfo.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 49o2f0vj6o2k7glkg59q1t341
-
-public interface ginfo extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"int perim",
-"point *cells",
-"int nc",
-"int index",
-"}",
-"ginfo");
-}
-
-// typedef struct {
-//     int perim;			/* half size of bounding rectangle perimeter */
-//     point *cells;		/* cells in covering polyomino */
-//     int nc;			/* no. of cells */
-//     int index;			/* index in original array */
-// } ginfo;
\ No newline at end of file
diff --git a/src/h/graph_t.java b/src/h/graph_t.java
deleted file mode 100644
index 34eb207..0000000
--- a/src/h/graph_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 ebapqf0991e4p4fqcr0tva8qa
-
-public interface graph_t extends Agraph_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agraph_s graph_t");
-}
-
-// typedef struct Agraph_s graph_t;
\ No newline at end of file
diff --git a/src/h/gridpt.java b/src/h/gridpt.java
deleted file mode 100644
index 27bf88c..0000000
--- a/src/h/gridpt.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 bh966kf6yzel6b62omfkro2sw
-
-public interface gridpt extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"int i, j",
-"}",
-"gridpt");
-}
-
-// typedef struct {
-// 	int i, j;
-//     } gridpt;
\ No newline at end of file
diff --git a/src/h/gstack_t.java b/src/h/gstack_t.java
deleted file mode 100644
index c40b479..0000000
--- a/src/h/gstack_t.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of PlantUML.
- *
- * PlantUML is free software; you can redistribute it and/or modify it
- * under the terms of the Eclipse Public License.
- * 
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 831302imlb2pb01kdebykh623
-
-public interface gstack_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gstack_s",
-"{",
-"Agraph_t *g",
-"Agraph_t *subg",
-"list_t nodelist,edgelist,attrlist",
-"struct gstack_s *down",
-"}",
-"gstack_t");
-}
-
-// typedef struct gstack_s {
-// 	Agraph_t *g;
-// 	Agraph_t *subg;
-// 	list_t	nodelist,edgelist,attrlist;
-// 	struct gstack_s *down;
-// } gstack_t;
\ No newline at end of file
diff --git a/src/h/gv_argvlist_t.java b/src/h/gv_argvlist_t.java
deleted file mode 100644
index 837e647..0000000
--- a/src/h/gv_argvlist_t.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 ed9gxxtmujpu6gyrtmhxdut42
-
-public interface gv_argvlist_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gv_argvlist_s",
-"{",
-"char **argv",
-"int argc",
-"int alloc",
-"}",
-"gv_argvlist_t");
-}
-
-// typedef struct gv_argvlist_s {
-// 	char **argv;
-// 	int argc;
-// 	int alloc;
-//     } gv_argvlist_t;
\ No newline at end of file
diff --git a/src/h/gvattr_t.java b/src/h/gvattr_t.java
deleted file mode 100644
index b4a0984..0000000
--- a/src/h/gvattr_t.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 2sx3fd85hu0bac6ji75ngovnu
-
-public interface gvattr_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef enum",
-"{",
-"GVATTR_STRING, GVATTR_BOOL, GVATTR_COLOR",
-"}",
-"gvattr_t");
-}
-
-// typedef enum { GVATTR_STRING, GVATTR_BOOL, GVATTR_COLOR } gvattr_t;
\ No newline at end of file
diff --git a/src/h/gvcolor_t.java b/src/h/gvcolor_t.java
deleted file mode 100644
index 187762d..0000000
--- a/src/h/gvcolor_t.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 9xilv9or3ptvy3gupp6t2ql19
-
-public interface gvcolor_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct color_s",
-"{",
-"union",
-"{",
-"double RGBA[4]",
-"double HSVA[4]",
-"unsigned char rgba[4]",
-"unsigned char cmyk[4]",
-"int rrggbbaa[4]",
-"char *string",
-"int index",
-"}",
-"u",
-"color_type_t type",
-"}",
-"gvcolor_t");
-}
-
-// typedef struct color_s {
-//     union {
-// 	double RGBA[4];
-// 	double HSVA[4];
-// 	unsigned char rgba[4];
-// 	unsigned char cmyk[4];
-// 	int rrggbbaa[4];
-// 	char *string;
-// 	int index;
-//     } u;
-//     color_type_t type;
-// } gvcolor_t;
\ No newline at end of file
diff --git a/src/h/gvdevice_callbacks_t.java b/src/h/gvdevice_callbacks_t.java
deleted file mode 100644
index ebae6a8..0000000
--- a/src/h/gvdevice_callbacks_t.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 f3e0bdxm3k2e7dwusmutjfhyg
-
-public interface gvdevice_callbacks_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gvdevice_callbacks_s",
-"{",
-"void (*refresh) (GVJ_t * job)",
-"void (*button_press) (GVJ_t * job, int button, pointf pointer)",
-"void (*button_release) (GVJ_t * job, int button, pointf pointer)",
-"void (*motion) (GVJ_t * job, pointf pointer)",
-"void (*modify) (GVJ_t * job, const char *name, const char *value)",
-"void (*del) (GVJ_t * job)",
-"void (*read) (GVJ_t * job, const char *filename, const char *layout)",
-"void (*layout) (GVJ_t * job, const char *layout)",
-"void (*render) (GVJ_t * job, const char *format, const char *filename)",
-"}",
-"gvdevice_callbacks_t");
-}
-
-// typedef struct gvdevice_callbacks_s {
-// 	void (*refresh) (GVJ_t * job);
-//         void (*button_press) (GVJ_t * job, int button, pointf pointer);
-//         void (*button_release) (GVJ_t * job, int button, pointf pointer);
-//         void (*motion) (GVJ_t * job, pointf pointer);
-//         void (*modify) (GVJ_t * job, const char *name, const char *value);
-//         void (*del) (GVJ_t * job);  /* can't use "delete" 'cos C++ stole it */
-//         void (*read) (GVJ_t * job, const char *filename, const char *layout);
-//         void (*layout) (GVJ_t * job, const char *layout);
-//         void (*render) (GVJ_t * job, const char *format, const char *filename);
-//     } gvdevice_callbacks_t;
\ No newline at end of file
diff --git a/src/h/gvdevice_engine_s.java b/src/h/gvdevice_engine_s.java
deleted file mode 100644
index 5b00bb9..0000000
--- a/src/h/gvdevice_engine_s.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 z4n2hij703yppdzze03zzgi6
-
-public interface gvdevice_engine_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct gvdevice_engine_s",
-"{",
-"void (*initialize) (GVJ_t * firstjob)",
-"void (*format) (GVJ_t * firstjob)",
-"void (*finalize) (GVJ_t * firstjob)",
-"}");
-}
-
-// struct gvdevice_engine_s {
-// 	void (*initialize) (GVJ_t * firstjob);
-// 	void (*format) (GVJ_t * firstjob);
-// 	void (*finalize) (GVJ_t * firstjob);
-//     };
\ No newline at end of file
diff --git a/src/h/gvdevice_engine_t.java b/src/h/gvdevice_engine_t.java
deleted file mode 100644
index 8cee2ea..0000000
--- a/src/h/gvdevice_engine_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 3xl6s6o9sk6ni7l5g3amrl4p3
-
-public interface gvdevice_engine_t extends gvdevice_engine_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gvdevice_engine_s gvdevice_engine_t");
-}
-
-// typedef struct gvdevice_engine_s gvdevice_engine_t;
\ No newline at end of file
diff --git a/src/h/gvdevice_features_t.java b/src/h/gvdevice_features_t.java
deleted file mode 100644
index 0c4ddfe..0000000
--- a/src/h/gvdevice_features_t.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 7mtrzu9286sibihpev6m1kq0d
-
-public interface gvdevice_features_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"int flags",
-"pointf default_margin",
-"pointf default_pagesize",
-"pointf default_dpi",
-"}",
-"gvdevice_features_t");
-}
-
-// typedef struct {
-// 	int flags;
-// 	pointf default_margin;  /* left/right, top/bottom - points */
-// 	pointf default_pagesize;/* default page width, height - points */
-// 	pointf default_dpi;
-//     } gvdevice_features_t;
\ No newline at end of file
diff --git a/src/h/gvevent_key_binding_t.java b/src/h/gvevent_key_binding_t.java
deleted file mode 100644
index bd3a51a..0000000
--- a/src/h/gvevent_key_binding_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 36q7p68bw2kihtosgcli2ebnl
-
-public interface gvevent_key_binding_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gvevent_key_binding_s",
-"{",
-"char *keystring",
-"gvevent_key_callback_t callback",
-"}",
-"gvevent_key_binding_t");
-}
-
-// typedef struct gvevent_key_binding_s {
-// 	char *keystring;
-// 	gvevent_key_callback_t callback;
-//     } gvevent_key_binding_t;
\ No newline at end of file
diff --git a/src/h/gvevent_key_callback_t.java b/src/h/gvevent_key_callback_t.java
deleted file mode 100644
index 362e770..0000000
--- a/src/h/gvevent_key_callback_t.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 8od0u0s38rvhqrafwy4nh1i0
-
-public interface gvevent_key_callback_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef int (*gvevent_key_callback_t) (GVJ_t * job)");
-}
-
-// typedef int (*gvevent_key_callback_t) (GVJ_t * job);
\ No newline at end of file
diff --git a/src/h/gvformatter_engine_t.java b/src/h/gvformatter_engine_t.java
deleted file mode 100644
index 15f4505..0000000
--- a/src/h/gvformatter_engine_t.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.gvformatter_engine_s;
-
-//2 3vj53t416qxwn8efaetlwcvoc
-
-public interface gvformatter_engine_t extends gvformatter_engine_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gvformatter_engine_s gvformatter_engine_t");
-}
-
-// typedef struct gvformatter_engine_s gvformatter_engine_t;
\ No newline at end of file
diff --git a/src/h/gvlayout_engine_s.java b/src/h/gvlayout_engine_s.java
deleted file mode 100644
index 4ca7d42..0000000
--- a/src/h/gvlayout_engine_s.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 aufqatak555umhtr2zwzdxcam
-
-public interface gvlayout_engine_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct gvlayout_engine_s",
-"{",
-"void (*layout) (graph_t * g)",
-"void (*cleanup) (graph_t * g)",
-"}");
-}
-
-// struct gvlayout_engine_s {
-// 	void (*layout) (graph_t * g);
-// 	void (*cleanup) (graph_t * g);
-//     };
\ No newline at end of file
diff --git a/src/h/gvlayout_engine_t.java b/src/h/gvlayout_engine_t.java
deleted file mode 100644
index 88d920c..0000000
--- a/src/h/gvlayout_engine_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 6neg5ydx7okjqcbqz9nndxl88
-
-public interface gvlayout_engine_t extends gvlayout_engine_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gvlayout_engine_s gvlayout_engine_t");
-}
-
-// typedef struct gvlayout_engine_s gvlayout_engine_t;
\ No newline at end of file
diff --git a/src/h/gvlayout_features_t.java b/src/h/gvlayout_features_t.java
deleted file mode 100644
index 111fb91..0000000
--- a/src/h/gvlayout_features_t.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 5ixrh5lzf6cgqakcirp2uozbb
-
-public interface gvlayout_features_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"int flags",
-"}",
-"gvlayout_features_t");
-}
-
-// typedef struct {
-// 	int flags;
-//     } gvlayout_features_t;
\ No newline at end of file
diff --git a/src/h/gvloadimage_engine_s.java b/src/h/gvloadimage_engine_s.java
deleted file mode 100644
index 188f880..0000000
--- a/src/h/gvloadimage_engine_s.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 9857ym486lfba1vbejkz0jesv
-
-public interface gvloadimage_engine_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct gvloadimage_engine_s",
-"{",
-"void (*loadimage) (GVJ_t *job, usershape_t *us, boxf b, boolean filled)",
-"}");
-}
-
-// struct gvloadimage_engine_s {
-// 	void (*loadimage) (GVJ_t *job, usershape_t *us, boxf b, boolean filled);
-//     };
\ No newline at end of file
diff --git a/src/h/gvloadimage_engine_t.java b/src/h/gvloadimage_engine_t.java
deleted file mode 100644
index 5d7db23..0000000
--- a/src/h/gvloadimage_engine_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 2ribkbowigqfs0otd9wwditp5
-
-public interface gvloadimage_engine_t extends gvloadimage_engine_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gvloadimage_engine_s gvloadimage_engine_t");
-}
-
-// typedef struct gvloadimage_engine_s gvloadimage_engine_t;
\ No newline at end of file
diff --git a/src/h/gvplugin_active_device_t.java b/src/h/gvplugin_active_device_t.java
deleted file mode 100644
index aad8f04..0000000
--- a/src/h/gvplugin_active_device_t.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 c5u1u6iz4msxf9y4q5w78w22
-
-public interface gvplugin_active_device_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gvplugin_active_device_s",
-"{",
-"gvdevice_engine_t *engine",
-"int id",
-"gvdevice_features_t *features",
-"const char *type",
-"}",
-"gvplugin_active_device_t");
-}
-
-// typedef struct gvplugin_active_device_s {
-//         gvdevice_engine_t *engine;
-//         int id;
-//         gvdevice_features_t *features;
-//         const char *type;
-//     } gvplugin_active_device_t;
\ No newline at end of file
diff --git a/src/h/gvplugin_active_layout_t.java b/src/h/gvplugin_active_layout_t.java
deleted file mode 100644
index 539c284..0000000
--- a/src/h/gvplugin_active_layout_t.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 13w4wtxe0z0sh446ur163yvhf
-
-public interface gvplugin_active_layout_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gvplugin_active_layout_s",
-"{",
-"gvlayout_engine_t *engine",
-"int id",
-"gvlayout_features_t *features",
-"const char *type",
-"}",
-"gvplugin_active_layout_t");
-}
-
-// typedef struct gvplugin_active_layout_s {
-//         gvlayout_engine_t *engine;
-//         int id;
-//         gvlayout_features_t *features;
-//         const char *type;
-//     } gvplugin_active_layout_t;
\ No newline at end of file
diff --git a/src/h/gvplugin_active_loadimage_t.java b/src/h/gvplugin_active_loadimage_t.java
deleted file mode 100644
index 66bb0d7..0000000
--- a/src/h/gvplugin_active_loadimage_t.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 633mt1gwzq159n5j6n0lzgzam
-
-public interface gvplugin_active_loadimage_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gvplugin_active_loadimage_t",
-"{",
-"gvloadimage_engine_t *engine",
-"int id",
-"const char *type",
-"}",
-"gvplugin_active_loadimage_t");
-}
-
-// typedef struct gvplugin_active_loadimage_t {
-// 	gvloadimage_engine_t *engine;
-// 	int id;
-// 	const char *type;
-//     } gvplugin_active_loadimage_t;
\ No newline at end of file
diff --git a/src/h/gvplugin_active_render_t.java b/src/h/gvplugin_active_render_t.java
deleted file mode 100644
index 2c27766..0000000
--- a/src/h/gvplugin_active_render_t.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 4af9oysh9wk1u0m5wjc60jcr3
-
-public interface gvplugin_active_render_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gvplugin_active_render_s",
-"{",
-"gvrender_engine_t *engine",
-"int id",
-"gvrender_features_t *features",
-"const char *type",
-"}",
-"gvplugin_active_render_t");
-}
-
-// typedef struct gvplugin_active_render_s {
-//         gvrender_engine_t *engine;
-//         int id;
-//         gvrender_features_t *features;
-//         const char *type;
-//     } gvplugin_active_render_t;
\ No newline at end of file
diff --git a/src/h/gvplugin_active_textlayout_t.java b/src/h/gvplugin_active_textlayout_t.java
deleted file mode 100644
index fcc05da..0000000
--- a/src/h/gvplugin_active_textlayout_t.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 4ht0rt62yul08h6v5kje6jk1x
-
-public interface gvplugin_active_textlayout_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gvplugin_active_textlayout_s",
-"{",
-"gvtextlayout_engine_t *engine",
-"int id",
-"char *type",
-"}",
-"gvplugin_active_textlayout_t");
-}
-
-// typedef struct gvplugin_active_textlayout_s {
-//         gvtextlayout_engine_t *engine;
-//         int id;
-//         char *type;
-//     } gvplugin_active_textlayout_t;
\ No newline at end of file
diff --git a/src/h/gvplugin_available_t.java b/src/h/gvplugin_available_t.java
deleted file mode 100644
index 2facbab..0000000
--- a/src/h/gvplugin_available_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 6ct699hskqmknua7dg0fdwvmz
-
-public interface gvplugin_available_t extends gvplugin_available_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gvplugin_available_s gvplugin_available_t");
-}
-
-// typedef struct gvplugin_available_s gvplugin_available_t;
\ No newline at end of file
diff --git a/src/h/gvplugin_installed_t.java b/src/h/gvplugin_installed_t.java
deleted file mode 100644
index a92037f..0000000
--- a/src/h/gvplugin_installed_t.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 dcmpl8ruksxab5p8161qcvxcw
-
-public interface gvplugin_installed_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"int id",
-"const char *type",
-"int quality",
-"void *engine",
-"void *features",
-"}",
-"gvplugin_installed_t");
-}
-
-// typedef struct {
-// 	int id;         /* an id that is only unique within a package 
-// 			of plugins of the same api.
-// 			A renderer-type such as "png" in the cairo package
-// 			has an id that is different from the "ps" type
-// 			in the same package */
-// 	const char *type;	/* a string name, such as "png" or "ps" that
-// 			distinguishes different types withing the same
-// 			 (renderer in this case) */
-// 	int quality;    /* an arbitrary integer used for ordering plugins of
-// 			the same type from different packages */
-// 	void *engine;   /* pointer to the jump table for the plugin */
-// 	void *features; /* pointer to the feature description 
-// 				void* because type varies by api */
-//     } gvplugin_installed_t;
\ No newline at end of file
diff --git a/src/h/gvplugin_package_s.java b/src/h/gvplugin_package_s.java
deleted file mode 100644
index ca9603d..0000000
--- a/src/h/gvplugin_package_s.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 4x42jt53r4w0hua6kytv25z05
-
-public interface gvplugin_package_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct gvplugin_package_s",
-"{",
-"gvplugin_package_t *next",
-"char *path",
-"char *name",
-"}");
-}
-
-// struct gvplugin_package_s {
-//         gvplugin_package_t *next;
-//         char *path;
-//         char *name;
-//     };
\ No newline at end of file
diff --git a/src/h/gvplugin_package_t.java b/src/h/gvplugin_package_t.java
deleted file mode 100644
index e94a721..0000000
--- a/src/h/gvplugin_package_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 4mfo0bv62esvw8qme2tplg7k
-
-public interface gvplugin_package_t extends gvplugin_package_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gvplugin_package_s gvplugin_package_t");
-}
-
-// typedef struct gvplugin_package_s gvplugin_package_t;
\ No newline at end of file
diff --git a/src/h/gvrender_engine_s.java b/src/h/gvrender_engine_s.java
deleted file mode 100644
index 942b5d4..0000000
--- a/src/h/gvrender_engine_s.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 c9lcfmvndhmluehnjakiea1ei
-
-public interface gvrender_engine_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct gvrender_engine_s",
-"{",
-"void (*begin_job) (GVJ_t * job)",
-"void (*end_job) (GVJ_t * job)",
-"void (*begin_graph) (GVJ_t * job)",
-"void (*end_graph) (GVJ_t * job)",
-"void (*begin_layer) (GVJ_t * job, char *layername,         int layerNum, int numLayers)",
-"void (*end_layer) (GVJ_t * job)",
-"void (*begin_page) (GVJ_t * job)",
-"void (*end_page) (GVJ_t * job)",
-"void (*begin_cluster) (GVJ_t * job)",
-"void (*end_cluster) (GVJ_t * job)",
-"void (*begin_nodes) (GVJ_t * job)",
-"void (*end_nodes) (GVJ_t * job)",
-"void (*begin_edges) (GVJ_t * job)",
-"void (*end_edges) (GVJ_t * job)",
-"void (*begin_node) (GVJ_t * job)",
-"void (*end_node) (GVJ_t * job)",
-"void (*begin_edge) (GVJ_t * job)",
-"void (*end_edge) (GVJ_t * job)",
-"void (*begin_anchor) (GVJ_t * job,   char *href, char *tooltip, char *target, char *id)",
-"void (*end_anchor) (GVJ_t * job)",
-"void (*begin_label) (GVJ_t * job, label_type type)",
-"void (*end_label) (GVJ_t * job)",
-"void (*textspan) (GVJ_t * job, pointf p, textspan_t * span)",
-"void (*resolve_color) (GVJ_t * job, gvcolor_t * color)",
-"void (*ellipse) (GVJ_t * job, pointf * A, int filled)",
-"void (*polygon) (GVJ_t * job, pointf * A, int n, int filled)",
-"void (*beziercurve) (GVJ_t * job, pointf * A, int n,         int arrow_at_start, int arrow_at_end, int)",
-"void (*polyline) (GVJ_t * job, pointf * A, int n)",
-"void (*comment) (GVJ_t * job, char *comment)",
-"void (*library_shape) (GVJ_t * job, char *name, pointf * A, int n, int filled)",
-"}");
-}
-
-// struct gvrender_engine_s {
-// 	void (*begin_job) (GVJ_t * job);
-// 	void (*end_job) (GVJ_t * job);
-// 	void (*begin_graph) (GVJ_t * job);
-// 	void (*end_graph) (GVJ_t * job);
-// 	void (*begin_layer) (GVJ_t * job, char *layername,
-// 			     int layerNum, int numLayers);
-// 	void (*end_layer) (GVJ_t * job);
-// 	void (*begin_page) (GVJ_t * job);
-// 	void (*end_page) (GVJ_t * job);
-// 	void (*begin_cluster) (GVJ_t * job);
-// 	void (*end_cluster) (GVJ_t * job);
-// 	void (*begin_nodes) (GVJ_t * job);
-// 	void (*end_nodes) (GVJ_t * job);
-// 	void (*begin_edges) (GVJ_t * job);
-// 	void (*end_edges) (GVJ_t * job);
-// 	void (*begin_node) (GVJ_t * job);
-// 	void (*end_node) (GVJ_t * job);
-// 	void (*begin_edge) (GVJ_t * job);
-// 	void (*end_edge) (GVJ_t * job);
-// 	void (*begin_anchor) (GVJ_t * job,
-// 		char *href, char *tooltip, char *target, char *id);
-// 	void (*end_anchor) (GVJ_t * job);
-// 	void (*begin_label) (GVJ_t * job, label_type type);
-// 	void (*end_label) (GVJ_t * job);
-// 	void (*textspan) (GVJ_t * job, pointf p, textspan_t * span);
-// 	void (*resolve_color) (GVJ_t * job, gvcolor_t * color);
-// 	void (*ellipse) (GVJ_t * job, pointf * A, int filled);
-// 	void (*polygon) (GVJ_t * job, pointf * A, int n, int filled);
-// 	void (*beziercurve) (GVJ_t * job, pointf * A, int n,
-// 			     int arrow_at_start, int arrow_at_end, int);
-// 	void (*polyline) (GVJ_t * job, pointf * A, int n);
-// 	void (*comment) (GVJ_t * job, char *comment);
-// 	void (*library_shape) (GVJ_t * job, char *name, pointf * A, int n, int filled);
-//     };
\ No newline at end of file
diff --git a/src/h/gvrender_engine_t.java b/src/h/gvrender_engine_t.java
deleted file mode 100644
index c9440fd..0000000
--- a/src/h/gvrender_engine_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 5bxr6kqlo53bavjt2xfhgd4p8
-
-public interface gvrender_engine_t extends gvrender_engine_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gvrender_engine_s gvrender_engine_t");
-}
-
-// typedef struct gvrender_engine_s gvrender_engine_t;
\ No newline at end of file
diff --git a/src/h/gvrender_features_t.java b/src/h/gvrender_features_t.java
deleted file mode 100644
index 940bf2c..0000000
--- a/src/h/gvrender_features_t.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 b5pxs48fv8n5ovo8dntg7yyiw
-
-public interface gvrender_features_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"int flags",
-"double default_pad",
-"char **knowncolors",
-"int sz_knowncolors",
-"color_type_t color_type",
-"}",
-"gvrender_features_t");
-}
-
-// typedef struct {
-// 	int flags;
-// 	double default_pad;	/* graph units */
-// 	char **knowncolors;
-// 	int sz_knowncolors;
-// 	color_type_t color_type;
-//     } gvrender_features_t;
\ No newline at end of file
diff --git a/src/h/gvtextlayout_engine_s.java b/src/h/gvtextlayout_engine_s.java
deleted file mode 100644
index d742d44..0000000
--- a/src/h/gvtextlayout_engine_s.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 btpkmksp5qljd7s3c2whxtupr
-
-public interface gvtextlayout_engine_s extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct gvtextlayout_engine_s",
-"{",
-"boolean (*textlayout) (textspan_t *span, char** fontpath)",
-"}");
-}
-
-// struct gvtextlayout_engine_s {
-// 	boolean (*textlayout) (textspan_t *span, char** fontpath);
-//     };
\ No newline at end of file
diff --git a/src/h/gvtextlayout_engine_t.java b/src/h/gvtextlayout_engine_t.java
deleted file mode 100644
index 2446c93..0000000
--- a/src/h/gvtextlayout_engine_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 6ftez1uvnskvljccs3z0sfspf
-
-public interface gvtextlayout_engine_t extends gvtextlayout_engine_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct gvtextlayout_engine_s gvtextlayout_engine_t");
-}
-
-// typedef struct gvtextlayout_engine_s gvtextlayout_engine_t;
\ No newline at end of file
diff --git a/src/h/hsvrgbacolor_t.java b/src/h/hsvrgbacolor_t.java
deleted file mode 100644
index da3b21d..0000000
--- a/src/h/hsvrgbacolor_t.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 a81kzkq5n7k0bft1xpxzn8sof
-
-public interface hsvrgbacolor_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct hsvrgbacolor_t",
-"{",
-"char *name",
-"unsigned char h, s, v",
-"unsigned char r, g, b, a",
-"}",
-"hsvrgbacolor_t");
-}
-
-// typedef struct hsvrgbacolor_t {
-//     char *name;
-//     unsigned char h, s, v;
-//     unsigned char r, g, b, a;
-// } hsvrgbacolor_t;
\ No newline at end of file
diff --git a/src/h/htextspan_t.java b/src/h/htextspan_t.java
deleted file mode 100644
index feffed0..0000000
--- a/src/h/htextspan_t.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 73dlf2ef4p53l8j1jla74ryhq
-
-public interface htextspan_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"textspan_t *items",
-"short nitems",
-"char just",
-"double size",
-"double lfsize",
-"}",
-"htextspan_t");
-}
-
-// typedef struct {
-// 	textspan_t *items;
-// 	short nitems;
-// 	char just;
-// 	double size;   /* width of span */
-// 	double lfsize; /* offset from previous baseline to current one */
-//     } htextspan_t;
\ No newline at end of file
diff --git a/src/h/htmlcell_t.java b/src/h/htmlcell_t.java
deleted file mode 100644
index 9fe62f8..0000000
--- a/src/h/htmlcell_t.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 c3fdy8b5qt90u4c5ss75lcguu
-
-public interface htmlcell_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct htmlcell_t htmlcell_t");
-}
-
-// typedef struct htmlcell_t htmlcell_t;
\ No newline at end of file
diff --git a/src/h/htmldata_t.java b/src/h/htmldata_t.java
deleted file mode 100644
index 6673fad..0000000
--- a/src/h/htmldata_t.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 3ndpf3koymkortrl6lwwvih5k
-
-public interface htmldata_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"char *href",
-"char *port",
-"char *target",
-"char *title",
-"char *id",
-"char *bgcolor",
-"char *pencolor",
-"int gradientangle",
-"signed char space",
-"unsigned char border",
-"unsigned char pad",
-"unsigned char sides",
-"unsigned short flags",
-"unsigned short width",
-"unsigned short height",
-"unsigned short style",
-"boxf box",
-"}",
-"htmldata_t");
-}
-
-// typedef struct {
-// 	char *href;		/* pointer to an external resource */
-// 	char *port;
-// 	char *target;
-// 	char *title;
-// 	char *id;
-// 	char *bgcolor;
-// 	char *pencolor;
-// 	int gradientangle;
-// 	signed char space;
-// 	unsigned char border;
-// 	unsigned char pad;
-// 	unsigned char sides;    /* set of sides exposed to field */
-// 	unsigned short flags;
-// 	unsigned short width;
-// 	unsigned short height;
-// 	unsigned short style;
-// 	boxf box;		/* its geometric placement in points */
-//     } htmldata_t;
\ No newline at end of file
diff --git a/src/h/htmlenv_t.java b/src/h/htmlenv_t.java
deleted file mode 100644
index 3bbfa1e..0000000
--- a/src/h/htmlenv_t.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 c1g03t0hv8uptocwfcdelqwqa
-
-public interface htmlenv_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"pointf pos",
-"textfont_t finfo",
-"void *obj",
-"graph_t *g",
-"char *imgscale",
-"char *objid",
-"boolean objid_set",
-"}",
-"htmlenv_t");
-}
-
-// typedef struct {
-//         pointf pos;
-//         textfont_t finfo;
-//         void *obj;
-//         graph_t *g;
-//         char *imgscale;
-//         char *objid;
-//         boolean objid_set;
-//     } htmlenv_t;
\ No newline at end of file
diff --git a/src/h/htmlimg_t.java b/src/h/htmlimg_t.java
deleted file mode 100644
index d3f3bc9..0000000
--- a/src/h/htmlimg_t.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 2qx8kiwbmyh61vxkplyhzp0i7
-
-public interface htmlimg_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"boxf box",
-"char *src",
-"char *scale",
-"}",
-"htmlimg_t");
-}
-
-// typedef struct {
-// 	boxf box;
-// 	char *src;
-// 	char *scale;
-//     } htmlimg_t;
\ No newline at end of file
diff --git a/src/h/htmlmap_data_t.java b/src/h/htmlmap_data_t.java
deleted file mode 100644
index 833c10c..0000000
--- a/src/h/htmlmap_data_t.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 d20oliwp4ordsbln3u0w8ovgu
-
-public interface htmlmap_data_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"char *url",
-"char *tooltip",
-"char *target",
-"char *id",
-"boolean explicit_tooltip",
-"point LL",
-"point UR",
-"}",
-"htmlmap_data_t");
-}
-
-// typedef struct {
-//     char *url;
-//     char *tooltip;
-//     char *target;
-//     char *id;
-//     boolean explicit_tooltip;
-//     point LL;
-//     point UR;
-// } htmlmap_data_t;
\ No newline at end of file
diff --git a/src/h/htmltbl_t.java b/src/h/htmltbl_t.java
deleted file mode 100644
index cf966a8..0000000
--- a/src/h/htmltbl_t.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 4l8qax3cpj0f9m5mv6n7ijuw3
-
-public interface htmltbl_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct htmltbl_t htmltbl_t");
-}
-
-// typedef struct htmltbl_t htmltbl_t;
\ No newline at end of file
diff --git a/src/h/htmltxt_t.java b/src/h/htmltxt_t.java
deleted file mode 100644
index 61541b7..0000000
--- a/src/h/htmltxt_t.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 9d3jp17twvv6zmypz9ry6ulqm
-
-public interface htmltxt_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"htextspan_t *spans",
-"short nspans",
-"char simple",
-"boxf box",
-"}",
-"htmltxt_t");
-}
-
-// typedef struct {
-// 	htextspan_t *spans;
-// 	short nspans;
-// 	char simple;
-// 	boxf box;
-//     } htmltxt_t;
\ No newline at end of file
diff --git a/src/h/inside_t.java b/src/h/inside_t.java
deleted file mode 100644
index 92dda84..0000000
--- a/src/h/inside_t.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 1ntxl46xf9k1rah2wosqhcdno
-
-public interface inside_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef union inside_t",
-"{",
-"struct",
-"{",
-"pointf* p",
-"double* r",
-"}",
-"a",
-"struct",
-"{",
-"node_t* n",
-"boxf*    bp",
-"}",
-"s",
-"}",
-"inside_t");
-}
-
-// typedef union inside_t {
-// 	struct {
-// 	    pointf* p;
-// 	    double* r;
-// 	} a;
-// 	struct {
-// 	    node_t* n;
-// 	    boxf*    bp;
-// 	} s;
-//     } inside_t;
\ No newline at end of file
diff --git a/src/h/label_params_t.java b/src/h/label_params_t.java
deleted file mode 100644
index b93607e..0000000
--- a/src/h/label_params_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 hnxz1757w4pts48w055n1a2r
-
-public interface label_params_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"boxf bb",
-"unsigned char force",
-"}",
-"label_params_t");
-}
-
-// typedef struct {
-//     boxf bb;			/* Bounding box of all objects */
-//     unsigned char force;	/* If true, all labels must be placed */
-// } label_params_t;
\ No newline at end of file
diff --git a/src/h/nlist_t.java b/src/h/nlist_t.java
deleted file mode 100644
index 7381f01..0000000
--- a/src/h/nlist_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 21yt3x3ukjw41rbx7gc4w7ebj
-
-public interface nlist_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct nlist_t",
-"{",
-"node_t **list",
-"int size",
-"}",
-"nlist_t");
-}
-
-// typedef struct nlist_t {
-// 	node_t **list;
-// 	int size;
-//     } nlist_t;
\ No newline at end of file
diff --git a/src/h/node_list.java b/src/h/node_list.java
deleted file mode 100644
index dde8460..0000000
--- a/src/h/node_list.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 vma2gttg3cuyksw8xvwfgf30
-
-public interface node_list extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct _node_list",
-"{",
-"Agnode_t *node",
-"struct _node_list *next",
-"}",
-"node_list");
-}
-
-// typedef struct _node_list {
-// 	Agnode_t *node;
-// 	struct _node_list *next;
-//     } node_list;
\ No newline at end of file
diff --git a/src/h/node_t.java b/src/h/node_t.java
deleted file mode 100644
index 7563cdb..0000000
--- a/src/h/node_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 9eay2w1ulq4b60xf1edcfkkmi
-
-public interface node_t extends Agnode_s {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct Agnode_s node_t");
-}
-
-// typedef struct Agnode_s node_t;
\ No newline at end of file
diff --git a/src/h/nodequeue.java b/src/h/nodequeue.java
deleted file mode 100644
index 4faaf32..0000000
--- a/src/h/nodequeue.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 aevkl4zsbstj3pc33rpzrocul
-
-public interface nodequeue extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct nodequeue",
-"{",
-"node_t **store, **limit, **head, **tail",
-"}",
-"nodequeue");
-}
-
-// typedef struct nodequeue {
-// 	node_t **store, **limit, **head, **tail;
-//     } nodequeue;
\ No newline at end of file
diff --git a/src/h/object_t.java b/src/h/object_t.java
deleted file mode 100644
index 159193b..0000000
--- a/src/h/object_t.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 3ll53gc239t205eaimof9u6ah
-
-public interface object_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"pointf pos",
-"pointf sz",
-"xlabel_t *lbl",
-"}",
-"object_t");
-}
-
-// typedef struct {
-//     pointf pos;			/* Position of lower-left corner of object */
-//     pointf sz;			/* Size of object; may be zero for a point */
-//     xlabel_t *lbl;		/* Label attached to object, or NULL */
-// } object_t;
\ No newline at end of file
diff --git a/src/h/pack_info.java b/src/h/pack_info.java
deleted file mode 100644
index 1ccbcca..0000000
--- a/src/h/pack_info.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 95stwmwomxnw1qea4q6lmeekb
-
-public interface pack_info extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"float aspect",
-"int sz",
-"unsigned int margin",
-"int doSplines",
-"pack_mode mode",
-"boolean *fixed",
-"packval_t* vals",
-"int flags",
-"}",
-"pack_info");
-}
-
-// typedef struct {
-// 	float aspect;		/* desired aspect ratio */
-// 	int sz;			/* row/column size size */
-// 	unsigned int margin;	/* margin left around objects, in points */
-// 	int doSplines;		/* use splines in constructing graph shape */
-// 	pack_mode mode;		/* granularity and method */
-// 	boolean *fixed;		/* fixed[i] == true implies g[i] should not be moved */
-// 	packval_t* vals;	/* for arrays, sort numbers */
-// 	int flags;       
-//     } pack_info;
\ No newline at end of file
diff --git a/src/h/path.java b/src/h/path.java
deleted file mode 100644
index 9ec4500..0000000
--- a/src/h/path.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 ccnx75vstszprxk6fxhq89rpu
-
-public interface path extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct path",
-"{",
-"port start, end",
-"int nbox",
-"boxf *boxes",
-"void *data",
-"}",
-"path");
-}
-
-// typedef struct path {	/* internal specification for an edge spline */
-// 	port start, end;
-// 	int nbox;		/* number of subdivisions */
-// 	boxf *boxes;		/* rectangular regions of subdivision */
-// 	void *data;
-//     } path;
\ No newline at end of file
diff --git a/src/h/pathend_t.java b/src/h/pathend_t.java
deleted file mode 100644
index bcc5eb1..0000000
--- a/src/h/pathend_t.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 42vd8ru4xms0dzzipvkxpb5xt
-
-public interface pathend_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct pathend_t",
-"{",
-"boxf nb",
-"pointf np",
-"int sidemask",
-"int boxn",
-"boxf boxes[20]",
-"}",
-"pathend_t");
-}
-
-// typedef struct pathend_t {
-// 	boxf nb;			/* the node box */
-// 	pointf np;		/* node port */
-// 	int sidemask;
-// 	int boxn;
-// 	boxf boxes[20];
-//     } pathend_t;
\ No newline at end of file
diff --git a/src/h/point.java b/src/h/point.java
deleted file mode 100644
index 8f6c3f8..0000000
--- a/src/h/point.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 axpj7c8u90q3k5tbk9sy03qy6
-
-public interface point extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"int x, y",
-"}",
-"point");
-}
-
-// typedef struct { int x, y; } point;
\ No newline at end of file
diff --git a/src/h/pointf.java b/src/h/pointf.java
deleted file mode 100644
index 02c8beb..0000000
--- a/src/h/pointf.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 c2dqy43vdg0rr841peh6gqytj
-
-public interface pointf extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct pointf_s",
-"{",
-"double x, y",
-"}",
-"pointf");
-}
-
-// typedef struct pointf_s { double x, y; } pointf;
\ No newline at end of file
diff --git a/src/h/pointnlink_t.java b/src/h/pointnlink_t.java
deleted file mode 100644
index e01096e..0000000
--- a/src/h/pointnlink_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 3pqj1ldfe9xn0d28j7xc7apm0
-
-public interface pointnlink_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct pointnlink_t",
-"{",
-"Ppoint_t *pp",
-"struct pointnlink_t *link",
-"}",
-"pointnlink_t");
-}
-
-// typedef struct pointnlink_t {
-//     Ppoint_t *pp;
-//     struct pointnlink_t *link;
-// } pointnlink_t;
\ No newline at end of file
diff --git a/src/h/port.java b/src/h/port.java
deleted file mode 100644
index daacea6..0000000
--- a/src/h/port.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 71w78cxaan0929s365t8kncr6
-
-public interface port extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct port",
-"{",
-"pointf p",
-"double theta",
-"boxf *bp",
-"boolean defined",
-"boolean constrained",
-"boolean clip",
-"boolean dyna",
-"unsigned char order",
-"unsigned char side",
-"char *name",
-"}",
-"port");
-}
-
-// typedef struct port {	/* internal edge endpoint specification */
-// 	pointf p;		/* aiming point relative to node center */
-// 	double theta;		/* slope in radians */
-// 	boxf *bp;		/* if not null, points to bbox of 
-// 				 * rectangular area that is port target
-// 				 */
-// 	boolean	defined;        /* if true, edge has port info at this end */
-// 	boolean	constrained;    /* if true, constraints such as theta are set */
-// 	boolean clip;           /* if true, clip end to node/port shape */
-// 	boolean dyna;           /* if true, assign compass point dynamically */
-// 	unsigned char order;	/* for mincross */
-// 	unsigned char side;	/* if port is on perimeter of node, this
-//                                  * contains the bitwise OR of the sides (TOP,
-//                                  * BOTTOM, etc.) it is on. 
-//                                  */
-// 	char *name;		/* port name, if it was explicitly given, otherwise NULL */
-//     } port;
\ No newline at end of file
diff --git a/src/h/rawgraph.java b/src/h/rawgraph.java
deleted file mode 100644
index 37c5dc9..0000000
--- a/src/h/rawgraph.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 3gcy12n7txwt4m8zgbj4peo1e
-
-public interface rawgraph extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"int nvs",
-"vertex* vertices",
-"}",
-"rawgraph");
-}
-
-// typedef struct {
-//   int nvs;
-//   vertex* vertices;
-// } rawgraph;
\ No newline at end of file
diff --git a/src/h/rdr_t.java b/src/h/rdr_t.java
deleted file mode 100644
index 295808a..0000000
--- a/src/h/rdr_t.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 8ps8r8mtrw6f5dhflc33s2dtg
-
-public interface rdr_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"const char *data",
-"int len",
-"int cur",
-"}",
-"rdr_t");
-}
-
-// typedef struct {
-//     const char *data;
-//     int len;
-//     int cur;
-// } rdr_t;
\ No newline at end of file
diff --git a/src/h/re_opcode_t.java b/src/h/re_opcode_t.java
deleted file mode 100644
index 8a64977..0000000
--- a/src/h/re_opcode_t.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 e3hfh80mtu75t9spasjqrsdrh
-
-public interface re_opcode_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef enum",
-"{",
-"no_op = 0,",
-"succeed,",
-"exactn,",
-"anychar,",
-"charset,",
-"charset_not,",
-"start_memory,",
-"stop_memory,",
-"duplicate,",
-"begline,",
-"endline,",
-"begbuf,",
-"endbuf,",
-"jump,",
-"jump_past_alt,",
-"on_failure_jump,",
-"on_failure_keep_string_jump,",
-"pop_failure_jump,",
-"maybe_pop_jump,",
-"dummy_failure_jump,",
-"push_dummy_failure,",
-"succeed_n,",
-"jump_n,",
-"set_number_at,      wordchar,",
-"notwordchar,",
-"wordbeg,",
-"wordend,",
-"wordbound,",
-"notwordbound",
-"}",
-"re_opcode_t");
-}
-
-// typedef enum
-// {
-//     no_op = 0,
-// 
-//     /* Succeed right away--no more backtracking.  */
-//     succeed,
-// 
-//     /* Followed by one byte giving n, then by n literal bytes.  */
-//     exactn,
-// 
-//     /* Matches any (more or less) character.  */
-//     anychar,
-// 
-//     /* Matches any one char belonging to specified set.  First
-//        following byte is number of bitmap bytes.  Then come bytes
-//        for a bitmap saying which chars are in.  Bits in each byte
-//        are ordered low-bit-first.  A character is in the set if its
-//        bit is 1.  A character too large to have a bit in the map is
-//        automatically not in the set.  */
-//     charset,
-// 
-//     /* Same parameters as charset, but match any character that is
-//        not one of those specified.  */
-//     charset_not,
-// 
-//     /* Start remembering the text that is matched, for storing in a
-//        register.  Followed by one byte with the register number, in
-//        the range 0 to one less than the pattern buffer's re_nsub
-//        field.  Then followed by one byte with the number of groups
-//        inner to this one.  (This last has to be part of the
-//        start_memory only because we need it in the on_failure_jump
-//        of re_match_2.)  */
-//     start_memory,
-// 
-//     /* Stop remembering the text that is matched and store it in a
-//        memory register.  Followed by one byte with the register
-//        number, in the range 0 to one less than `re_nsub' in the
-//        pattern buffer, and one byte with the number of inner groups,
-//        just like `start_memory'.  (We need the number of inner
-//        groups here because we don't have any easy way of finding the
-//        corresponding start_memory when we're at a stop_memory.)  */
-//     stop_memory,
-// 
-//     /* Match a duplicate of something remembered. Followed by one
-//        byte containing the register number.  */
-//     duplicate,
-// 
-//     /* Fail unless at beginning of line.  */
-//     begline,
-// 
-//     /* Fail unless at end of line.  */
-//     endline,
-// 
-//     /* Succeeds if at beginning of buffer (if emacs) or at beginning
-//        of string to be matched (if not).  */
-//     begbuf,
-// 
-//     /* Analogously, for end of buffer/string.  */
-//     endbuf,
-// 
-//     /* Followed by two byte relative address to which to jump.  */
-//     jump,
-// 
-//     /* Same as jump, but marks the end of an alternative.  */
-//     jump_past_alt,
-// 
-//     /* Followed by two-byte relative address of place to resume at
-//        in case of failure.  */
-//     on_failure_jump,
-// 
-//     /* Like on_failure_jump, but pushes a placeholder instead of the
-//        current string position when executed.  */
-//     on_failure_keep_string_jump,
-// 
-//     /* Throw away latest failure point and then jump to following
-//        two-byte relative address.  */
-//     pop_failure_jump,
-// 
-//     /* Change to pop_failure_jump if know won't have to backtrack to
-//        match; otherwise change to jump.  This is used to jump
-//        back to the beginning of a repeat.  If what follows this jump
-//        clearly won't match what the repeat does, such that we can be
-//        sure that there is no use backtracking out of repetitions
-//        already matched, then we change it to a pop_failure_jump.
-//        Followed by two-byte address.  */
-//     maybe_pop_jump,
-// 
-//     /* Jump to following two-byte address, and push a dummy failure
-//        point. This failure point will be thrown away if an attempt
-//        is made to use it for a failure.  A `+' construct makes this
-//        before the first repeat.  Also used as an intermediary kind
-//        of jump when compiling an alternative.  */
-//     dummy_failure_jump,
-// 
-//     /* Push a dummy failure point and continue.  Used at the end of
-//        alternatives.  */
-//     push_dummy_failure,
-// 
-//     /* Followed by two-byte relative address and two-byte number n.
-//        After matching N times, jump to the address upon failure.  */
-//     succeed_n,
-// 
-//     /* Followed by two-byte relative address, and two-byte number n.
-//        Jump to the address N times, then fail.  */
-//     jump_n,
-// 
-//     /* Set the following two-byte relative address to the
-//        subsequent two-byte number.  The address *includes* the two
-//        bytes of number.  */
-//     set_number_at,
-// 
-//     wordchar,   /* Matches any word-constituent character.  */
-//     notwordchar,        /* Matches any char that is not a word-constituent.  */
-// 
-//     wordbeg,    /* Succeeds if at word beginning.  */
-//     wordend,    /* Succeeds if at word end.  */
-// 
-//     wordbound,  /* Succeeds if at a word boundary.  */
-//     notwordbound        /* Succeeds if not at a word boundary.  */
-// 
-// 
-//     
-//     
-//     
-// 
-//     
-// 
-//     
-// 
-//     
-//     
-// 
-// } re_opcode_t;
\ No newline at end of file
diff --git a/src/h/re_pattern_buffer.java b/src/h/re_pattern_buffer.java
deleted file mode 100644
index b041a54..0000000
--- a/src/h/re_pattern_buffer.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 3hom62aciieyjg8pgbfmp1qik
-
-public interface re_pattern_buffer extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct re_pattern_buffer",
-"{",
-"unsigned char *buffer",
-"unsigned long int allocated",
-"unsigned long int used",
-"reg_syntax_t syntax",
-"char *fastmap",
-"char * translate",
-"size_t re_nsub",
-"unsigned can_be_null : 1",
-"unsigned regs_allocated : 2",
-"unsigned fastmap_accurate : 1",
-"unsigned no_sub : 1",
-"unsigned not_bol : 1",
-"unsigned not_eol : 1",
-"unsigned newline_anchor : 1",
-"}");
-}
-
-// struct re_pattern_buffer
-//     {
-//         /* [[[begin pattern_buffer]]] */
-//         /* Space that holds the compiled pattern.  It is declared as
-//            `unsigned char *' because its elements are
-//            sometimes used as array indexes.  */
-//         unsigned char *buffer;
-// 
-//         /* Number of bytes to which `buffer' points.  */
-//         unsigned long int allocated;
-// 
-//         /* Number of bytes actually used in `buffer'.  */
-//         unsigned long int used;
-// 
-//         /* Syntax setting with which the pattern was compiled.  */
-//         reg_syntax_t syntax;
-// 
-//         /* Pointer to a fastmap, if any, otherwise zero.  re_search uses
-//            the fastmap, if there is one, to skip over impossible
-//            starting points for matches.  */
-//         char *fastmap;
-// 
-//         /* Either a translate table to apply to all characters before
-//            comparing them, or zero for no translation.  The translation
-//            is applied to a pattern when it is compiled and to a string
-//            when it is matched.  */
-//         char * translate;
-// 
-//         /* Number of subexpressions found by the compiler.  */
-//         size_t re_nsub;
-// 
-//         /* Zero if this pattern cannot match the empty string, one else.
-//            Well, in truth it's used only in `re_search_2', to see
-//            whether or not we should use the fastmap, so we don't set
-//            this absolutely perfectly; see `re_compile_fastmap' (the
-//            `duplicate' case).  */
-//         unsigned can_be_null : 1;
-// 
-//         /* If REGS_UNALLOCATED, allocate space in the `regs' structure
-//            for `max (RE_NREGS, re_nsub + 1)' groups.
-//            If REGS_REALLOCATE, reallocate space if necessary.
-//            If REGS_FIXED, use what's there.  */
-// 
-// 
-// 
-//         unsigned regs_allocated : 2;
-// 
-//         /* Set to zero when `regex_compile' compiles a pattern; set to one
-//            by `re_compile_fastmap' if it updates the fastmap.  */
-//         unsigned fastmap_accurate : 1;
-// 
-//         /* If set, `re_match_2' does not return information about
-//            subexpressions.  */
-//         unsigned no_sub : 1;
-// 
-//         /* If set, a beginning-of-line anchor doesn't match at the
-//            beginning of the string.  */
-//         unsigned not_bol : 1;
-// 
-//         /* Similarly for an end-of-line anchor.  */
-//         unsigned not_eol : 1;
-// 
-//         /* If true, an anchor at a newline matches.  */
-//         unsigned newline_anchor : 1;
-// 
-//         /* [[[end pattern_buffer]]] */
-//     };
\ No newline at end of file
diff --git a/src/h/re_registers.java b/src/h/re_registers.java
deleted file mode 100644
index 1198356..0000000
--- a/src/h/re_registers.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 c6l7vumjull8d6poh7y1xqrct
-
-public interface re_registers extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"struct re_registers",
-"{",
-"unsigned num_regs",
-"regoff_t *start",
-"regoff_t *end",
-"}");
-}
-
-// struct re_registers
-//     {
-//         unsigned num_regs;
-//         regoff_t *start;
-//         regoff_t *end;
-//     };
\ No newline at end of file
diff --git a/src/h/refstr_t.java b/src/h/refstr_t.java
deleted file mode 100644
index 833aa0d..0000000
--- a/src/h/refstr_t.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 61ughvl20d1mf5vtkmd94wfy
-
-public interface refstr_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct refstr_t",
-"{",
-"Dtlink_t link",
-"unsigned long refcnt",
-"char *s",
-"char store[1]",
-"}",
-"refstr_t");
-}
-
-// typedef struct refstr_t {
-//     Dtlink_t link;
-//     unsigned long refcnt;
-//     char *s;
-//     char store[1];		/* this is actually a dynamic array */
-// } refstr_t;
\ No newline at end of file
diff --git a/src/h/reg_errcode_t.java b/src/h/reg_errcode_t.java
deleted file mode 100644
index 4b21da9..0000000
--- a/src/h/reg_errcode_t.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 ap7c4ii9ux7nlggs68fm76fy6
-
-public interface reg_errcode_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef enum",
-"{",
-"REG_NOERROR = 0,",
-"REG_NOMATCH,",
-"REG_BADPAT,",
-"REG_ECOLLATE,",
-"REG_ECTYPE,",
-"REG_EESCAPE,",
-"REG_ESUBREG,",
-"REG_EBRACK,",
-"REG_EPAREN,",
-"REG_EBRACE,",
-"REG_BADBR,",
-"REG_ERANGE,",
-"REG_ESPACE,",
-"REG_BADRPT,",
-"REG_EEND,",
-"REG_ESIZE,",
-"REG_ERPAREN",
-"}",
-"reg_errcode_t");
-}
-
-// typedef enum
-//     {
-//         REG_NOERROR = 0,        /* Success.  */
-//         REG_NOMATCH,            /* Didn't find a match (for regexec).  */
-// 
-//         /* POSIX regcomp return error codes.  (In the order listed in the
-//            standard.)  */
-//         REG_BADPAT,             /* Invalid pattern.  */
-//         REG_ECOLLATE,           /* Not implemented.  */
-//         REG_ECTYPE,             /* Invalid character class name.  */
-//         REG_EESCAPE,            /* Trailing backslash.  */
-//         REG_ESUBREG,            /* Invalid back reference.  */
-//         REG_EBRACK,             /* Unmatched left bracket.  */
-//         REG_EPAREN,             /* Parenthesis imbalance.  */
-//         REG_EBRACE,             /* Unmatched \{.  */
-//         REG_BADBR,              /* Invalid contents of \{\}.  */
-//         REG_ERANGE,             /* Invalid range end.  */
-//         REG_ESPACE,             /* Ran out of memory.  */
-//         REG_BADRPT,             /* No preceding re for repetition op.  */
-// 
-//         /* Error codes we've added.  */
-//         REG_EEND,               /* Premature end.  */
-//         REG_ESIZE,              /* Compiled pattern bigger than 2^16 bytes.  */
-//         REG_ERPAREN             /* Unmatched ) or \); not returned from regcomp.  */
-//     } reg_errcode_t;
\ No newline at end of file
diff --git a/src/h/regex_t.java b/src/h/regex_t.java
deleted file mode 100644
index 9c20a8e..0000000
--- a/src/h/regex_t.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-//2 a0207gwp8wnf6l2kb9poka4m4
-
-public interface regex_t extends re_pattern_buffer {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct re_pattern_buffer regex_t");
-}
-
-// typedef struct re_pattern_buffer regex_t;
\ No newline at end of file
diff --git a/src/h/register_info_type.java b/src/h/register_info_type.java
deleted file mode 100644
index ef64ec0..0000000
--- a/src/h/register_info_type.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 32aq50hgdk3miqrwc4915dj1o
-
-public interface register_info_type extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef union",
-"{",
-"fail_stack_elt_t word",
-"struct",
-"{",
-"unsigned match_null_string_p : 2",
-"unsigned is_active : 1",
-"unsigned matched_something : 1",
-"unsigned ever_matched_something : 1",
-"}",
-"bits",
-"}",
-"register_info_type");
-}
-
-// typedef union
-// {
-//     fail_stack_elt_t word;
-//     struct
-//     {
-//         /* This field is one if this group can match the empty string,
-//            zero if not.  If not yet determined,  `MATCH_NULL_UNSET_VALUE'.  */
-// 
-//         unsigned match_null_string_p : 2;
-//         unsigned is_active : 1;
-//         unsigned matched_something : 1;
-//         unsigned ever_matched_something : 1;
-//     } bits;
-// } register_info_type;
\ No newline at end of file
diff --git a/src/h/regmatch_t.java b/src/h/regmatch_t.java
deleted file mode 100644
index ebe8355..0000000
--- a/src/h/regmatch_t.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 pj9qzzazlscp3s43o8lug1br
-
-public interface regmatch_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"regoff_t rm_so",
-"regoff_t rm_eo",
-"}",
-"regmatch_t");
-}
-
-// typedef struct
-//     {
-//         regoff_t rm_so;  /* Byte offset from string's start to substring's start.  */
-//         regoff_t rm_eo;  /* Byte offset from string's start to substring's end.  */
-//     } regmatch_t;
\ No newline at end of file
diff --git a/src/h/route.java b/src/h/route.java
deleted file mode 100644
index 471bb5b..0000000
--- a/src/h/route.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 5fq657all5l5bqizkuz5ggrdj
-
-public interface route extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"int n",
-"segment* segs",
-"}",
-"route");
-}
-
-// typedef struct {
-//   int n;
-//   segment* segs;
-// } route;
\ No newline at end of file
diff --git a/src/h/same_t.java b/src/h/same_t.java
deleted file mode 100644
index 1b78805..0000000
--- a/src/h/same_t.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 8c359dwrpz9nffi3rk433ukjt
-
-public interface same_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct same_t",
-"{",
-"char *id",
-"elist l",
-"int n_arr",
-"double arr_len",
-"}",
-"same_t");
-}
-
-// typedef struct same_t {
-//     char *id;			/* group id */
-//     elist l;			/* edges in the group */
-//     int n_arr;			/* number of edges with arrows */
-//     double arr_len;		/* arrow length of an edge in the group */
-// } same_t;
\ No newline at end of file
diff --git a/src/h/save_e_t.java b/src/h/save_e_t.java
deleted file mode 100644
index 2abfef2..0000000
--- a/src/h/save_e_t.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 24xdytkhdvt79rfwsa7gp6do2
-
-public interface save_e_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct save_e_s",
-"{",
-"Agnode_t *from, *to",
-"}",
-"save_e_t");
-}
-
-// typedef struct save_e_s {
-//     Agnode_t *from, *to;
-// } save_e_t;
\ No newline at end of file
diff --git a/src/h/save_stack_t.java b/src/h/save_stack_t.java
deleted file mode 100644
index 932c642..0000000
--- a/src/h/save_stack_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 9a1whydr7ixbfnkje6ytmde8t
-
-public interface save_stack_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct save_stack_s",
-"{",
-"save_e_t *mem",
-"int stacksize",
-"}",
-"save_stack_t");
-}
-
-// typedef struct save_stack_s {
-//     save_e_t *mem;
-//     int stacksize;
-// } save_stack_t;
\ No newline at end of file
diff --git a/src/h/sedge.java b/src/h/sedge.java
deleted file mode 100644
index 07f3812..0000000
--- a/src/h/sedge.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 15ruicbgesimuhfhph6r72639
-
-public interface sedge extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct sedge sedge");
-}
-
-// typedef struct sedge sedge;
\ No newline at end of file
diff --git a/src/h/seedMode.java b/src/h/seedMode.java
deleted file mode 100644
index b301782..0000000
--- a/src/h/seedMode.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 7n29466qjouzyf7izmjndudt5
-
-public interface seedMode extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef enum",
-"{",
-"seed_unset, seed_val, seed_time, seed_regular",
-"}",
-"seedMode");
-}
-
-// typedef enum {
-//   seed_unset, seed_val, seed_time, seed_regular
-// } seedMode;
\ No newline at end of file
diff --git a/src/h/segitem_t.java b/src/h/segitem_t.java
deleted file mode 100644
index cd4c813..0000000
--- a/src/h/segitem_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 btsf9u7kgq9gvrmm3ikqza2ix
-
-public interface segitem_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct segitem_s",
-"{",
-"pointf p",
-"struct segitem_s* next",
-"}",
-"segitem_t");
-}
-
-// typedef struct segitem_s {
-//     pointf p;
-//     struct segitem_s* next;
-// } segitem_t;
\ No newline at end of file
diff --git a/src/h/segment.java b/src/h/segment.java
deleted file mode 100644
index 9f3bafc..0000000
--- a/src/h/segment.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 chpljvx1wjvc6a9wott6pl7mo
-
-public interface segment extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct segment",
-"{",
-"boolean isVert",
-"boolean flipped",
-"double comm_coord",
-"paird p",
-"bend l1, l2",
-"int ind_no",
-"int track_no",
-"struct segment* prev",
-"struct segment* next",
-"}",
-"segment");
-}
-
-// typedef struct segment {
-//   boolean isVert;
-//   boolean flipped;
-//   double comm_coord;  /* the common coordinate */
-//   paird p;      /* end points */
-//   bend l1, l2; 
-//   int ind_no;      /* index number of this segment in its channel */
-//   int track_no;    /* track number assigned in the channel */
-//   struct segment* prev;
-//   struct segment* next;
-// } segment;
\ No newline at end of file
diff --git a/src/h/segment_t.java b/src/h/segment_t.java
deleted file mode 100644
index 941f597..0000000
--- a/src/h/segment_t.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 4p5dhxpx14ooxgkym0hnv7g04
-
-public interface segment_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"pointf v0, v1",
-"int is_inserted",
-"int root0, root1",
-"int next",
-"int prev",
-"}",
-"segment_t");
-}
-
-// typedef struct {
-//   pointf v0, v1;       /* two endpoints */ 
-//   int is_inserted;      /* inserted in trapezoidation yet ? */
-//   int root0, root1;     /* root nodes in Q */
-//   int next;         /* Next logical segment */
-//   int prev;         /* Previous segment */
-// } segment_t;
\ No newline at end of file
diff --git a/src/h/sfont_t.java b/src/h/sfont_t.java
deleted file mode 100644
index 69dad64..0000000
--- a/src/h/sfont_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 e0z0hnt02wemy4xf87o17z7cp
-
-public interface sfont_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct sfont_t",
-"{",
-"textfont_t *cfont",
-"struct sfont_t *pfont",
-"}",
-"sfont_t");
-}
-
-// typedef struct sfont_t {
-//     textfont_t *cfont;	
-//     struct sfont_t *pfont;
-// } sfont_t;
\ No newline at end of file
diff --git a/src/h/sgraph.java b/src/h/sgraph.java
deleted file mode 100644
index a6aba9c..0000000
--- a/src/h/sgraph.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 dxskpbv74lxltj165fmgf70cp
-
-public interface sgraph extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"int nnodes, nedges",
-"int save_nnodes, save_nedges",
-"snode* nodes",
-"sedge* edges",
-"}",
-"sgraph");
-}
-
-// typedef struct {
-//   int nnodes, nedges;
-//   int save_nnodes, save_nedges;
-//   snode* nodes;
-//   sedge* edges;
-// } sgraph;
\ No newline at end of file
diff --git a/src/h/shape_desc.java b/src/h/shape_desc.java
deleted file mode 100644
index acbe140..0000000
--- a/src/h/shape_desc.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 8ger4o0h260ys1ca9fc7x46eq
-
-public interface shape_desc extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct shape_desc",
-"{",
-"char *name",
-"shape_functions *fns",
-"polygon_t *polygon",
-"boolean usershape",
-"}",
-"shape_desc");
-}
-
-// typedef struct shape_desc {	/* read-only shape descriptor */
-// 	char *name;		/* as read from graph file */
-// 	shape_functions *fns;
-// 	polygon_t *polygon;	/* base polygon info */
-// 	boolean usershape;
-//     } shape_desc;
\ No newline at end of file
diff --git a/src/h/shape_functions.java b/src/h/shape_functions.java
deleted file mode 100644
index 291fd42..0000000
--- a/src/h/shape_functions.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 5mip14tura2l8b750vykgeun3
-
-public interface shape_functions extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct shape_functions",
-"{",
-"void (*initfn) (node_t *)",
-"void (*freefn) (node_t *)",
-"port(*portfn) (node_t *, char *, char *)",
-"boolean(*insidefn) (inside_t * inside_context, pointf)",
-"int (*pboxfn)(node_t* n, port* p, int side, boxf rv[], int *kptr)",
-"void (*codefn) (GVJ_t * job, node_t * n)",
-"}",
-"shape_functions");
-}
-
-// typedef struct shape_functions {	/* read-only shape functions */
-// 	void (*initfn) (node_t *);	/* initializes shape from node u.shape_info structure */
-// 	void (*freefn) (node_t *);	/* frees  shape from node u.shape_info structure */
-// 	 port(*portfn) (node_t *, char *, char *);	/* finds aiming point and slope of port */
-// 	 boolean(*insidefn) (inside_t * inside_context, pointf);	/* clips incident gvc->e spline on shape of gvc->n */
-// 	int (*pboxfn)(node_t* n, port* p, int side, boxf rv[], int *kptr); /* finds box path to reach port */
-// 	void (*codefn) (GVJ_t * job, node_t * n);	/* emits graphics code for node */
-//     } shape_functions;
\ No newline at end of file
diff --git a/src/h/shape_t.java b/src/h/shape_t.java
deleted file mode 100644
index f4ed6ea..0000000
--- a/src/h/shape_t.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 a6qcq27iylfbrgiga37cxkr9t
-
-public interface shape_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct shape_t",
-"{",
-"int nstrokes",
-"stroke_t *strokes",
-"}",
-"shape_t");
-}
-
-// typedef struct shape_t {	/* mutable shape information for a node */
-// 	int nstrokes;		/* number of strokes in array */
-// 	stroke_t *strokes;	/* array of strokes */
-// 	/* The last stroke must always be closed, but can be pen_up.
-// 	 * It is used as the clipping path */
-//     } shape_t;
\ No newline at end of file
diff --git a/src/h/snode.java b/src/h/snode.java
deleted file mode 100644
index 2b91f82..0000000
--- a/src/h/snode.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 dp60xuei2ue2x586frihti3gr
-
-public interface snode extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct snode snode");
-}
-
-// typedef struct snode snode;
\ No newline at end of file
diff --git a/src/h/snodeitem.java b/src/h/snodeitem.java
deleted file mode 100644
index 831983b..0000000
--- a/src/h/snodeitem.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 d89g0gupg4cmbfbww7yqebufn
-
-public interface snodeitem extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"snode*    np",
-"pointf    p",
-"Dtlink_t  link",
-"}",
-"snodeitem");
-}
-
-// typedef struct {
-//     snode*    np;
-//     pointf    p;
-//     Dtlink_t  link;
-// } snodeitem;
\ No newline at end of file
diff --git a/src/h/splineInfo.java b/src/h/splineInfo.java
deleted file mode 100644
index 9dc3222..0000000
--- a/src/h/splineInfo.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 8u1r3c3d0g8hn19fq04x9z0ht
-
-public interface splineInfo extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"boolean(*swapEnds) (edge_t * e)",
-"boolean(*splineMerge) (node_t * n)",
-"boolean ignoreSwap",
-"boolean isOrtho",
-"}",
-"splineInfo");
-}
-
-// typedef struct {
-// 	boolean(*swapEnds) (edge_t * e);	/* Should head and tail be swapped? */
-// 	boolean(*splineMerge) (node_t * n);	/* Is n a node in the middle of an edge? */
-// 	boolean ignoreSwap;                     /* Test for swapped edges if false */
-// 	boolean isOrtho;                        /* Orthogonal routing used */
-//     } splineInfo;
\ No newline at end of file
diff --git a/src/h/spline_info_t.java b/src/h/spline_info_t.java
deleted file mode 100644
index 9cf5708..0000000
--- a/src/h/spline_info_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 368du94hwpmwj2vxjibw1kyxw
-
-public interface spline_info_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"int LeftBound, RightBound, Splinesep, Multisep",
-"boxf* Rank_box",
-"}",
-"spline_info_t");
-}
-
-// typedef struct {
-//     int LeftBound, RightBound, Splinesep, Multisep;
-//     boxf* Rank_box;
-// } spline_info_t;
\ No newline at end of file
diff --git a/src/h/splines.java b/src/h/splines.java
deleted file mode 100644
index dc88d33..0000000
--- a/src/h/splines.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 966xu1ddmyus6hb8a0jpk0mxv
-
-public interface splines extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct splines",
-"{",
-"bezier *list",
-"int size",
-"boxf bb",
-"}",
-"splines");
-}
-
-// typedef struct splines {
-// 	bezier *list;
-// 	int size;
-// 	boxf bb;
-//     } splines;
\ No newline at end of file
diff --git a/src/h/textlabel_t.java b/src/h/textlabel_t.java
deleted file mode 100644
index bc4f78f..0000000
--- a/src/h/textlabel_t.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 9qqo4pt0x97lv7fp9yneflgkr
-
-public interface textlabel_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct textlabel_t",
-"{",
-"char *text, *fontname, *fontcolor",
-"int charset",
-"double fontsize",
-"pointf dimen",
-"pointf space",
-"pointf pos",
-"union",
-"{",
-"struct",
-"{",
-"textspan_t *span",
-"short nspans",
-"}",
-"txt",
-"htmllabel_t *html",
-"}",
-"u",
-"char valign",
-"boolean set",
-"boolean html",
-"}",
-"textlabel_t");
-}
-
-// typedef struct textlabel_t {
-// 	char *text, *fontname, *fontcolor;
-// 	int charset;
-// 	double fontsize;
-// 	pointf dimen; /* the diagonal size of the label (estimated by layout) */
-// 	pointf space; /* the diagonal size of the space for the label */
-// 		      /*   the rendered label is aligned in this box */
-// 		      /*   space does not include pad or margin */
-// 	pointf pos;   /* the center of the space for the label */
-// 	union {
-// 	    struct {
-// 		textspan_t *span;
-// 		short nspans;
-// 	    } txt;
-// 	    htmllabel_t *html;
-// 	} u;
-// 	char valign;  /* 't' 'c' 'b' */
-// 	boolean set;  /* true if position is set */
-// 	boolean html; /* true if html label */
-//     } textlabel_t;
\ No newline at end of file
diff --git a/src/h/textspan_t.java b/src/h/textspan_t.java
deleted file mode 100644
index 4d8a916..0000000
--- a/src/h/textspan_t.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 3u5j54p26whh9zkbxuboqgjl8
-
-public interface textspan_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"char *str",
-"textfont_t *font",
-"void *layout",
-"void (*free_layout) (void *layout)",
-"double yoffset_layout, yoffset_centerline",
-"pointf size",
-"char just",
-"}",
-"textspan_t");
-}
-
-// typedef struct {
-// 	char *str;      /* stored in utf-8 */
-// 	textfont_t *font;
-// 	void *layout;
-// 	void (*free_layout) (void *layout);   /* FIXME - this is ugly */
-// 	double yoffset_layout, yoffset_centerline;
-//  	pointf size;
-// 	char just;	/* 'l' 'n' 'r' */ /* FIXME */
-//     } textspan_t;
\ No newline at end of file
diff --git a/src/h/tna_t.java b/src/h/tna_t.java
deleted file mode 100644
index ea2419a..0000000
--- a/src/h/tna_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 8b2ok0k4502ln9ebjmmz8i24b
-
-public interface tna_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct tna_t",
-"{",
-"double t",
-"Ppoint_t a[2]",
-"}",
-"tna_t");
-}
-
-// typedef struct tna_t {
-//     double t;
-//     Ppoint_t a[2];
-// } tna_t;
\ No newline at end of file
diff --git a/src/h/triangle_t.java b/src/h/triangle_t.java
deleted file mode 100644
index a245cca..0000000
--- a/src/h/triangle_t.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 5ecxnf8ebe9n3gyiow712oltk
-
-public interface triangle_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct triangle_t",
-"{",
-"int mark",
-"struct tedge_t e[3]",
-"}",
-"triangle_t");
-}
-
-// typedef struct triangle_t {
-//     int mark;
-//     struct tedge_t e[3];
-// } triangle_t;
\ No newline at end of file
diff --git a/src/h/xlabel_t.java b/src/h/xlabel_t.java
deleted file mode 100644
index 4ac3c87..0000000
--- a/src/h/xlabel_t.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/* ========================================================================
- * PlantUML : a free UML diagram generator
- * ========================================================================
- *
- * Project Info:  http://plantuml.com
- * 
- * If you like this project or if you find it useful, you can support us at:
- * 
- * http://plantuml.com/patreon (only 1$ per month!)
- * http://plantuml.com/paypal
- * 
- * This file is part of Smetana.
- * Smetana is a partial translation of Graphviz/Dot sources from C to Java.
- *
- * (C) Copyright 2009-2017, Arnaud Roques
- *
- * This translation is distributed under the same Licence as the original C program:
- * 
- *************************************************************************
- * Copyright (c) 2011 AT&T Intellectual Property 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: See CVS logs. Details at http://www.graphviz.org/
- *************************************************************************
- *
- * THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
- * LICENSE ("AGREEMENT"). [Eclipse Public License - v 1.0]
- * 
- * ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES
- * RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
- * 
- * You may obtain a copy of the License at
- * 
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package h;
-import java.util.Arrays;
-import java.util.List;
-
-import smetana.core.__ptr__;
-
-//2 cguvocw1bak2n3x4pc98z410a
-
-public interface xlabel_t extends __ptr__ {
-	public static List<String> DEFINITION = Arrays.asList(
-"typedef struct",
-"{",
-"pointf sz",
-"pointf pos",
-"void *lbl",
-"unsigned char set",
-"}",
-"xlabel_t");
-}
-
-// typedef struct {
-//     pointf sz;			/* Size of label (input) */
-//     pointf pos;			/* Position of lower-left corner of label (output) */
-//     void *lbl;			/* Pointer to label in the graph */
-//     unsigned char set;		/* True if the position has been set (input/output) */
-// } xlabel_t;
\ No newline at end of file