diff --git a/chapters/functions.tex b/chapters/functions.tex index 045c859ae..bd31fc21d 100644 --- a/chapters/functions.tex +++ b/chapters/functions.tex @@ -2442,29 +2442,30 @@ \subsection{Annotations for External Libraries and Include Files}\label{annotati end MyExternalFunctions; \end{lstlisting} Directory structure: -\begin{lstlisting}[language=filehierarchy] -ExternalFunctions - package.mo // Modelica code from above - Resources - Include // Include files - ExternalFunc1.h // C header file - ExternalFunc2.h // C header file - ExternalFunc3.c // C source file (not ideal) - Library // Object libraries for different platforms - win32 - ExternalLib1.lib // Static link library for VisualStudio - ExternalLib2.lib // statically linking the dynamic link library - ExternalLib2.dll // Dynamic link library (with manifest) - linux32 - libExternalLib1.a // Static link library - libExternalLib2.so // Shared library - Source // Sources for library - Func1.c // C source for ExternalLib1.lib - Func2.c // C source for ExternalLib2.lib - HelperFunc.c // C source also included in ExternalLib2.lib -MyExternalFunctions - package.mo -\end{lstlisting} +\begin{tabbing} +\hspace{15em}\=\hspace{1em}\=\kill +\filename{ExternalFunctions}\\ +\quad\filename{package.mo} \>-- \>\emph{Modelica code from above}\\ +\quad\filename{Resources}\\ +\quad\quad\filename{Include} \>-- \>\emph{Include files}\\ +\quad\quad\quad\filename{ExternalFunc1.h} \>-- \>\emph{C header file}\\ +\quad\quad\quad\filename{ExternalFunc2.h} \>-- \>\emph{C header file}\\ +\quad\quad\quad\filename{ExternalFunc3.c} \>-- \>\emph{C source file (not ideal)}\\ +\quad\quad\filename{Library} \>-- \>\emph{Object libraries for different platforms}\\ +\quad\quad\quad\filename{win32}\\ +\quad\quad\quad\quad\filename{ExternalLib1.lib} \>-- \>\emph{Static link library for VisualStudio}\\ +\quad\quad\quad\quad\filename{ExternalLib2.lib} \> \>\emph{statically linking the dynamic link library}\\ +\quad\quad\quad\quad\filename{ExternalLib2.dll} \>-- \>\emph{Dynamic link library (with manifest)}\\ +\quad\quad\quad\filename{linux32}\\ +\quad\quad\quad\quad\filename{libExternalLib1.a} \>-- \>\emph{Static link library}\\ +\quad\quad\quad\quad\filename{libExternalLib2.so} \>-- \>\emph{Shared library}\\ +\quad\quad\filename{Source} \>-- \>\emph{Sources for library}\\ +\quad\quad\quad\filename{Func1.c} \>-- \>\emph{C source for \filename{ExternalLib1.lib}}\\ +\quad\quad\quad\filename{Func2.c} \>-- \>\emph{C source for \filename{ExternalLib2.lib}}\\ +\quad\quad\quad\filename{HelperFunc.c} \>-- \>\emph{C source also included in \filename{ExternalLib2.lib}}\\ +\filename{MyExternalFunctions}\\ +\quad\filename{package.mo}\\ +\end{tabbing} Note that calling the function \lstinline!MyExternalFunctions.ExternalFunc1! will use the header and library files from \lstinline!ExternalFunction!, the \lstinline!ExternalFunctions.Example! will not use \filename{ExternalFunc3.c}, and one library file may contain multiple functions. diff --git a/mlsshared.sty b/mlsshared.sty index db4c866fd..fbf8a717c 100644 --- a/mlsshared.sty +++ b/mlsshared.sty @@ -13,7 +13,7 @@ % white background due to anti-aliasing and similar effects. % Warning: Note that changing to a font with different width -- especially a wider one -- means % that existing manual line breaks are potentially becoming out of place. -\usepackage{newtxtt} +%\usepackage{newtxtt} \usepackage{listings} \usepackage{color} @@ -179,15 +179,6 @@ include,pragma,undef,warning} }[keywords,comments,strings,directives] -\lstdefinelanguage{filehierarchy}{% Language for use with the lstlisting environment. - basicstyle=\upshape\sffamily\smallifpdf, % Font size for displayed code listings. - alsoletter={.}, -% otherkeywords={-, =, +, [, ], (, ), \{, \}, :, *, !},% - sensitive=true, % just in case - comment=[l]{//}, % comment lines - morecomment=[s]{/*}{*/}, % comment blocs -}[comments] - \lstset{% backgroundcolor=\color{white}, % choose the background color mathescape=true,