further fixing output for looking-through-rdf-glasses

eyereasoner · Nov 16, 2023 · b562618 · b562618
1 parent 5343086
commit b562618
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 10 deletions.
diff --git a/RELEASE b/RELEASE
@@ -1,5 +1,6 @@
                                   EYE release
 
+v8.6.11 (2023-11-17) further fixing output for looking-through-rdf-glasses
 v8.6.10 (2023-11-16) fixing output for looking-through-rdf-glasses
 v8.6.9 (2023-11-16) rdflegacy is now rdflanguage and --legacy is not needed anymore
 v8.6.8 (2023-11-15) using qnames in the output of urn: uris

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-8.6.10
+8.6.11
diff --git a/eye.pl b/eye.pl
@@ -21,7 +21,7 @@
 :- use_module(library(pcre)).
 :- catch(use_module(library(http/http_open)), _, true).
 
-version_info('EYE v8.6.10 (2023-11-16)').
+version_info('EYE v8.6.11 (2023-11-17)').
 
 license_info('MIT License
 
@@ -4348,7 +4348,10 @@
         write(' true')
     ;   wt(X),
         ws(X),
-        write('.'),
+        (   flag(looking_through_rdf_glasses)
+        ->  true
+        ;   write('.')
+        ),
         (   flag(strings)
         ->  write(' ')
         ;   (   flag('no-beautified-output')
@@ -4662,11 +4665,21 @@
     (   atom(P)
     ->  X =.. [P, S, O],
         wt2(X)
-    ;   wg(S),
+    ;   (   flag(looking_through_rdf_glasses),
+            \+nb_getval(indentation, 0)
+        ->  write('(')
+        ;   true
+        ),
+        wg(S),
         write(' '),
         wg(P),
         write(' '),
-        wg(O)
+        wg(O),
+        (   flag(looking_through_rdf_glasses),
+            \+nb_getval(indentation, 0)
+        ->  write(')')
+        ;   true
+        )
     ).
 wtn(triple(S, P, O)) :-
     !,
@@ -4740,7 +4753,10 @@
         ->  true
         ;   (   flag('no-beautified-output')
             ->  true
-            ;   write('.'),
+            ;   (   flag(looking_through_rdf_glasses)
+                ->  true
+                ;   write('.')
+                ),
                 nl,
                 indent
             )

diff --git a/eye.zip b/eye.zip
diff --git a/looking-through-rdf-glasses/temp/out/union.ttl.out b/looking-through-rdf-glasses/temp/out/union.ttl.out
@@ -1,8 +1,8 @@
 @prefix : <urn:example:>.
 
 (((:A :B :C) (:A :X :C) (:D :E :F)) ((:A :Y :C))) :union (
-    (:A :B :C).
-    (:A :X :C).
-    (:D :E :F).
-    (:A :Y :C).
+    (:A :B :C)
+    (:A :X :C)
+    (:D :E :F)
+    (:A :Y :C)
 ).