From 2ed35162ee525d2167baf0195c9244e5ff507a33 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 24 Mar 2014 13:22:11 +0100 Subject: [PATCH 1/1] Tweak newfeatures and get bacula.sty correct --- docs/manuals/bacula.sty | 2 +- docs/manuals/bacula.sty.in | 130 +++++++++++++++++++++++++++ docs/manuals/en/main/newfeatures.tex | 29 ++---- docs/update_version | 1 + 4 files changed, 140 insertions(+), 22 deletions(-) create mode 100644 docs/manuals/bacula.sty.in diff --git a/docs/manuals/bacula.sty b/docs/manuals/bacula.sty index ef97379f..1a435dc5 100644 --- a/docs/manuals/bacula.sty +++ b/docs/manuals/bacula.sty @@ -79,7 +79,7 @@ \pdfminorversion=4 -\def\version{@VERSION@} +\def\version{5.3.4} %% diff --git a/docs/manuals/bacula.sty.in b/docs/manuals/bacula.sty.in new file mode 100644 index 00000000..ef97379f --- /dev/null +++ b/docs/manuals/bacula.sty.in @@ -0,0 +1,130 @@ +%% bacula.sty +%% Provides macros and other stuff for the bacula manual +%% +%% Original Creation -- K. Cunningham 2005-01-09 +%% +%% +%% +%% New Commands Currently implemented: +%% +%% \elink{target}{text} +%% Inserts the text indicated (highlighted) and provides +%% an external hyperlink to the target. +%% +%% +%% \ilink{target}{text} +%% Inserts the text indicated (highlighted) and provides +%% an internal hyperlink to the target. Target must be a +%% \label somewhere in the same document. +%% +%% \lt +%% Inserts a less-than character (<). +%% +%% \gt +%% Inserts a greater-than character (>). +%% +%% \idir +%% Inserts the path to the images +%% +%% +%% +\ProvidesPackage{bacula}[2008/10/03] +\usepackage{ltxtable,varioref} +\usepackage{babel,xr-hyper} +\usepackage{xr} +\input{external-references} +%% +%% +\def\idir{} +\newcolumntype{Y}{>{\centering\arraybackslash}X} +%% LaTeX GraphicPath directive is able to manage this. +%% manuals/_lang_/_manual_name/ +\graphicspath{{../../../images/pdf/}{../../../images/png/}{../../../images/jpeg/}{../../../images/}{../../../images/eps/}{../../../images/hires/}} +%% In tex files: do _not_ put the filename extension +%% Below, define the precedence for filetypes +\include{graphicspolicy} +%% Some definition for external references. +\def\mbacula{Bacula Community} +\def\miscman{\mbacula{} Misc Manual} +\def\consoleman{\mbacula{} Console Manual} +\def\mainman{\mbacula{} Main Manual} +\def\devman{\mbacula{} Developers Manual} +\def\utilityman{\mbacula{} Utility programs} +\def\problemsman{\mbacula{} Problem Resolution Guide} +%% +%% eXternal References macro: borgxrlink +%%% #1: Text to display +%%% #2: Label defined +%%% #3: manual: main, console, misc, developers +%%% #4: text as reference level. will be displayed ``as is'' +%%% +%%% Example: +%%% \borgxrlink{Console Configuration}{ConsoleConfChapter}{main}{chapter} +%%% will display +%%% Console Configuration chapter (chapter 30 on page 269) +\newcommand*{\borgxrlink}[4]{% + \href{../#3/#3}{\textbf{#1}} #4 (#4 \vref{#3-#2}) +} +%% +%% Same for pointing to document. +%% \borgxrlinkdocument{Text}{label}{manual}{type-of-reference} +%% Will display +%% Text (chapter XX on page YY) +\newcommand*{\borgxrlinkdocument}[4]{% + \href{../#3/#3}{\textbf{#1}} (#4 \vref{#3-#2}) +} + +\usepackage{multirow} +\def\arraystretch{1.5} +\pdfminorversion=4 + + +\def\version{@VERSION@} + + +%% +\newcommand*{\elink}[2]{% + %\htmladdnormallink{#1}{#2}% + \href{#2}{#1} +} +%% +\newcommand*{\ilink}[2]{% + \htmlref{\textcolor{black}{#1}}{#2}% +% #1 (cf. \vref{#2})%\htmlref{#1}{#2}% +} +\newcommand*{\borgref}[1]{% + %% displays 'the_reference on page p' + \vref{#1} +} +%% +\newcommand{\dq}{\verb+"+} +\newcommand{\vb}{$|$} +\newcommand{\lt}{$<$} +\newcommand{\gt}{$>$} + +%% copied from /usr/share/texmf/tex/latex/base/book.cls, and +%% modified to suit. KEC 4-28-05 +%% KEC: Removed the two-column arrangement, and added \newpage +\renewenvironment{theindex} + {\if@twocolumn + \@restonecolfalse + \else + \@restonecoltrue + \fi +%% KEC: Switch to one column. +%% \columnseprule \z@ +%% \columnsep 35\p@ +%% \twocolumn[\@makeschapterhead{\indexname}]% + \@mkboth{\MakeUppercase\indexname}% + {\MakeUppercase\indexname}% + \clearpage + \subsection*{\indexname} + \addcontentsline{toc}{subsection}{\indexname} + \thispagestyle{plain}\parindent\z@ + \parskip\z@ \@plus .3\p@\relax + \let\item\@idxitem} + {\if@restonecol\onecolumn\else\clearpage\fi} %% Is this needed??? + +%% +\endinput +%% diff --git a/docs/manuals/en/main/newfeatures.tex b/docs/manuals/en/main/newfeatures.tex index 50d8f559..a1ba119a 100644 --- a/docs/manuals/en/main/newfeatures.tex +++ b/docs/manuals/en/main/newfeatures.tex @@ -52,28 +52,15 @@ a bconsole command {\bf status scheduled} produces: \begin{verbatim} Scheduled Jobs: -Level Type Pri Scheduled Job Name Schedule +Level Type Pri Scheduled Job Name Schedule ====================================================================== -Differential Backup 10 Sun 30-Mar 23:05 BackupClient1 WeeklyCycle -Incremental Backup 10 Mon 24-Mar 23:05 BackupClient1 WeeklyCycle -Incremental Backup 10 Tue 25-Mar 23:05 BackupClient1 WeeklyCycle -Incremental Backup 10 Wed 26-Mar 23:05 BackupClient1 WeeklyCycle -Incremental Backup 10 Thu 27-Mar 23:05 BackupClient1 WeeklyCycle -Incremental Backup 10 Fri 28-Mar 23:05 BackupClient1 WeeklyCycle -Incremental Backup 10 Sat 29-Mar 23:05 BackupClient1 WeeklyCycle -Incremental Backup 10 Mon 31-Mar 23:05 BackupClient1 WeeklyCycle -Incremental Backup 10 Tue 01-Apr 23:05 BackupClient1 WeeklyCycle -Incremental Backup 10 Wed 02-Apr 23:05 BackupClient1 WeeklyCycle -Full Backup 11 Mon 24-Mar 23:10 BackupCatalog WeeklyCycleAfterBackup -Full Backup 11 Tue 25-Mar 23:10 BackupCatalog WeeklyCycleAfterBackup -Full Backup 11 Wed 26-Mar 23:10 BackupCatalog WeeklyCycleAfterBackup -Full Backup 11 Thu 27-Mar 23:10 BackupCatalog WeeklyCycleAfterBackup -Full Backup 11 Fri 28-Mar 23:10 BackupCatalog WeeklyCycleAfterBackup -Full Backup 11 Sat 29-Mar 23:10 BackupCatalog WeeklyCycleAfterBackup -Full Backup 11 Sun 30-Mar 23:10 BackupCatalog WeeklyCycleAfterBackup -Full Backup 11 Mon 31-Mar 23:10 BackupCatalog WeeklyCycleAfterBackup -Full Backup 11 Tue 01-Apr 23:10 BackupCatalog WeeklyCycleAfterBackup -Full Backup 11 Wed 02-Apr 23:10 BackupCatalog WeeklyCycleAfterBackup +Differential Backup 10 Sun 30-Mar 23:05 BackupClient1 WeeklyCycle +Incremental Backup 10 Mon 24-Mar 23:05 BackupClient1 WeeklyCycle +Incremental Backup 10 Tue 25-Mar 23:05 BackupClient1 WeeklyCycle +... +Full Backup 11 Mon 24-Mar 23:10 BackupCatalog WeeklyCycleAfterBackup +Full Backup 11 Wed 26-Mar 23:10 BackupCatalog WeeklyCycleAfterBackup +... ==== \end{verbatim} diff --git a/docs/update_version b/docs/update_version index db455eda..bda59d29 100755 --- a/docs/update_version +++ b/docs/update_version @@ -16,4 +16,5 @@ DATE=`sed -n -e 's/^#define BDATE.*"\(.*\)"$/\1/p' ${BACULA_SOURCE}/version.h` echo "s%@VERSION@%${VERSION}%g" >${out} echo "s%@DATE@%${DATE}%g" >>${out} sed -f ${out} manuals/version.tex.in >manuals/version.tex +sed -f ${out} manuals/bacula.sty.in >manuals/bacula.sty rm -f ${out} -- 2.39.2