[groff] 01/01: groff.cpp, gideal/listfiles/: minor corrections

[Bernd Warken]

bwarken pushed a commit to branch master
in repository groff.

commit d00ea0e8d29d2a2c130dff5463c2ec7470ced93b
Author: Bernd Warken <address@hidden>
Date:   Tue Jun 17 22:53:18 2014 +0200

    groff.cpp, gideal/listfiles/: minor corrections
---
 contrib/gideal/Makefile.sub          |   19 ++++++++++++++++-
 contrib/gideal/libfiles/README.txt   |   11 ++++++++++
 contrib/gideal/libfiles/arc.ideal    |   37 ++++++++++++++++++++++++++++++++++
 contrib/gideal/libfiles/arrow.ideal  |   21 +++++++++++++++++++
 contrib/gideal/libfiles/circle.ideal |   19 +++++++++++++++++
 contrib/gideal/libfiles/dash.ideal   |   18 ++++++++++++++++
 contrib/gideal/libfiles/rect.ideal   |   30 +++++++++++++++++++++++++++
 contrib/gideal/libfiles/wavy.ideal   |   20 ++++++++++++++++++
 src/roff/groff/groff.cpp             |    2 +-
 9 files changed, 175 insertions(+), 2 deletions(-)

diff --git a/contrib/gideal/Makefile.sub b/contrib/gideal/Makefile.sub
index 01e60aa..76e8ea8 100644
--- a/contrib/gideal/Makefile.sub
+++ b/contrib/gideal/Makefile.sub
@@ -6,7 +6,7 @@
 #   Free Software Foundation, Inc.
 # Written by Bernd Warken <address@hidden>.
 
-# Last update: 16 Jun 2014
+# Last update: 17 Jun 2014
 
 # This file is part of `gideal' which is part of `groff'.
 
@@ -46,15 +46,32 @@ gideal: gideal.pl
            $(srcdir)/gideal.pl >$@; \
        chmod +x $@
 
+.PHONY: libdirs
+libdires: 
+
 .PHONY: install_data
 install_data: gideal
        -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
        $(RM) $(DESTDIR)$(bindir)/gideal
        $(INSTALL_SCRIPT) gideal $(DESTDIR)$(bindir)/gideal
+       -test -d $(DESTDIR)$(datasubdir)/ideal \
+          || $(mkinstalldirs) $(DESTDIR)$(datasubdir)/ideal
+       -test -d $(DESTDIR)$(datasubdir)/ideal/libfiles \
+          || $(mkinstalldirs) $(DESTDIR)$(datasubdir)/ideal/libfiles
+       $(RM) $(DESTDIR)$(datasubdir)/ideal/libfiles/*
+       for i in $(srcdir)/libfiles/*.ideal; do \
+         n=`echo $$i | sed 's|$(srcdir)/libfiles/||g'`; \
+         $(INSTALL_DATA) $$i $(DESTDIR)$(datasubdir)/ideal/libfiles/$$n; \
+       done
+       $(RM) $(DESTDIR)$(datasubdir)/ideal/libfiles/README.txt
+       $(INSTALL_DATA) $$(srcdir)/libfiles//README.txt \
+               $(DESTDIR)$(datasubdir)/ideal/libfiles/README.txt;
+
 
 .PHONY: uninstall_sub
 uninstall_sub:
        $(RM) $(DESTDIR)$(bindir)/gideal
+       $(RM) $(DESTDIR)$(datasubdir)/ideal/libfiles/*
 
 
 ########################################################################
diff --git a/contrib/gideal/libfiles/README.txt 
b/contrib/gideal/libfiles/README.txt
new file mode 100644
index 0000000..284868a
--- /dev/null
+++ b/contrib/gideal/libfiles/README.txt
@@ -0,0 +1,11 @@
+In this directory, there are stored a series of `ideal libfiles'.
+They all come from the `ideal' documentation
+     Computing Science Technical Report No. 103
+     IDEAL User’s Manual - Christopher J. Van Wyk
+
+Therein the name of the `libfile' files does not have an extension.
+But we added the extension `.ideal' to each libfile file.
+
+Only the libfile `arc' is lacking.  It's existence was mentioned, but
+not given.  We collected useful information and wrote a new file
+`arc.ideal'.
diff --git a/contrib/gideal/libfiles/arc.ideal 
b/contrib/gideal/libfiles/arc.ideal
new file mode 100644
index 0000000..2c139e1
--- /dev/null
+++ b/contrib/gideal/libfiles/arc.ideal
@@ -0,0 +1,37 @@
+.\" from `Computing Science Technical Report No. 103'
+.\" IDEAL User’s Manual - Christopher J. Van Wyk
+.
+.\" This file is not complete.  The basicdefinition is lacking -
+.\" better do not use it with `...libfile'.
+
+.IS
+/* giving center, radius, and
+starting and ending angles */
+put arc {
+       center = 0;
+       radius = 1;
+       startang = 0;
+       endang = 235;
+};
+/* giving center, starting point,
+and ending angle */
+put arc {
+       center = 0;
+       start = 1;
+       endang = 235;
+};
+/* giving three points on the arc */
+put arc {
+       start = cis(235);
+       midway = -1;
+       end = 0;
+};
+.IE
+.
+.\" --------------------------------------------------------------------
+.\" Emacs settings
+.\" --------------------------------------------------------------------
+.
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
diff --git a/contrib/gideal/libfiles/arrow.ideal 
b/contrib/gideal/libfiles/arrow.ideal
new file mode 100644
index 0000000..387b9c4
--- /dev/null
+++ b/contrib/gideal/libfiles/arrow.ideal
@@ -0,0 +1,21 @@
+.\" from `Computing Science Technical Report No. 103'
+.\" IDEAL User’s Manual - Christopher J. Van Wyk
+.
+.IS
+arrow {
+      var tl, hd, head, perp, headang;
+      conn tl to hd;
+      perp = head*(tl-hd)/abs(tl-hd);
+      conn hd + cis(headang)*perp to hd to hd + cis(-headang)*perp;
+      head  ̃ 0.1;
+      headang  ̃ 25;
+}
+.IE
+.
+.\" --------------------------------------------------------------------
+.\" Emacs settings
+.\" --------------------------------------------------------------------
+.
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
diff --git a/contrib/gideal/libfiles/circle.ideal 
b/contrib/gideal/libfiles/circle.ideal
new file mode 100644
index 0000000..988ba61
--- /dev/null
+++ b/contrib/gideal/libfiles/circle.ideal
@@ -0,0 +1,19 @@
+.\" from `Computing Science Technical Report No. 103'
+.\" IDEAL User’s Manual - Christopher J. Van Wyk
+.
+.IS
+circle {
+       var center, radius, z1, z2, z3;
+       put CIRCLE {
+               radius = 3;
+       }
+}
+.IE
+.
+.\" --------------------------------------------------------------------
+.\" Emacs settings
+.\" --------------------------------------------------------------------
+.
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
diff --git a/contrib/gideal/libfiles/dash.ideal 
b/contrib/gideal/libfiles/dash.ideal
new file mode 100644
index 0000000..8c746fb
--- /dev/null
+++ b/contrib/gideal/libfiles/dash.ideal
@@ -0,0 +1,18 @@
+.\" from `Computing Science Technical Report No. 103'
+.\" IDEAL User’s Manual - Christopher J. Van Wyk
+.
+.IS
+dash {
+     var start, end;
+     conn start to 0.25[start,end];
+     conn 0.75[start,end] to end;
+}
+.IE
+.
+.\" --------------------------------------------------------------------
+.\" Emacs settings
+.\" --------------------------------------------------------------------
+.
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
diff --git a/contrib/gideal/libfiles/rect.ideal 
b/contrib/gideal/libfiles/rect.ideal
new file mode 100644
index 0000000..70a215f
--- /dev/null
+++ b/contrib/gideal/libfiles/rect.ideal
@@ -0,0 +1,30 @@
+.\" from `Computing Science Technical Report No. 103'
+.\" IDEAL User’s Manual - Christopher J. Van Wyk
+.
+.IS
+rect {
+       var ne, nw, sw, se,
+       n, e, w, s, c,
+       ht, wd;
+       ne = se + (0,1)*ht;
+       nw = sw + (0,1)*ht;
+       ne = nw + wd;
+       n = (ne+nw)/2;
+       s = (se+sw)/2;
+       e = (ne+se)/2;
+       w = (nw+sw)/2;
+       c = (ne+sw)/2;
+       ht  ̃ 1;
+       wd  ̃ 1.5;
+       bdlist = ne, nw, sw, se;
+       conn ne to nw to sw to se to ne;
+}
+.IE
+.
+.\" --------------------------------------------------------------------
+.\" Emacs settings
+.\" --------------------------------------------------------------------
+.
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
diff --git a/contrib/gideal/libfiles/wavy.ideal 
b/contrib/gideal/libfiles/wavy.ideal
new file mode 100644
index 0000000..0e23940
--- /dev/null
+++ b/contrib/gideal/libfiles/wavy.ideal
@@ -0,0 +1,20 @@
+.\" from `Computing Science Technical Report No. 103'
+.\" IDEAL User’s Manual - Christopher J. Van Wyk
+.
+.IS
+wavy {
+       var start, end, perp, pt1, pt2, ht;
+       perp = (0,1)*(start - end)/abs(start - end);
+       pt1 = 0.25[start,end] + perp*ht;
+       pt2 = 0.75[start,end] - perp*ht;
+       conn start to pt1 to pt2 to end;
+}
+.IE
+.
+.\" --------------------------------------------------------------------
+.\" Emacs settings
+.\" --------------------------------------------------------------------
+.
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
diff --git a/src/roff/groff/groff.cpp b/src/roff/groff/groff.cpp
index 38b221f..9776473 100644
--- a/src/roff/groff/groff.cpp
+++ b/src/roff/groff/groff.cpp
@@ -178,7 +178,7 @@ int main(int argc, char **argv)
       commands[TBL_INDEX].set_name(command_prefix, "tbl");
       break;
     case 'J':
-      commands[_INDEX].set_name(command_prefix, "gideal");
+      commands[IDEAL_INDEX].set_name(command_prefix, "gideal");
       // need_pic = 1;
       break;
     case 'j':