From f3b96af52a06abbe2761b93f0b2806c7487ac09a Mon Sep 17 00:00:00 2001 From: Guilherme Affonso Date: Thu, 22 Sep 2022 22:22:38 +0900 Subject: [PATCH 01/15] Don't decide which packages to load based on full program path in eusstart.l --- lisp/l/eusstart.l | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lisp/l/eusstart.l b/lisp/l/eusstart.l index 0c682fc67..e69909e04 100644 --- a/lisp/l/eusstart.l +++ b/lisp/l/eusstart.l @@ -349,7 +349,7 @@ gc alloc runtime)) (setf (symbol-function 'exit) (symbol-function '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") ;; @@ -368,9 +368,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) From 2af12874a5263abfb0f9bf3cef7e4631bbc4ca3a Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 23 Sep 2022 12:36:09 +0900 Subject: [PATCH 02/15] .circleci/config.yml: specify machine images to 20.04 --- .circleci/config.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ba1a3306a..afc11d390 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,8 @@ references: jobs: html: - machine: true + machine: + image: ubuntu-2004:2022.07.1 steps: - checkout - *setup-tex @@ -53,7 +54,8 @@ jobs: - html/jmanual*.png 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,7 +96,8 @@ jobs: root: doc/jlatex/ paths: jmanual.pdf rst: - machine: true + machine: + image: ubuntu-2004:2022.07.1 steps: - checkout - *setup-tex From 2aab833ba3a3a05e3c3c812d2f2e702f0f763664 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 23 Sep 2022 12:55:09 +0900 Subject: [PATCH 03/15] .circleci/config.yml: ptex-bin was replaced with texlive-binaries --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index afc11d390..e7fb91f21 100644 --- 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 latex2html nkf poppler-utils setup-eus: &setup-eus run: name: Setup EusLisp From 8dbd1bca27c3d687e03db8b287d01505025a0e0d Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 23 Sep 2022 13:01:08 +0900 Subject: [PATCH 04/15] .circleci/config.yml: 20.04 support python3 nativly --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e7fb91f21..f1e127d19 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -101,9 +101,6 @@ jobs: 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 From 3c08d160a427225799657d22492ce70aa1befa44 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 23 Sep 2022 13:04:00 +0900 Subject: [PATCH 05/15] .circleci/config.yml: install texlive-lang-japanese for platex command --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f1e127d19..b7c45f6e8 100644 --- 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 texlive-binaries 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 From 737e363830ee1fa66bbe42404db59d50f40a2412 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 23 Sep 2022 13:50:41 +0900 Subject: [PATCH 06/15] doc/latex/Makefile: fix pandoc args --no-wrap has been removed. Use --wrap=none instead. --latex-engine has been removed. Use --pdf-engine instead. --- doc/latex/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/latex/Makefile b/doc/latex/Makefile index 1cf10adb3..c6d34e63d 100644 --- a/doc/latex/Makefile +++ b/doc/latex/Makefile @@ -36,7 +36,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 +53,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 's@..include:: \(.*\)@ \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 From 3aa47527329e803c1f4b7f2410db7d04907500cf Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 23 Sep 2022 13:55:54 +0900 Subject: [PATCH 07/15] doc/latex/sysfunc.tex: have two % in one line has trouble on 'make rst' pandoc /tmp/tmp_sysfunc.tex -o sysfunc.rst -V documentclass=ltjarticle Error at "source" (line 41, column 9): unexpected Tok "source" (line 41, column 9) Symbol "_" expecting end of input about 25_{_7} of total heap size. This ratio can be changed by setting a value between 0.1 and 0.9 to --- doc/latex/sysfunc.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/latex/sysfunc.tex b/doc/latex/sysfunc.tex index 4e0085e42..d2aaf239e 100644 --- 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 25\% of total heap size. % by default, +about 25\% 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. From 68a95177e92e4ba3bcec97db468e4a6ed821ee3b Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 23 Sep 2022 14:30:43 +0900 Subject: [PATCH 08/15] doc/latex/Makefile: Now, latex2html enable to convert images correctly --- doc/jlatex/Makefile | 2 +- doc/latex/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/jlatex/Makefile b/doc/jlatex/Makefile index fe681671d..23d86450c 100644 --- a/doc/jlatex/Makefile +++ b/doc/jlatex/Makefile @@ -27,6 +27,6 @@ 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 EusLisp version `git log -1 --oneline`" -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) + #(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 index c6d34e63d..c4e4d8cc1 100644 --- a/doc/latex/Makefile +++ b/doc/latex/Makefile @@ -26,7 +26,7 @@ distclean: clean 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 EusLisp version `git log -1 --oneline`" -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) + #(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 From 7eec9968cb30b3dbe63eea0d536a3a56b5d1891b Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Fri, 23 Sep 2022 14:48:03 +0900 Subject: [PATCH 09/15] .circleci/config.yml: latex2html outputs svg --- .circleci/config.yml | 6 +++--- doc/latex/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b7c45f6e8..b34e1c052 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,7 +42,7 @@ 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: @@ -50,8 +50,8 @@ jobs: paths: - html/manual*.html - html/jmanual*.html - - html/manual*.png - - html/jmanual*.png + - html/manual*.svg + - html/jmanual*.svg latex: machine: diff --git a/doc/latex/Makefile b/doc/latex/Makefile index c4e4d8cc1..151fae58c 100644 --- a/doc/latex/Makefile +++ b/doc/latex/Makefile @@ -24,7 +24,7 @@ distclean: clean rm -f *.dvi *.pdf html: - rm -f ../html/manual*.{old,html,png,pl} ../html/manual-images.* + rm -f ../html/manual*.{old,html,png,svg,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 EusLisp version `git log -1 --oneline`" -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) From 76367868f8d4b5b1ef65f5ed48f0fb727d4c666e Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Sat, 24 Sep 2022 14:00:44 +0900 Subject: [PATCH 10/15] doc/{latex,jlatex}/Makefile: use eps files for inclduegraphics --- doc/jlatex/Makefile | 3 +++ doc/latex/Makefile | 3 +++ 2 files changed, 6 insertions(+) diff --git a/doc/jlatex/Makefile b/doc/jlatex/Makefile index 23d86450c..9e64477b0 100644 --- a/doc/jlatex/Makefile +++ b/doc/jlatex/Makefile @@ -25,8 +25,11 @@ distclean: clean html: rm -f ../html/jmanual*. + for psfile in fig/*.ps; do ps2eps -f -B $$psfile; done + sed -i.eps.bak s/\\.ps/\\.eps/g *.tex 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 EusLisp version `git log -1 --oneline`" -html_version="4.0,unicode" jmanual (cd ../html; sed -i 's@"jmanual.css"@"manual.css"@' j*.html) + 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 index 151fae58c..bd361e1ed 100644 --- a/doc/latex/Makefile +++ b/doc/latex/Makefile @@ -25,7 +25,10 @@ distclean: clean html: 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 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 EusLisp version `git log -1 --oneline`" -html_version="4.0,unicode" manual + for backup in *.eps.bak; do mv $$backup $$(basename $$backup .eps.bak); done #(cd ../html; for imgfile in manual-img*.png; do pngtopnm $$imgfile > /tmp/$$imgfile.pnm; pnmtopng -transparent white /tmp/$$imgfile.pnm > $$imgfile; done) latex.py: From 7825a4f7920bf6d4c89718be1377fea01a9b5984 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Sat, 24 Sep 2022 15:10:10 +0900 Subject: [PATCH 11/15] doc/{latex,jlatex}/Makefile: use -rootdir instead of -dir, fix URL of navigation page --- doc/jlatex/Makefile | 3 ++- doc/latex/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/jlatex/Makefile b/doc/jlatex/Makefile index 9e64477b0..30cda9531 100644 --- a/doc/jlatex/Makefile +++ b/doc/jlatex/Makefile @@ -27,8 +27,9 @@ html: rm -f ../html/jmanual*. for psfile in fig/*.ps; do ps2eps -f -B $$psfile; done sed -i.eps.bak s/\\.ps/\\.eps/g *.tex - 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 EusLisp version `git log -1 --oneline`" -html_version="4.0,unicode" jmanual + 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 EusLisp version `git log -1 --oneline`" -html_version="4.0,unicode" jmanual (cd ../html; sed -i 's@"jmanual.css"@"manual.css"@' j*.html) + sed -i s@HREF=\"../jmanual@HREF=\"jmanual@ ../html/jmanual-node*.html 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 index bd361e1ed..c3d413b0d 100644 --- a/doc/latex/Makefile +++ b/doc/latex/Makefile @@ -27,8 +27,9 @@ html: 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 - 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 EusLisp version `git log -1 --oneline`" -html_version="4.0,unicode" manual + 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 EusLisp version `git log -1 --oneline`" -html_version="4.0,unicode" manual 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: From 6e26ea318f671af789d682090d68938aa1b6179a Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Sat, 24 Sep 2022 15:15:02 +0900 Subject: [PATCH 12/15] remove multi-byte charactors in latex/tex --- doc/latex/intro.tex | 2 +- doc/latex/manipulator.tex | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/latex/intro.tex b/doc/latex/intro.tex index f67a4a32c..4a1e63a36 100644 --- a/doc/latex/intro.tex +++ b/doc/latex/intro.tex @@ -283,7 +283,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 index 24fecdc85..003518aea 100644 --- 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} From dae9192743ad8fe2abad144bda0c41d03f0029dc Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Sat, 24 Sep 2022 15:33:44 +0900 Subject: [PATCH 13/15] doc/{latex,jlatex}/Makefile: add link from html/fig -> latex/fig, which needs after we changed from -dir to -rootdir in latex2html --- doc/jlatex/Makefile | 2 ++ doc/latex/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/doc/jlatex/Makefile b/doc/jlatex/Makefile index 30cda9531..917958b51 100644 --- a/doc/jlatex/Makefile +++ b/doc/jlatex/Makefile @@ -27,9 +27,11 @@ html: rm -f ../html/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 EusLisp version `git log -1 --oneline`" -html_version="4.0,unicode" jmanual (cd ../html; sed -i 's@"jmanual.css"@"manual.css"@' j*.html) 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 index c3d413b0d..6f4a19cbc 100644 --- a/doc/latex/Makefile +++ b/doc/latex/Makefile @@ -27,7 +27,9 @@ html: 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 EusLisp version `git log -1 --oneline`" -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) From c6c918201571f351f0e334f9372262231f50eaee Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Wed, 28 Sep 2022 10:39:38 +0900 Subject: [PATCH 14/15] update artifact link, see https://github.com/themadcreator/circle-github-bot/pull/26 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b34e1c052..3e9870003 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -143,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 From a5f48c74cf285a867a68c52fa52da4c105a2c8b7 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Wed, 5 Oct 2022 08:17:49 +0900 Subject: [PATCH 15/15] [WSL] XFonts is not available on wslg: Try to use default font set if font-cour12 is not found --- lisp/xwindow/Xtop.l | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lisp/xwindow/Xtop.l b/lisp/xwindow/Xtop.l index 89e563a31..b40c725ae 100644 --- 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~%")