From: David Lecompte <3gpp@metani.eu>
Date: Fri, 24 Jul 2026 14:03:07 +0000 (+0200)
Subject: Output format modifications according to suggestions:
X-Git-Url: https://nuage.metani.fr/gitweb/3GPP.git/commitdiff_plain/6996355fa2bf7ca16ca2a8c0b0881c26c491e577?hp=3410957620b306b599446bfe77c935e612c33a92

Output format modifications according to suggestions:
- integrated: add field name before the field description and the condition description
- separate: use = as separator for the start of field description tables and presence condition description tables

Reduce the separator width to 70 characters.
---

diff --git a/awk/txt2asn-integrated.awk b/awk/txt2asn-integrated.awk
index 061f8f3..c71a787 100755
--- a/awk/txt2asn-integrated.awk
+++ b/awk/txt2asn-integrated.awk
@@ -44,7 +44,10 @@ function asn1_print()
 	    print "";
 
 	    if (field_description_len[structure[line]][field[line]] > 0) {
-		for (i=1;i<=field_description_len[structure[line]][field[line]]; i++) {
+
+		print indentation "-- " field[line] " : " field_description[structure[line]][field[line]][1];
+
+		for (i=2;i<=field_description_len[structure[line]][field[line]]; i++) {
 		    
 		    print indentation "-- " field_description[structure[line]][field[line]][i];
 		    
@@ -54,7 +57,10 @@ function asn1_print()
 	    if (condition_description_len[condition[line]] > 0) {
 		if(field[line] != "")
 		{
-		    for(i=1;i<=condition_description_len[condition[line]];i++) {
+		    gsub(/(, )*[Nn]eed [MNSR],*/, "", condition_description[condition[line]][1]);
+		    print indentation "-- " field[line] " : " condition_description[condition[line]][1]; 
+		    
+		    for(i=2;i<=condition_description_len[condition[line]];i++) {
 			gsub(/(, )*[Nn]eed [MNSR],*/, "", condition_description[condition[line]][i]);
 			print indentation "--" condition_description[condition[line]][i]; 
 		    }
diff --git a/awk/txt2asn.awk b/awk/txt2asn.awk
index e949677..09cc066 100755
--- a/awk/txt2asn.awk
+++ b/awk/txt2asn.awk
@@ -5,12 +5,12 @@ BEGIN {
     separator = "" ;
 
     wide_separator = "" ;
-    for(i=0;i<=140;i++) {
+    for(i=0;i<=70;i++) {
 	wide_separator = wide_separator "-" ;
     }
 
     ie_separator = "-- " ;
-    for (i=0;i<=137;i++) {
+    for (i=0;i<=70;i++) {
 	ie_separator = ie_separator "=" ;
     }
 }
@@ -116,13 +116,11 @@ BEGIN {
 
 /^Conditional Presence/ {
     add_line_after = "";
-    separator = "" ;
-    
+    separator = ie_separator ;
+
     $0 = "Conditional presence" ;
-    for(i=0;i<=140;i++) {
-	separator = separator "-" ;
-    }
-#    print separator;
+  
+    print separator;
     #add_line_after = separator ;
     next_line = "condition" ;
 }
@@ -131,12 +129,9 @@ BEGIN {
 
 /field descriptions$/ {
     add_line_after = "";
-    separator = "" ;
 
-    for(i=0;i<=140;i++) {
-	separator = separator "-" ;
-    }
-#    print separator;
+    separator = ie_separator;
+    print separator;
 #   add_line_after = separator ;
     next_line = "field name" ;
 }
@@ -152,6 +147,7 @@ BEGIN {
     if (next_line == "field name") {
 	
 	print separator ;
+	separator = wide_separator ;
 	
 	$0 = "Field: " $0
 	#add_line_after = " ";
@@ -159,6 +155,7 @@ BEGIN {
     }
     else if (next_line == "field description") {
 	print separator ;
+	separator = wide_separator ;
 	
 	$0 = "Field: " $0
 	#add_line_after = separator ;
@@ -175,6 +172,7 @@ BEGIN {
 	   
 	    if (index(conditions, $1) != 0) {
 		print separator;
+		separator = wide_separator ;
 		print "-- Condition: " $1;
 		$1 = "";
 	    }