From: Petter Reinholdtsen Date: Sat, 14 Oct 2023 21:35:15 +0000 (+0200) Subject: Bytt til US Trade (6x9") og basert sideutlegg på Free Culture-oppsettet. X-Git-Tag: edition-2023-10-17~60 X-Git-Url: https://pere.pagekite.me/gitweb/text-angrefrist.git/commitdiff_plain/6847a3511a972257e9c1039a92883b96bf26e43a Bytt til US Trade (6x9") og basert sideutlegg på Free Culture-oppsettet. --- diff --git a/Makefile b/Makefile index 82219a1..a73348f 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,34 @@ +DBLATEX = dblatex + +DBLATEX_OPTS = \ + -T simple \ + -b xetex \ + -r data/dblatex-postprocess \ + --xsl-user=data/user_param.xsl \ + --xsl-user=data/xetex_param.xsl \ + -V \ + -p data/pdf.xsl + all: rapport.pdf rapport.epub -rapport.xml: *.adoc +rapport.xml: *.adoc rapport-docinfo*.xml asciidoctor -b docbook5 -d book rapport.adoc rapport.pdf: rapport.xml - dblatex $^ + $(DBLATEX) $(DBLATEX_OPTS) $< rapport.epub: rapport.xml dbtoepub $^ +rapport-fop.fo: rapport.xml + xsltproc \ + --output $(subst .pdf,.fo,$@).new \ + data/stylesheet-fo.xsl \ + $< + xmllint --format $@.new > $@ + $(RM) $@.new + +rapport-fop.pdf: rapport-fop.fo + fop -c data/fop-params.xconf -fo $(subst .pdf,.fo,$@) -pdf $@ ; \ + clean: $(RM) *~ distclean: diff --git a/data/dblatex-postprocess b/data/dblatex-postprocess new file mode 100755 index 0000000..c008726 --- /dev/null +++ b/data/dblatex-postprocess @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +TEXFILE="$1" + +# Legg inn orddelingspunkt pÃ¥ problematiske ord for Ã¥ fÃ¥ jevnere +# høyrekant pÃ¥ tekstblokkene. LaTeX deler ikke ord med bindestrek +# automatisk, slik at endel ord blir veldig lange og stikker ut over +# kanten. Ønsker ikke endre i originalteksten, sÃ¥ vi skriver om +# aktuelle ord i latex-fila her til Ã¥ inneholde orddelingsmarkør i +# stedet. +sed -i \ + -e 's/kommersiell/kom\\-mer\\-siell/g' \ + -e 's/ /\\thinspace/g' \ + $TEXFILE + +exit 0 diff --git a/data/fop-params.xconf b/data/fop-params.xconf new file mode 100644 index 0000000..2e1aff1 --- /dev/null +++ b/data/fop-params.xconf @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/lulu.xsl b/data/lulu.xsl new file mode 100644 index 0000000..d3ca3ac --- /dev/null +++ b/data/lulu.xsl @@ -0,0 +1,46 @@ + + + + + + +0 + + + +6in +9in +0.8in +0.55in + + + +0.05in +0.15in + +0pt +1 + + + + +openright,twoside + + + + + \pagebreak +\thispagestyle{empty} +~ +\end{document} + + + + diff --git a/data/pdf.xsl b/data/pdf.xsl new file mode 100644 index 0000000..c05dd95 --- /dev/null +++ b/data/pdf.xsl @@ -0,0 +1,97 @@ + + + + + +linktocpage,colorlinks,linkcolor=black,urlcolor=black,pdfstartview=FitH + +0 + + + + + + + + +0 + +myclass +0 + +maxwidth=15.5cm,maxheight=12cm +no +0 +0 + +1 + + + + + + + + + +1 +0.8in +0.55in +0.55in +0.55in +a4paper,openright,twoside + + + +Crimson Text +Crimson Text +Crimson Text +Crimson Text +Crimson Text +Latin Modern Mono + + + + + + + + + + \footnotesize + + + + + + + + + + + + + + + + + + +% Trick to avoid many words sticking out of the right margin of the text. +% Need to add it here with the end notes, as only one +% latex.begindocument can be active. +\sloppy + +\begin{document} + + + + diff --git a/data/stylesheet-fo.xsl b/data/stylesheet-fo.xsl new file mode 100644 index 0000000..4d5797f --- /dev/null +++ b/data/stylesheet-fo.xsl @@ -0,0 +1,33 @@ + + + + + + + + 1 + + diff --git a/data/user_param.xsl b/data/user_param.xsl new file mode 100644 index 0000000..21c2b15 --- /dev/null +++ b/data/user_param.xsl @@ -0,0 +1,62 @@ + + + + + + maybe + 1 + utf8 + 1 + nohyphen + + + + + + false + book toc title + + + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + diff --git a/data/xetex_param.xsl b/data/xetex_param.xsl new file mode 100644 index 0000000..ad994d8 --- /dev/null +++ b/data/xetex_param.xsl @@ -0,0 +1,109 @@ + + + + + + + \setmainfont{Crimson Text} + \setsansfont{Crimson Text} + \setmonofont{Latin Modern Mono} + + + + + + + + + + + + \setmainfont[SmallCapsFont={Alegreya SC}]{Alegreya} + \setsansfont{Alegreya Sans} + \setmonofont{DejaVu Sans Mono} + + + \newfontfamily\indexfont[Scale=0.7, + BoldFeatures={Scale=1}]{Alegreya} + + + + \setmainfont[SmallCapsFont={Alegreya SC}]{Gandhi Serif} + \setsansfont{Gandhi Sans} + \setmonofont{DejaVu Sans Mono} + + + \newfontfamily\indexfont[Scale=0.7, + BoldFeatures={Scale=1}]{Gandhi Serif} + + + + + + + + + + + + + + + + + + + + + + + + + \begin{colophon} + + \end{colophon} + + + + + titlepg.input.rtex + + + + + + + + + + + + + + + + + + + + + + \textsc{ + + } + + + + + + + + diff --git a/myclass.cls b/myclass.cls new file mode 100644 index 0000000..73d0869 --- /dev/null +++ b/myclass.cls @@ -0,0 +1,215 @@ +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{myclass}[] + +%% Just use the original class and pass the options +\LoadClassWithOptions{report} +% report, book, memoir, scrreprt or scrbook ? + +% Show frames, make it easier to debug borders +%\usepackage{showframe}% http://ctan.org/pkg/showframe +\makeatletter + +% +% Customize the titlepage: remove the date, place the publisher name, and +% load a specific file for the verso page, containing some legal notices +% +\def\maketitle{% + \titlerecto% + \titleverso} + +\def\titlerecto{\begin{titlepage}% + \null\vfil + \vskip 160\p@ + \begin{center}% + {\LARGE \@title \par}% + \vskip 3em% + {\Large + \lineskip .75em% + \begin{tabular}[t]{c}% + \@author + \end{tabular}\par}% + \vskip 20em% + {\large \DBKpublishername \par} + \vskip .75em% + {\large \DBKpublisheraddress \par}% + \end{center}\par + \vfil\null + \end{titlepage}}% + +\def\titleverso{% + \def\titlepagefile{titlepg.input.tex} + \IfFileExists{\titlepagefile}{\input{\titlepagefile}}{} +}% + + +% Divide by 2 the index item indentation (10pt -> 5pt) +\renewcommand\@idxitem{\par\hangindent 20\p@} +\renewcommand\subitem{\@idxitem \hspace*{10\p@}} +\renewcommand\subsubitem{\@idxitem \hspace*{15\p@}} + +% Put the index in the TOC +\let\stdindex=\theindex +\let\endstdindex=\endtheindex +\renewenvironment{theindex}{ + \begin{stdindex} + \@ifundefined{chapter}{}{ + % To not have the number, replace by: + % \addcontentsline{toc}{chapter}{\numberline{}\indexname} + \refstepcounter{chapter} + \ifnum \c@secnumdepth >\z@ + \ifnum \value{part} >\z@ + \addcontentsline{toc}{part}{\numberline{\thechapter}\hspace{-1em}\indexname} + \else + \addcontentsline{toc}{chapter}{\numberline{\thechapter}\indexname} + \fi + \else + \addcontentsline{toc}{chapter}{\indexname} + \fi + } + % Adapt the vertical sizes to the smaller font + \setlength{\baselineskip}{0.7\baselineskip}% + \setlength{\parskip}{0.2\baselineskip}% + \indexfont +}{ + \end{stdindex} +} +\makeatother + +\newenvironment{colophon}{ + \pagebreak % +% FIXME change when page size changes, use {x}{x*1.2} + +% Note, these numbers are not correct any more for the sizes mentioned: +% \fontsize{6.5}{7.8}\selectfont % fits in one 4.25x6.875" pocket size page +% \fontsize{7.5}{9}\selectfont % fits in one 5.06x7.71" size page +% \fontsize{9.1}{10.92}\selectfont % fits in one 5.5x8.5" digest size page + + \fontsize{8.2}{9.84}\selectfont % fits in one 6x9'' size page + \setlength{\parskip}{0.5em} % + \setlength{\parindent}{0pt} % +}{} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Based on ideas from https://bugs.debian.org/684772 +\usepackage{titlesec} +\usepackage{titletoc} +% +% Useless with unnumbered sections (e.g. use of \setcounter{secnumdepth}{0}) +% +% +\newcommand\makeletterof[1]{% +\ifthenelse{\equal{#1}{1}}{EN}{% +\ifthenelse{\equal{#1}{2}}{TO}{% +\ifthenelse{\equal{#1}{3}}{TRE}{% +\ifthenelse{\equal{#1}{4}}{FIRE}{% +\ifthenelse{\equal{#1}{5}}{FEM}{% +\ifthenelse{\equal{#1}{6}}{SEKS}{% +\ifthenelse{\equal{#1}{7}}{SJU}{% +\ifthenelse{\equal{#1}{8}}{ÅTTE}{% +\ifthenelse{\equal{#1}{9}}{NI}{% +\ifthenelse{\equal{#1}{10}}{TI}{% +\ifthenelse{\equal{#1}{11}}{ELLEVE}{% +\ifthenelse{\equal{#1}{12}}{TOLV}{% +#1}}}}}}}}}}}}} + +% Make TOC entries without label +\titlecontents{chapter} % +[1.5em] % +{\addvspace{0.3em plus 0pt}\bfseries} % +{\hspace{-1.3em}} % no number, remove room reserved for it +{\hspace{-1.3em}} % +{\hfill \contentspage} % dots and page number +[\addvspace {0pt}] + +\dottedcontents{section} % +[0em] % was (3.8) +{\addvspace{0pt}} % +{2.3em} % tab +{0.75em} % space between dots +[\addvspace{0pt}] + +%% Redefines the headings to remove the chapter label +\titleformat{\chapter}[block] +{\filcenter\Large}{\filcenter}{20pt}{\Large} + +\titleformat{\section} +{\filcenter\Large\bfseries}{\thesection}{1em}{} + +\titleformat{\subsection} +{\filcenter\large\bfseries}{\thesubsection}{1em}{} + +%% New header, behaving like a section but formatted differently +\titleclass{\enoteheader}{straight}[\chapter] +\newcounter{enoteheader} +\renewcommand{\theenoteheader}{\Alph{enoteheader}} + +\titleformat{\enoteheader} +{\normalfont\large}{}{0pt}{} +\titlespacing*{\enoteheader}{0pt}{2.5ex plus 1ex minus .2ex}{1.3ex plus .2ex} + +\dottedcontents{enoteheader} % +[0em] % was (3.8) +{\addvspace{0pt}} % +{2.3em} % tab +{0.75em} % space between dots +[\addvspace{0pt}] + +%% New header, behaving like a chapter but formatted differently +\titleclass{\lotheader}{top}[\part] +\newcounter{lotheader} +\renewcommand{\thelotheader}{\Alph{lotheader}} + +\titleformat{\lotheader}[block] +{\filcenter\huge}{\filcenter}{20pt}{\Huge} +\titlespacing*{\lotheader}{0pt}{-30pt}{40pt} + +% Use the new header in TOC +\let\stdtoc=\tableofcontents +\let\stdchapter=\chapter +\def\tableofcontents{\let\chapter\lotheader \stdtoc{} \let\chapter\stdchapter} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% From +% https://amyrhoda.wordpress.com/2012/06/04/latex-to-lulu-the-making-of-aosa-other-useful-packages-and-settings/ + +% The microtype package provides the ability to micromanage your +% typography. When invoked without any options it does some nice things +% like protruding punctuation over the edge of the right margin to make +% the margin appear smoother. Basically it makes your book look more +% professional with very little effort. It also has a ton of options if +% you want to micromanage even more. +\usepackage{microtype} + +% By dafault, LaTeX will try and make all your pages the length that +% you set using the geometry setting. If a page has images, tables, +% headings or paragraph breaks which make it shorter than that page +% length, LaTeX will pad the page by adding whitespace between +% elements. We thought that looked sillier than having pages be +% different lengths, so we used the raggedbottom command. +\raggedbottom + +% Hint for figure with empty title: remove the colon label separator +\usepackage{caption} +\captionsetup[figure]{labelsep=none} + +% Fix the page number reset done by abstract by redefining it +% Patch from +% https://github.com/petterreinholdtsen/free-culture-lessig/pull/7 + +\def\nocount#1#2{} +\let\stdsetcounter\setcounter +\let\stdabstract=\abstract +\let\endstdabstract=\endabstract +\renewenvironment{abstract}{% + \let\setcounter\nocount% + \begin{stdabstract}% + \noindent% + \setlength\parskip{\medskipamount}% + \setlength\parindent{0pt}% +}{ + \end{stdabstract} + \let\setcounter\stdsetcounter +} diff --git a/rapport-docinfo-footer.xml b/rapport-docinfo-footer.xml new file mode 100644 index 0000000..3460f07 --- /dev/null +++ b/rapport-docinfo-footer.xml @@ -0,0 +1,87 @@ + + + + +Virkninger av angrefristloven: Sluttrapport til oppdragsgiverne / +Ole-Erik Yrvin. + + + +Første gang publisert i 1979. + + + + Denne utgaven ble publisert av Petter Reinholdtsen 2023. + + + +Typesatt med +dblatex og +skrifttypen Crimson Text. + + + + Omslaget er laget av Petter Reinholdtsen. Figurer i boken er + gjentegnet av Petter Reinholdtsen basert pÃ¥ originalfigurene fra + 1979. + + + + Kildefilene er tilgjengelig fra + . Rapporter + eventuelle kommentarer og innspill om boken der. + + + + + + + + Denne dokumentet faller inn under unntakene i Ã¥ndsverkslovens § 14, + og er ikke opphavsrettslig vernet. For Ã¥ gjøre det enklere for folk + utenfor Norge, er den ogsÃ¥ publisert med bruksvilkÃ¥rene til Creative + Commons 0. For mer informasjon om disse bruksvilkÃ¥rene, besøk + . + + + + Videredistribusjon og bruk i kildeformat (Asciidoc) og + kompilert form (XML, HTML, PDF, PostScript, RTF og sÃ¥ videre) er + tillatt bÃ¥de med og uten endringer. + + + + + + + + + + Format / MIME-type + ISBN + + + + + + US Trade utgave fra lulu.com + 978-82-93828-18-1 + + + application/pdf + *978-82-93828-19-8 + + + application/epub+zip + 978-82-93828-20-4 + + + + + + + diff --git a/rapport-docinfo.xml b/rapport-docinfo.xml index 62ab1f8..3c55e38 100644 --- a/rapport-docinfo.xml +++ b/rapport-docinfo.xml @@ -1,7 +1,7 @@ 2023-10-15 1 - Denne spesifikasjonen faller inn under unntakene i + Denne dokumentet faller inn under unntakene i Ã¥ndsverkslovens § 14«Lover, forskrifter, rettsavgjørelser og andre vedtak av offentlig myndighet er uten vern etter denne loven. Det samme gjelder forslag, utredninger, diff --git a/rapport.adoc b/rapport.adoc index 6f8f4c1..7b7b6a9 100644 --- a/rapport.adoc +++ b/rapport.adoc @@ -1,6 +1,6 @@ = Virkninger av angrefristloven: Sluttrapport til oppdragsgiverne :lang: nb -:docinfo: private-head +:docinfo: private-head,private-footer include::rapport-forord.adoc[]