Merge branch 'origin/master' into eus10

euslisp · Oct 31, 2022 · 74ba19a · 74ba19a
2 parents 2937694 + 9b1a896
commit 74ba19a
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 28 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ references:
       name: Setup TeX
       command: |-
         sudo apt-get update
-        sudo apt-get install -qq -y texlive-latex-base ptex-bin latex2html nkf poppler-utils
+        sudo apt-get install -qq -y texlive-latex-base texlive-binaries texlive-lang-japanese latex2html nkf poppler-utils
   setup-eus: &setup-eus
     run:
       name: Setup EusLisp
@@ -24,7 +24,8 @@ references:
 
 jobs:
   html:
-    machine: true
+    machine:
+      image: ubuntu-2004:2022.07.1
     steps:
       - checkout
       - *setup-tex
@@ -41,19 +42,20 @@ jobs:
           command: |
             mkdir -p /tmp/html
             cp doc/html/*manual*.html /tmp/html
-            cp doc/html/*manual*.png /tmp/html
+            cp doc/html/*manual*.svg /tmp/html
       - store_artifacts:
           path: /tmp/html
       - persist_to_workspace:
           root: doc
           paths:
             - html/manual*.html
             - html/jmanual*.html
-            - html/manual*.png
-            - html/jmanual*.png
+            - html/manual*.svg
+            - html/jmanual*.svg
 
   latex:
-    machine: true
+    machine:
+      image: ubuntu-2004:2022.07.1
     steps:
       - checkout
       - *setup-tex
@@ -73,7 +75,8 @@ jobs:
           root: doc/latex
           paths: manual.pdf
   jlatex:
-    machine: true
+    machine:
+      image: ubuntu-2004:2022.07.1
     steps:
       - checkout
       - *setup-tex
@@ -93,13 +96,11 @@ jobs:
           root: doc/jlatex/
           paths: jmanual.pdf
   rst:
-    machine: true
+    machine:
+      image: ubuntu-2004:2022.07.1
     steps:
       - checkout
       - *setup-tex
-      - run:
-          name: Install Python3
-          command: pyenv global system 3.5.2
       - run:
           name: Install Pandoc
           command: sudo apt-get install -y -qq pandoc
@@ -142,7 +143,7 @@ jobs:
             git diff origin/master --name-only --relative doc
             if [ "`git diff origin/master  --name-only --relative doc`" == "" ]; then echo "No update in doc directory found, exitting... ";  circleci step halt; fi
             echo "Found new commit on doc directory"
-      - run: cd .circleci/ && git clone https://github.com/themadcreator/circle-github-bot.git
+      - run: cd .circleci/ && git clone https://github.com/k-okada/circle-github-bot.git
       - run: cd .circleci/circle-github-bot && npm install
       - run: cd .circleci/circle-github-bot && npm run build
       - run: .circleci/github-pr-update.js

diff --git a/doc/jlatex/Makefile b/doc/jlatex/Makefile
@@ -25,8 +25,14 @@ distclean: clean
 
 html:
 	rm -f ../html/jmanual*.
-	TRANSPARENT_COLOR="#ffffff" charset="UTF-8" latex2html -dir ../html/ -transparent -local_icons -split +3 -auto_prefix -init_file ../latex/.latex2html-init -iso_language JP -address "This document was generated using the LaTeX2HTML translator on `date` from <a href=\"http://github.com/euslisp/EusLisp.git\">EusLisp</a> version <a href=\"http://github.com/euslisp/EusLisp/commit/`git rev-parse --verify HEAD`\">`git log -1  --oneline`</a>" -html_version="4.0,unicode" jmanual
+	for psfile in fig/*.ps; do ps2eps -f -B $$psfile; done
+	sed -i.eps.bak s/\\.ps/\\.eps/g *.tex
+	(cd ../html; ln -sf ../latex/fig .)
+	TRANSPARENT_COLOR="#ffffff" charset="UTF-8" latex2html -rootdir ../html/ -transparent -local_icons -split +3 -auto_prefix -init_file ../latex/.latex2html-init -iso_language JP -address "This document was generated using the LaTeX2HTML translator on `date` from <a href=\"http://github.com/euslisp/EusLisp.git\">EusLisp</a> version <a href=\"http://github.com/euslisp/EusLisp/commit/`git rev-parse --verify HEAD`\">`git log -1  --oneline`</a>" -html_version="4.0,unicode" jmanual
 	(cd ../html; sed -i 's@"jmanual.css"@"manual.css"@' j*.html)
-	(cd ../html; for imgfile in jmanual-img*.png; do pngtopnm $$imgfile > /tmp/$$imgfile.pnm; pnmtopng -transparent white /tmp/$$imgfile.pnm > $$imgfile; done)
+	sed -i s@HREF=\"../jmanual@HREF=\"jmanual@ ../html/jmanual-node*.html
+	rm ../html/fig
+	for backup in *.eps.bak; do mv $$backup $$(basename $$backup .eps.bak); done
+	#(cd ../html; for imgfile in jmanual-img*.png; do pngtopnm $$imgfile > /tmp/$$imgfile.pnm; pnmtopng -transparent white /tmp/$$imgfile.pnm > $$imgfile; done)
 
 
diff --git a/doc/latex/Makefile b/doc/latex/Makefile
@@ -24,9 +24,15 @@ distclean: clean
 	rm -f *.dvi *.pdf
 
 html:
-	rm -f ../html/manual*.{old,html,png,pl} ../html/manual-images.*
-	TRANSPARENT_COLOR="#ffffff" latex2html -dir ../html/ -transparent -local_icons -split +3 -auto_prefix -iso_language JP -address "This document was generated using the LaTeX2HTML translator on `date` from <a href=\"http://github.com/euslisp/EusLisp.git\">EusLisp</a> version <a href=\"http://github.com/euslisp/EusLisp/commit/`git rev-parse --verify HEAD`\">`git log -1  --oneline`</a>" -html_version="4.0,unicode" manual
-	(cd ../html; for imgfile in manual-img*.png; do pngtopnm $$imgfile > /tmp/$$imgfile.pnm; pnmtopng -transparent white /tmp/$$imgfile.pnm > $$imgfile; done)
+	rm -f ../html/manual*.{old,html,png,svg,pl} ../html/manual-images.*
+	for psfile in fig/*.ps; do ps2eps -f -B $$psfile; done
+	sed -i.eps.bak s/\\.ps/\\.eps/g *.tex
+	(cd ../html; ln -sf ../latex/fig .)
+	TRANSPARENT_COLOR="#ffffff" latex2html -rootdir ../html/ -transparent -local_icons -split +3 -auto_prefix -iso_language JP -address "This document was generated using the LaTeX2HTML translator on `date` from <a href=\"http://github.com/euslisp/EusLisp.git\">EusLisp</a> version <a href=\"http://github.com/euslisp/EusLisp/commit/`git rev-parse --verify HEAD`\">`git log -1  --oneline`</a>" -html_version="4.0,unicode" manual
+	rm ../html/fig
+	for backup in *.eps.bak; do mv $$backup $$(basename $$backup .eps.bak); done
+	sed -i s@HREF=\"../manual@HREF=\"manual@ ../html/manual-node*.html
+	#(cd ../html; for imgfile in manual-img*.png; do pngtopnm $$imgfile > /tmp/$$imgfile.pnm; pnmtopng -transparent white /tmp/$$imgfile.pnm > $$imgfile; done)
 
 latex.py:
 	wget https://raw.githubusercontent.com/jobh/latex.py/master/latex.py
@@ -36,7 +42,7 @@ TEXFILES=$(filter-out manual.tex, $(wildcard *.tex))
 RSTFILES=$(TEXFILES:%.tex=%.rst)
 %.rst : %.tex
 	python3 latex.py -2 -L preamble.tex $< > /tmp/tmp_$^
-	pandoc /tmp/tmp_$^ -o $@ -V documentclass=ltjarticle --latex-engine=lualatex
+	pandoc /tmp/tmp_$^ -o $@ -V documentclass=ltjarticle
 	sed -i 's@.. figure:: \(.*\).ps@.. figure:: \1.png@g' $@  # use png for figures
 
 PSFILES=$(wildcard fig/*.ps)
@@ -53,7 +59,7 @@ manual.rst: latex.py $(RSTFILES) $(PNGFILES)
 	sed -i 's@\\part{\(.*\)}@.. toctree:: \1@' /tmp/manual.tex  # convert \part in tex to bypass pandoc
 	sed -i ':a;/^[^%].*\\\\$$/{N;s/\\\\\n//;ba}' /tmp/manual.tex # concatinate title/author multi lines
 	sed -i '/^\\vspace{10mm}$$/d' /tmp/manual.tex # remove vspace{10mm} within title to pass pandoc
-	pandoc --no-wrap -s /tmp/manual.tex -o manual.rst -V documentclass=ltjarticle --latex-engine=lualatex
+	pandoc --wrap=none -s /tmp/manual.tex -o manual.rst -V documentclass=ltjarticle
 	sed -i '[email protected]:: \(.*\)@   \1@' manual.rst # restore ..include for rst
 	sed -i 's@.. toctree:: \(.*\)@.. toctree::\n   :maxdepth: 1\n   :caption: \1@' manual.rst  # restore ..toctree for rst
 	sed -i 's@** Featuring@**\nFeaturing@' manual.rst # add newline before Featuring in title

diff --git a/doc/latex/intro.tex b/doc/latex/intro.tex
@@ -277,7 +277,7 @@ \subsection{Revision History}
             Version 9.14 is released, fix assert API. Now message is optional (defmacro assert (pred \&optional message)
             Version 9.15 is released, fix char comparison function (previous version retuns opossite result), support multiple argument at function /=,  add url encode feature (escape-url function), support microsecond add/subtract in interval-time class
             Version 9.16 is released, added make-random-state, fixed bug in lib/llib/unittest.l
-\item[2016] Version 9.17 is released, add trace option in (init-unit-test), enable to read \#f(nan inf)．fix models/doc.
+\item[2016] Version 9.17 is released, add trace option in (init-unit-test), enable to read \#f(nan inf). fix models/doc.
             Version 9.18 is released, support gcc-5.
             Version 9.20 is released, support OSX (gluTessCallback, glGenTexturesEXT), add GL\_COLOR\_ATTACHMENT constants, fix color-image class, (it uses RGB not BGR).
             Version 9.21 is released, fix :trim of hashtab class, enable to compile filename containing -, do not raise error when not found cygpq.dll (Cygwin)

diff --git a/doc/latex/manipulator.tex b/doc/latex/manipulator.tex
@@ -224,9 +224,9 @@ \subsection{
 
 
 \begin{verbatim}
-　(send eta3 :translate #f(0 0 -100))        ;put back the end-effector by 10cm
-　(send eta3 :translate #f(0 0 -100) :world) ;move down the end-effector by 10cm
-　(send eta3 :translate #f(0 0 -100)
+  (send eta3 :translate #f(0 0 -100))        ;put back the end-effector by 10cm
+  (send eta3 :translate #f(0 0 -100) :world) ;move down the end-effector by 10cm
+  (send eta3 :translate #f(0 0 -100)
              (manipulator-base eta3))  ;move down the end-effector with respect 
                                        ;to the coords of the base by 10cm
 \end{verbatim}

diff --git a/doc/latex/sysfunc.tex b/doc/latex/sysfunc.tex
@@ -20,7 +20,7 @@ \subsection{Memory Management}
 The expansion occurs either automatically on the fly
 or on user's explicit demand by calling {\bf system:alloc} function.
 When it is managed automatically, free memory size is kept
-about 40\% of total heap size. % by default,
+about 40\% of total heap size.
 This ratio can be changed by setting a value between 0.1 and 0.9 to
 the {\bf sys:*gc-margin*} parameter.
 

diff --git a/lisp/l/eusstart.l b/lisp/l/eusstart.l
@@ -350,7 +350,7 @@
                   gc alloc runtime))
 	(alias 'exit 'unix::exit)
 ;;
-;(when (substringp "P" (string-upcase *program-name*))
+;(when (substringp "P" (string-upcase (pathname-name *program-name*)))
 	(in-package "SYSTEM")
 	(system::exec-module-init "par" "l/par.l")
 ;;
@@ -369,9 +369,10 @@
 ;; load geometric package
 ;;
 
-(when (or (substringp "G" (string-upcase *program-name*))
-	  (substringp "X" (string-upcase *program-name*))
-	  (substringp "COMP" (string-upcase *program-name*)))
+(when (let ((*program-name* (string-upcase (pathname-name *program-name*))))
+        (or (substringp "G" *program-name*)
+            (substringp "X" *program-name*)
+            (substringp "COMP" *program-name*)))
 ;;	(format t "Loading geometry modules.~%")
 	(sys:alloc 80000)
 	(sys:alloc 50000)

diff --git a/lisp/xwindow/Xtop.l b/lisp/xwindow/Xtop.l
@@ -232,6 +232,9 @@
 	(setq font-helvetica-12 (font-id "*-Helvetica-Medium-R-Normal-*-12-*"))
 	(setq font-a14 (font-id "*-fixed-medium-r-normal-*-14-*"))
 
+	(when (zerop font-cour12)  ;; If we can not find font-cour12, use default value for all element
+	  (setq font-cour12 (font-id "*-*-*-*-*-*-*-*")))
+
 	(when (zerop font-cour12)  ;; this is default gc
 	  (setq *display* 0)
 	  (warning-message 1 "~%Xserver connection failed due to missing font server, please try after computer restarts~%")