Altro lavoro di correzione. Passato alla nuova versione di listings.

[gapil.git] / gapil.tex

diff --git a/gapil.tex b/gapil.tex
index bc8621d96efc774a2e6e5e6542e13a4a3bb7734d..f26a9b8835f1b1bc6cd33ee0ad7a44d57c9bb92c 100644 (file)
--- a/gapil.tex
+++ b/gapil.tex
@@ -15,7 +15,8 @@
 %% gapil.tex: file principale, gli altri vanno inclusi da questo.
 %%
 \documentclass[a4paper,11pt,twoside]{book}
-%\usepackage[T1]{fontenc}
+\usepackage[T1]{fontenc}
+\usepackage{ae,aecompl}
 \usepackage[latin1]{inputenc}
 %\usepackage[tex4ht, bookmarks=true]{hyperref}
 \usepackage[bookmarks=true]{hyperref}
@@ -26,8 +27,13 @@
 \usepackage{pst-node}
 \usepackage{graphicx}
 \usepackage[italian]{babel}
-\newcommand{\mkinputlistingplain}[1]{\lstinputlisting[labelstep=0,frame=,indent=1cm]{#1}}{}
-\newcommand{\mkinputlistinglines}[1]{\lstinputlisting[labelstep=0]{#1}}{}
+%\newcommand{\mkinputlistingplain}[1]{\lstinputlisting[labelstep=0,frame=,indent=1cm]{#1}}{}
+%\newcommand{\mkinputlistinglines}[1]{\lstinputlisting[labelstep=0]{#1}}{}
+
+\newcommand{\includecodesnip}[1]{\lstinputlisting[stepnumber=0,frame=]{#1}}{}
+\newcommand{\includestruct}[1]{\lstinputlisting[labelstep=0]{#1}}{}
+\newcommand{\includecodesample}[1]{\lstinputlisting{#1}}{}
+
 \usepackage{cite}
 \usepackage{amsmath}
 \usepackage{amsfonts}
@@ -40,6 +46,10 @@
 \usepackage{multirow}
 %\usepackage{footnote} 
 %\usepackage{mdwtab} 
+
+\def\tild{\char'176}
+
+
 %
 % Setting page layout
 %
@@ -98,12 +108,13 @@
 \lstset{language=C++} 
 
 \lstset{basicstyle=\small,
-  labelstyle=\tiny,
-  labelstep=1,
-  labelsep=2pt, 
+  numbers=left,
+  numberstyle=\tiny,
+  stepnumber=1,
+  numbersep=2pt, 
   frame=TB,
-  frametextsep=5pt,
-  indent=0.3cm,
+  framesep=5pt,
+%  xleftmargin=0.3cm,
   basicstyle=\ttfamily,
   keywordstyle=\color{blue}\ttfamily,
   ndkeywordstyle=\color{yellow}\ttfamily,