test/graphics_pdf_commentを修正

diff --git a/latex_mk/test/graphics_pdf_comment/Makefile b/latex_mk/test/graphics_pdf_comment/Makefile
index 758b8f1..986297c 100644 (file)
--- a/latex_mk/test/graphics_pdf_comment/Makefile
+++ b/latex_mk/test/graphics_pdf_comment/Makefile
@@ -6,26 +6,7 @@ CMP := cmp -s
 CP := cp
 CONVERT := convert
 
-all:
-       @$(MAKE) -s graphics_pdf_1.pdf
-       @$(ECHO) '--------------------'
-       @$(MAKE) -s graphics_pdf_2.pdf
-
-graphics_pdf_1.pdf: rebase
-       @$(ECHO) '---------- $@: $^ ----------'
-       @$(MAKE) -s graphics_pdf.pdf
-       $(CP) -v graphics_pdf.pdf $@
-
-graphics_pdf_2.pdf: update
-       @$(ECHO) '---------- $@: $^ ----------'
-       @$(MAKE) -s graphics_pdf.pdf
-       $(CP) -v graphics_pdf.pdf $@
-
-rebase:
-       $(CMP) tiger.pdf.base tiger.pdf || $(CP) -v tiger.pdf.base tiger.pdf
-
-update:
-       $(CONVERT) Panthera_tigris_tigris.jpg tiger.pdf
+all: graphics_pdf.pdf
 
 include latex.mk
 

diff --git a/latex_mk/test/graphics_pdf_comment/Panthera_tigris_tigris.jpg b/latex_mk/test/graphics_pdf_comment/Panthera_tigris_tigris.jpg
deleted file mode 100644 (file)
index 0bb8e7c..0000000
Binary files a/latex_mk/test/graphics_pdf_comment/Panthera_tigris_tigris.jpg and /dev/null differ

diff --git a/latex_mk/test/graphics_pdf_comment/graphics_pdf.tex b/latex_mk/test/graphics_pdf_comment/graphics_pdf.tex
index ecc9f0f..bab5fe0 100644 (file)
--- a/latex_mk/test/graphics_pdf_comment/graphics_pdf.tex
+++ b/latex_mk/test/graphics_pdf_comment/graphics_pdf.tex
@@ -1,15 +1,29 @@
 \documentclass{jsarticle}
 \usepackage[dvipdfmx,hiresbb]{graphicx}
 \begin{document}
-\includegraphics[width=15cm]{tiger.pdf}
-% \includegraphics[width=15cm]{tiger0.pdf}
 
-コメント処理の実験 % \includegraphics[width=15cm]{tiger1.pdf}
+\section{通常}
+画像\texttt{tiger1.pdf} が読み込まれる。
 
-\% \includegraphics[width=15cm]{tiger2.pdf}
+\includegraphics[width=15cm]{tiger1.pdf}
+
+\section{行頭からのコメント}
+コメント内の画像\texttt{tiger2.pdf} は読み込まれない。
+
+% \includegraphics[width=15cm]{tiger2.pdf}
+
+\section{行の途中でコメント}
+コメント内の画像\texttt{tiger3.pdf} は読み込まれてはならない。% \includegraphics[width=15cm]{tiger3.pdf}
+
+\section[行中に\%を挿入]{行中に\texttt{$\backslash$\%} を挿入}
+\verb|\%| の後に記載された画像\texttt{tiger4.pdf} は読み込まれる。
+
+\% \includegraphics[width=15cm]{tiger4.pdf}
+
+\section{\tt{verbatim}環境}
+\texttt{verbatim}環境内の画像\texttt{tiger5.pdf} は読み込まれない。
 
 \begin{verbatim}
-\includegraphics[width=15cm]{tiger3.pdf}
+\includegraphics[width=15cm]{tiger5.pdf}
 \end{verbatim}
-
 \end{document}

diff --git a/latex_mk/test/graphics_pdf_comment/tiger.pdf b/latex_mk/test/graphics_pdf_comment/tiger.pdf
deleted file mode 100644 (file)
index 401e9a6..0000000
Binary files a/latex_mk/test/graphics_pdf_comment/tiger.pdf and /dev/null differ

diff --git a/latex_mk/test/graphics_pdf_comment/tiger.pdf.base b/latex_mk/test/graphics_pdf_comment/tiger.pdf.base
deleted file mode 100644 (file)
index 401e9a6..0000000
Binary files a/latex_mk/test/graphics_pdf_comment/tiger.pdf.base and /dev/null differ

diff --git a/latex_mk/test/graphics_pdf_comment/tiger1.pdf b/latex_mk/test/graphics_pdf_comment/tiger1.pdf
new file mode 100644 (file)
index 0000000..5bf018a
Binary files /dev/null and b/latex_mk/test/graphics_pdf_comment/tiger1.pdf differ

diff --git a/latex_mk/test/graphics_pdf_comment/tiger2.pdf b/latex_mk/test/graphics_pdf_comment/tiger2.pdf
index f0a2fb4..5bf018a 100644 (file)
Binary files a/latex_mk/test/graphics_pdf_comment/tiger2.pdf and b/latex_mk/test/graphics_pdf_comment/tiger2.pdf differ

diff --git a/latex_mk/test/graphics_pdf_comment/tiger3.pdf b/latex_mk/test/graphics_pdf_comment/tiger3.pdf
index e69de29..5bf018a 100644 (file)
Binary files a/latex_mk/test/graphics_pdf_comment/tiger3.pdf and b/latex_mk/test/graphics_pdf_comment/tiger3.pdf differ

diff --git a/latex_mk/test/graphics_pdf_comment/tiger4.pdf b/latex_mk/test/graphics_pdf_comment/tiger4.pdf
new file mode 100644 (file)
index 0000000..5bf018a
Binary files /dev/null and b/latex_mk/test/graphics_pdf_comment/tiger4.pdf differ

diff --git a/latex_mk/test/graphics_pdf_comment/tiger5.pdf b/latex_mk/test/graphics_pdf_comment/tiger5.pdf
new file mode 100644 (file)
index 0000000..5bf018a
Binary files /dev/null and b/latex_mk/test/graphics_pdf_comment/tiger5.pdf differ