Merge branch 'master' into fix-calc-static-balance-point

euslisp · Jun 6, 2019 · 5653165 · 5653165
2 parents 1f4ef9e + c1e604f
commit 5653165
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -43,21 +43,11 @@ matrix:
       sudo: required
       cache: apt
       env: DOCKER_IMAGE=osrf/ubuntu_arm64:xenial
-    - os: linux
-      dist: trusty
-      sudo: required
-      cache: apt
-      env: DOCKER_IMAGE=debian:jessie
     - os: linux
       dist: trusty
       sudo: required
       cache: apt
       env: DOCKER_IMAGE=debian:stretch
-    - os: linux
-      dist: trusty
-      sudo: required
-      cache: apt
-      env: DOCKER_IMAGE=osrf/debian_arm64:jessie
     - os: linux
       dist: trusty
       sudo: required

diff --git a/doc/jmanual.dvi b/doc/jmanual.dvi
diff --git a/doc/jmanual.pdf b/doc/jmanual.pdf
diff --git a/doc/jmanual.tex b/doc/jmanual.tex
@@ -115,14 +115,14 @@
 \newcommand{\bfx}[1]{\index{#1}{\bf #1}}
 \newcommand{\emx}[1]{\index{#1}{\em #1}}
 
-\newcommand{\longdescription}[3]{
-\index{#1}
-\begin{emtabbing}
-{\bf #1} 
-\it #2
+\newcommand{\longdescription}[4]{
+\index{#2}
+\begin{tabbing}
+{\bf #2} \rm \hspace{3mm} \= \`[#1] \\
+\> \it #3
+\end{tabbing}
 \rm
-\end{emtabbing}
-\desclist{#3}
+\desclist{#4}
 }
 
 \newcommand{\funcdesc}[3]{\functiondescription{#1}{#2}{関数}{#3}}