diff --git a/shared/xsl/bgf2bnf.xslt b/shared/xsl/bgf2bnf.xslt
index 19a50eef..b2f7348e 100644
--- a/shared/xsl/bgf2bnf.xslt
+++ b/shared/xsl/bgf2bnf.xslt
@@ -59,20 +59,45 @@
- (
-
- )+
+
+
+ (
+
+ )+
+
+
+
+ +
+
+
- (
-
- )*
+
+
+ (
+
+ )*
+
+
+
+ *
+
+
-
- ?
+
+
+ (
+
+ )?
+
+
+
+ ?
+
+
@@ -118,7 +143,7 @@
(
- )
+ )
@@ -144,7 +169,7 @@
)
-
+
diff --git a/shared/xsl/xbgf2xbnf.xslt b/shared/xsl/xbgf2xbnf.xslt
index 099469ea..19ffbc86 100644
--- a/shared/xsl/xbgf2xbnf.xslt
+++ b/shared/xsl/xbgf2xbnf.xslt
@@ -37,8 +37,11 @@
(
-
-
+
+
+
+
+
@@ -47,47 +50,22 @@
-
- (
-
-
-
-
-
-
+
+ addV(
+
+
-
-
- ,
+
+ addH(
-
-
-
-
-
-
-
-
-
-
+
);
-
-
(
@@ -133,8 +111,6 @@
-
-