![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package texlive-specs-g for openSUSE:Factory checked in at 2015-04-25 09:50:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-g (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-g.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-g" Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-g/texlive-specs-g.changes 2015-02-24 13:01:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.texlive-specs-g.new/texlive-specs-g.changes 2015-04-25 09:52:05.000000000 +0200 @@ -1,0 +2,72 @@ +Wed Apr 15 13:43:57 UTC 2015 - werner@suse.de + +- Handle unkown scripts + +------------------------------------------------------------------- +Tue Apr 14 13:53:08 UTC 2015 - werner@suse.de + +- Make sure that tabs are used within <<-EOF...EOF pair + +------------------------------------------------------------------- +Thu Apr 2 12:25:21 UTC 2015 - werner@suse.de + +- Package pas-cours: move runfiles from doc to working directory + +------------------------------------------------------------------- +Thu Apr 2 10:33:38 UTC 2015 - werner@suse.de + +- Handle rpmlintrc for each meta spec file its self + +------------------------------------------------------------------- +Wed Apr 1 16:47:12 UTC 2015 - werner@suse.de + +- The new TeXLive package layout had suppressed the detection of many + Provides which is fixed now. +- The null.tex is now in texlive-knuth-lib, therefore require + tex(null.tex) in luatex.requires and tex.requires instead of the + gone texlive-misc. + +------------------------------------------------------------------- +Wed Apr 1 07:47:29 UTC 2015 - werner@suse.de + +- Add exceltex.requires which now Requires perl(Spreadsheet::ParseExcel) + (boo#891617) +- Patch kpathsea_cnf.dif moved from texlive-specs-m to texlive-specs-l + +------------------------------------------------------------------- +Mon Mar 30 08:39:12 UTC 2015 - werner@suse.de + +- Add patch dvips_config.dif (boo#897284) +- Remove patch pgf_plain.dif as now upstream +- Remove patch latexdiff_env.dif as the affected file is gone +- Modified patches + luaotfload_varfonts.dif + tetex_scripts.dif + tex4ht_env.dif +- Removed files pst-node.moves and pst-plot.moves as now the files + are at the correct location + +------------------------------------------------------------------- +Thu Mar 26 14:05:48 UTC 2015 - werner@suse.de + +- Update to TeXLive 2014 (timestamp 20140525 revision 34252) + * Support DVIPDFMx + * [fix] avoid luatex crash under math_mode 'decimal' + * luaotfload: Fix incorrect handling of font file formats luaotfload) + * Sync with Context beta as of 2014-04-05 + * pdfTeX: sync with Knuth TeX 3.14159265, e-TeX 2.6 + * Many more ... + +------------------------------------------------------------------- +Fri Feb 27 12:33:49 UTC 2015 - coolo@suse.com + +- patch -p1 from within texmf-dist to avoid patching through symlinks + to please new patch + +------------------------------------------------------------------- +Thu Feb 26 13:30:39 UTC 2015 - coolo@suse.com + +- avoid bootstrap problems by ignoring built packages for packages + required by texlive + +------------------------------------------------------------------- Old: ---- dtl.tar.xz New: ---- docbytex.doc.tar.xz docbytex.tar.xz dtl.doc.tar.xz dvips_config.dif economic.doc.tar.xz economic.tar.xz efbox.doc.tar.xz efbox.tar.xz embedall.doc.tar.xz embedall.tar.xz enctex.doc.tar.xz enctex.tar.xz texlive-specs-g-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-g.spec ++++++ ++++ 5102 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-g/texlive-specs-g.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-g.new/texlive-specs-g.spec ++++++ documentation.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/documentation.doc.tlpobj new/tlpkg/tlpobj/documentation.doc.tlpobj --- old/tlpkg/tlpobj/documentation.doc.tlpobj 2012-02-17 04:31:35.000000000 +0100 +++ new/tlpkg/tlpobj/documentation.doc.tlpobj 2014-01-23 03:23:37.000000000 +0100 @@ -1,6 +1,6 @@ name documentation.doc category Package -revision 25405 +revision 32761 shortdesc doc files of documentation relocated 1 docfiles size=28 ++++++ documentation.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/documentation.tlpobj new/tlpkg/tlpobj/documentation.tlpobj --- old/tlpkg/tlpobj/documentation.tlpobj 2012-02-17 04:31:35.000000000 +0100 +++ new/tlpkg/tlpobj/documentation.tlpobj 2014-01-23 03:23:38.000000000 +0100 @@ -1,6 +1,6 @@ name documentation category Package -revision 25405 +revision 32761 shortdesc Documentation support for C, Java and assembler code. relocated 1 longdesc The package provides a simple means of typesetting computer ++++++ droit-fr.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/droit-fr/CHANGELOG new/doc/latex/droit-fr/CHANGELOG --- old/doc/latex/droit-fr/CHANGELOG 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/droit-fr/CHANGELOG 2014-02-09 00:11:50.000000000 +0100 @@ -0,0 +1,62 @@ +Version 0.4 +=========== + +Packages requis: +- biblatex (version 2.0 ou plus) +- biber (version 1.0 ou plus) + +I. Classe de document +--------------------- +- ajout commandes relatives à l'index d'auteurs par versets +- ajout commandes de customisation des versets +- ajout automatique d'un point final dans le libellé d'un verset, si ce libellé n'est pas déjà terminé par un caractère de ponctuation +- suppression de messages "Hfootnote ..." lorsque l'option footnotereset=true est activée + +II. Style bibliographique +------------------------- +- nouveau mécanisme de rattachement dans les entrées de jurisprudence via le champ "related": une liste de @commentary peut être spécifiée directement dans une entrée de type @jurisdiction via le champ "related". Ce nouveau mécanisme permet de se dispenser de la création d'une entrée de type @set. +- correction du champ chapter imprimé en double dans les entrées de type @commentary +- indexation des auteurs + +III. Exemple de document +------------------------ +- ajout de packages requis en préambule (et non dans le fichier de classe) +- support de l'index d'auteurs +- modification de la bibliographie jurisprudentielle de façon à mettre en oeuvre le champ "related" (voir II). + + +Version 0.3 +=========== + +Packages requis: +- biblatex (version 2.0 ou plus) +- biber (version 1.0 ou plus) + +I. Classe de document +--------------------- +- Ajout option "footnotereset" portant sur le mode de numérotation des notes de bas de page. +- Ajout option "versetitle" portant sur les titres de versets. + +II. Style bibliographique +------------------------- +- Support champs "part" et chapter" dans le type "article", pour les revues comprenant des sections thématiques (tel que le recueil Dalloz ou JCP). +- Correction casse des pages dans la biblio et les citations. +- Ajout des schémas de tri "tymdi" et "iymd" dédiés aux jurisprudences +- Supression des messages "pdftex warning: destination with the same identifier" pendant la compilation. + +III. Exemple de document +------------------------ +- Ajout du fichier sommaire.tex dédié au sommaire et aux réglages correspondants. +- Ajout du fichier toc.tex dédié à la table des matières et aux réglages correspondants. +- Ajout du fichier journaux.bib listant des noms de journaux abrégés. +- Groupement des références jurispridentielles françaises par juridiction dans la bibliographie. + +Version 0.2 +=========== + +Correction de bugs divers. + +Version 0.1 +=========== + +Première version. Files old/doc/latex/droit-fr/droit-fr.pdf and new/doc/latex/droit-fr/droit-fr.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/droit-fr/droit-fr.tex new/doc/latex/droit-fr/droit-fr.tex --- old/doc/latex/droit-fr/droit-fr.tex 2013-05-10 00:54:20.000000000 +0200 +++ new/doc/latex/droit-fr/droit-fr.tex 2014-02-09 00:11:50.000000000 +0100 @@ -13,7 +13,7 @@ \MakeAutoQuote*{<}{>} \MakeShortVerb{\|} -\rcsid{$Id: droit-fr.tex,v 0.2 2013/05/04 14:00:00 ydsp stable $} +\rcsid{$Id: droit-fr.tex,v 0.4 2014/01/30 14:00:00 ydsp stable $} \newcommand*{\biber}{Biber\xspace} \newcommand*{\biblatex}{Biblatex\xspace} @@ -229,6 +229,11 @@ Cette option contrôle le mode de numérotation des notes de bas de page. Lorsque cette option est passée avec la valeur \texttt{false}, les notes de bas de pages sont numérotées de manière continue tout le long du document. La valeur \texttt{true} permet de renuméroter les notes à partir de 1 pour chaque nouvelle page. +\boolitem[true]{versetitle} + +Cette option contrôle l'affichage des titres de versets (voir \secref{versets}). Lorsque cette option est passée avec la valeur \texttt{false}, les titres passés en paramètre de la commande \cmd{verset} sont ignorés à la compilation; la commande \cmd{verset} se borne alors à numéroter un paragraphe. La valeur \texttt{true} affiche normalement les titres, comme le font les commandes listées en section \secref{sections}. + + \end{optionlist} \subsection{Page de titre} @@ -302,6 +307,9 @@ La commande \cmd{verset} peut être considérée comme une commande de section de faible niveau, mais présente des particularités: son compteur n'est jamais remis à zéro et peut être utilisée à n'importe quel niveau hiérarchique; de plus il est possible d'en laisser le titre vide. +Un point final est automatiquement ajouté à la fin du libellé du verset, si l'argument passé à la commande n'est pas déjà terminé par un point. Ce mécanisme dispense donc le rédacteur de systématiquement terminer chaque libellé de verset par un tel point. +De façon plus générale, un point final ne sera ajouté en fin de libellé de verset que si celui-ci ne se termine pas par l'un des caractère de ponctuation suivants: point, point d'exclamation, point d'interrogation ou trois petits points. + \subsection{En-têtes et pied-de-pages} \label{entete} @@ -316,17 +324,47 @@ \subsection{Index} \label{index} -L'index de base proposé par \latex référence des termes à l'aide de numéros de page. Une variante utilisant des numéros de verset est également proposée ici. +L'index de base proposé par \latex référence des termes à l'aide de numéros de page. Deux variantes utilisant des numéros de verset est également proposée ici. + +\subsubsection{Index de base par versets} \begin{ltxsyntax} +\cmditem{makeindexv} + +Génère un fichier d'index par versets. À invoquer dans le préambule du document, similairement à la commande \cmd{makeindex} fournie par \latex. + \cmditem{indexv}{mot} -Ajoute un mot clé à l'index par versets. Cette commande est identique à la commande de base \cmd{index} fournie par \latex à ceci près que le référencement est effectué par versets et non par pages. Toutes les paramètres optionnels de la commande \cmd{index} sont applicables. +Ajoute un mot-clé au fichier d'index par versets. Cette commande est identique à la commande de base \cmd{index} fournie par \latex à ceci près que le référencement est effectué par versets et non par pages. Toutes les paramètres optionnels de la commande \cmd{index} sont applicables. \cmditem{printindexv} -Imprime l'index complet par pages ou par versets à la position courante. Bien entendu, la commande classique \cmd{makeindex} doit avoir été invoquée dans le préambule du document. +Imprime l'index complet par pages ou par versets à la position courante. Bien entendu, la commande \cmd{makeindexv} doit avoir été invoquée dans le préambule du document. + +\end{ltxsyntax} + +\subsubsection{Index d'auteurs par versets} +\label{indexauteurs} + +L'index d'auteurs est un index spécifiquement dédié, comme son nom l'indique, aux auteurs cités dans le document. Il référence des numéros de versets, comme l'index de base. + +\begin{ltxsyntax} + +\cmditem{makeindexa} + +Génère un fichier d'index d'auteurs par versets. À invoquer dans le préambule du document, similairement à la commande \cmd{makeindex} fournie par \latex. + +\cmditem{indexa}{mot} + +Ajoute un mot-clé au fichier d'index d'auteurs par versets. Cette commande est identique à la commande de base \cmd{index} fournie par \latex à ceci près que le référencement est effectué par versets et non par pages. Toutes les paramètres optionnels de la commande \cmd{index} sont applicables. + +Cette commande peut être utilisée manuellement dans le document. Toutefois, il est préférable de déléguer ce travail d'indexation au package biblatex moyennant l'activation de l'option \texttt{indexing=cite}, et de l'ajout d'une instruction spéciale dans le préambule du document permettant à biblatex d'utiliser en interne cette commande \cmd{indexa} (voir à ce propos le préambule du template de la section \ref{template}). L'index par auteur est ainsi entièrement constitué de tous les auteurs cités via la commande \cmd{cite}. + +\cmditem{printindexa} + +Imprime l'index d'auteurs à la position courante. La commande \cmd{makeindexa} doit avoir été invoquée dans le préambule du document. + \end{ltxsyntax} @@ -455,9 +493,8 @@ Thèses & \bibtype{thesis} \\ Rapports officiels & \bibtype{report} \\ Lois, traités & \bibtype{legislation} \\ -Arrêts, décisions & \bibtype{jurisdiction} \\ Commentaires d'arrêt/de décision & \bibtype{commentary} \\ -Jurisprudences comprenant un arrêt et au moins un commentaire & \bibtype{set}, voir \secref{use_use_set} \\ +Arrêts, décisions contenant des éventuels commentaires & \bibtype{jurisdiction} \\ \bottomrule \end{tabularx} @@ -545,6 +582,10 @@ Le numéro d'un journal ou le numéro de volume d'un livre faisant partie d'une collection (\bibfield{series}). Pour le type \bibtype{jurisdiction}, ce champ désigne le numéro de l'affaire. Ce champ ne doit pas être confondu avec une information de pagination, ni être utilisé pour désigner une section logique d'un ouvrage (voir à ce propos les champs \bibfield{part} et \bibfield{chapter}). +\fielditem{related}{clé1, clé2, ...} + +Ce champ est spécial. Il est particulièrement destiné à être utilisé au sein d'une entrée de type \bibtype{jurisdiction}, et à contenir une clé ou plusieurs clés d'entrées de type \bibtype{commentary}. Tous les commentaires seront alors imprimés à la suite de l'arrêt. Voir \ref{templatejurisprudence} pour un exemple d'utilisation. + \end{fieldlist} \subsubsection{Chaînes de caractères} @@ -590,12 +631,10 @@ Ils sont destinés à contrôler le tri d'entrées dans des sous-bibliographies ne comprenant que les types juridiques listés en section \secref{typesjuridiques}. Ces schémas de tris doivent par conséquent être utilisés comme paramètre de la commande \cmd{printbibliography}, par exemple de la façon suivante: \begin{ltxexample} -\printbibliography[..., type=<<set>>, sorting=<<iymd>>] +\printbibliography[..., type=<<jurisdiction>>, sorting=<<iymd>>] \end{ltxexample} % -Comme on le verra en section \secref{templatejurisprudence}, le type spécial \bibtype{set} est adapté plus gérer l'impression de références jurisprudentielles. - \subsection{Rendu} Il n'existe aucun standard officiel pour la présentation des bibliographies en droit français, seulement des recommandations. @@ -668,6 +707,7 @@ \usepackage[% style=<<droit-fr>>, % nom du fichier de style backend=<<biber>> % utilisation de Biber a la place de BibTeX + indexing=<<cite>> % activation de l'indexation des auteurs ]{biblatex} \end{ltxexample} @@ -681,15 +721,23 @@ <<\bookmarksetup>>{numbered=true, depth=5} \end{ltxexample} -\item Les commandes \cmd{makeindex} et \cmd{makeglossary} sont également présentes pour activer la génération des tables correspondantes. +\item Les commandes \cmd{makeindexa}, \cmd{makeindexv} et \cmd{makeglossary} sont également présentes pour activer la génération des tables correspondantes. \begin{ltxexample} <<\makeglossary>> % fichier genere: .gls -<<\makeindex>> % fichier genere: .idx +<<\makeindexv>> % fichier genere: .idx +<<\makeindexa>> % fichier genere: .idx \end{ltxexample} -\item Enfin, le fichier \file{bibliographie.bib} contenant les références bibliographiques est chargé à l'aide de la commande \cmd{bibliography}. +La commande suivante est très importante pour permettre la formation d'un index d'auteurs séparé de l'index de base. Elle indique au paquet biblatex d'utiliser la commande \cmd{indexa} pour indexer les auteurs (voir notamment la section \ref{indexauteurs} pour plus d'informations sur l'index par auteurs). \begin{ltxexample} -<<\addbibresource>>{bibliographie} % fichier .bib +\DeclareIndexNameFormat{default}{% + \usebibmacro{index:name}{\indexa}{#1}{#3}{#5}{#7}} +\end{ltxexample} + +\item Enfin, les fichiers contenant les références bibliographiques sont chargés à l'aide de la commande \cmd{bibliography}. +\begin{ltxexample} +<<\addbibresource>>{journaux.bib} +<<\addbibresource>>{bibliographie.bib} \end{ltxexample} \end{enumerate} @@ -753,23 +801,21 @@ \<<printglossary>> \end{ltxexample} +\subsubsection{\file{journaux.bib}} + +Ce fichier contient des chaînes de caractères \bibtex contenant des noms de revues juridiques en abrégé. Ces chaînes peuvent être utilisées dans d'autre fichiers contenant des références bibliographiques. + \subsubsection{\file{bibliographie.bib}} -Ce fichier contient une ensemble des références bibliographiques proposées à titre d'exemple. +Ce fichier contient une ensemble des références bibliographiques proposées à titre d'exemple. Il est chargé après le fichier \file{journaux.bib}. \paragraph{Exemple de jurisprudence} \label{templatejurisprudence} -Il est d'usage en droit français de grouper un arrêt (type \bibtype{jurisdiction}) avec tous les commentaires en découlant (type \bibtype{commentary}). +Il est d'usage en droit français de grouper un arrêt (type \bibtype{jurisdiction}) avec tous les commentaires s'y référant (type \bibtype{commentary}). -Pour citer tous ces éléments d'un seul tenant, le type spécial \bibtype{set} est utilisé, conformément aux indications exposées \secref{use_use_set}: +Pour lier tous ces éléments, le champ spécial \bibfield{related} dans l'entrée de type \bibtype{jurisdiction} décrivant l'arrêt: \begin{lstlisting}[style=bibtex]{} -@JURISDICTION{<<cass:ass:19910531>>, - organization = {Cass. Ass. Pl\'en.}, - date = {1991-05-31}, - ... -} - @COMMENTARY{<<cass:ass:19910531:thouvenin>>, ... } @@ -778,18 +824,25 @@ ... } -@SET{<<cass:ass:19910531:set>>, - entryset = {cass:ass:19910531, cass:ass:19910531:thouvenin, cass:ass:19910531:gobert}, +@JURISDICTION{<<cass:ass:19910531>>, + institution = {Cass. Ass. Pl\'en.}, + date = {1991-05-31}, + related = {<<cass:ass:19910531:thouvenin>>, <<cass:ass:19910531:gobert>>}, keywords = {cassass} } \end{lstlisting} % -Pour citer d'un seul tenant la jurisprudence couverte par ces entrées, il suffit d'appeler la commande suivante depuis le corps du texte: +Pour citer d'un seul tenant la jurisprudence couverte par ces 3 entrées, il suffit d'appeler l'entrée de type \bibtype{jurisdiction} via commande suivante depuis le corps du texte: \begin{ltxexample} -\cite{<<cass:ass:19910531:set>>} +\cite{<<cass:ass:19910531>>} \end{ltxexample} % -On notera par ailleurs la présence d'un mot clé "cassass" dans le champ \bibfield{keywords} du type \bibtype{set}, pour marquer que ce groupe correspond à un arrêt rendus par la cour de cassation en assemblée plénière. + +Toutes les entrées de type \bibtype{commentary} seront automatiquement accolées à la suite de l'arrêt\footnote{Attention, ce mécanisme ne fonctionne que pour des entrées de type \bibtype{commentary}.}. + +On notera que l'ordre dans lequel les différentes entrées de type \bibfield{commentary} sont écrites dans le champ \bibfield{related} correspond à l'ordre d'affichage dans le document final. + +On notera par ailleurs la présence d'un mot clé (ici, \enquote{cassass}) dans le champ \bibfield{keywords} du type \bibtype{jurisdiction}, pour marquer que ce groupe correspond à un arrêt rendus par la cour de cassation en assemblée plénière. \paragraph{Exemple de code juridique} @@ -870,7 +923,7 @@ Les sous-bibliographies suivantes contiennent un unique type de référence: \begin{itemize} \item les lois: \bibtype{legislation} -\item la jurisprudence: \bibtype{set} composé d'un \bibtype{jurisdiction} et d'un ou plusieurs \bibtype{commentary}. Le champ \bibfield{keywords} est utilisé pour filtrer ces entrées par juridiction. +\item la jurisprudence: \bibtype{jurisdiction} (pouvant contenant implicitement un ou plusieurs \bibtype{commentary} via le champ \bibfield{related}, voir \ref{templatejurisprudence}). Le champ \bibfield{keywords} est utilisé pour filtrer ces entrées par juridiction. \item les thèses: \bibtype{thesis} \end{itemize} @@ -895,9 +948,6 @@ Pour chaque pays, le même système de groupement est utilisé. Il est combiné avec une autre clé du champ \bibfield{keywords} utilisée pour filtrer les références selon le pays. - - - \paragraph{Structure} La bibliographie est imprimée grâce au jeu de commandes ci-dessous: @@ -910,19 +960,19 @@ \printbibliography[heading=<<lois>>,type=<<legislation>>,keyword=<<french>>] \printbibliography[heading=<<rapports>>,type=<<report>>,keyword=<<french>>] \printbibheading[heading=jurisprudence] -\printbibliography[heading=<<juris:ccel>>, type=<<set>>, keyword=<<ccel>>] -\printbibliography[heading=<<juris:ce>>, type=<<set>>, keyword=<<ce>>] +\printbibliography[heading=<<juris:ccel>>, type=<<juridsiction>>, keyword=<<ccel>>] +\printbibliography[heading=<<juris:ce>>, type=<<juridsiction>>, keyword=<<ce>>] \printbibheading[heading=<<juris:cass>>] -\printbibliography[heading=<<juris:cass:ass>>, type=<<set>>, keyword=<<cassass>>] -\printbibliography[heading=<<juris:cass:1civ>>, type=<<set>>, keyword=<<cass1civ>>] -\printbibliography[heading=<<juris:cass:2civ>>, type=<<set>>, keyword=<<cass2civ>>] -\printbibliography[heading=<<juris:cass:3civ>>, type=<<set>>, keyword=<<cass3civ>>] -\printbibliography[heading=<<juris:cass:com>>, type=<<set>>, keyword=<<casscom>>] -\printbibliography[heading=<<juris:cass:soc>>, type=<<set>>, keyword=<<casssoc>>] -\printbibliography[heading=<<juris:cass:crim>>, type=<<set>>, keyword=<<casscrim>>] -\printbibliography[heading=<<juris:ca>>, type=<<set>>, keyword=<<ca>>] -\printbibliography[heading=<<juris:tgi>>, type=<<set>>, keyword=<<tgi>>] -\printbibliography[heading=<<juris:ti>>, type=<<set>>, keyword=<<ti>>] +\printbibliography[heading=<<juris:cass:ass>>, type=<<juridsiction>>, keyword=<<cassass>>] +\printbibliography[heading=<<juris:cass:1civ>>, type=<<juridsiction>>, keyword=<<cass1civ>>] +\printbibliography[heading=<<juris:cass:2civ>>, type=<<juridsiction>>, keyword=<<cass2civ>>] +\printbibliography[heading=<<juris:cass:3civ>>, type=<<juridsiction>>, keyword=<<cass3civ>>] +\printbibliography[heading=<<juris:cass:com>>, type=<<juridsiction>>, keyword=<<casscom>>] +\printbibliography[heading=<<juris:cass:soc>>, type=<<juridsiction>>, keyword=<<casssoc>>] +\printbibliography[heading=<<juris:cass:crim>>, type=<<juridsiction>>, keyword=<<casscrim>>] +\printbibliography[heading=<<juris:ca>>, type=<<juridsiction>>, keyword=<<ca>>] +\printbibliography[heading=<<juris:tgi>>, type=<<juridsiction>>, keyword=<<tgi>>] +\printbibliography[heading=<<juris:ti>>, type=<<juridsiction>>, keyword=<<ti>>] \printbibliography[heading=<<generaux>>,filter=<<gen>>,keyword=<<french>>] \printbibliography[heading=<<speciaux>>,filter=<<spec>>,keyword=<<french>>] \printbibliography[heading=<<collectifs>>,filter=<<col>>,keyword=<<french>>] @@ -933,7 +983,7 @@ \printbibliography[heading=<<lois>>,type=<<legislation>>,keyword=<<ue>>] \printbibliography[heading=<<rapports>>,type=<<report>>,keyword=<<ue>>] -\printbibliography[heading=<<jurisprudence>>,type=<<set>>,keyword=<<ue>>] +\printbibliography[heading=<<jurisprudence>>,type=<<juridsiction>>,keyword=<<ue>>] \printbibliography[heading=<<generaux>>,filter=<<gen>>,keyword=<<ue>>] \printbibliography[heading=<<speciaux>>,filter=<<spec>>,keyword=<<ue>>] \printbibliography[heading=<<collectifs>>,filter=<<col>>,keyword=<<ue>>] @@ -942,16 +992,13 @@ \end{ltxexample} % - Deux commandes fournies par le package \biblatex sont utilisées pour imprimer la bibliographie: \cmd{printbibliography} et \cmd{printbibheading}. La commande \cmd{printbibheading} est relativement simple: elle sert uniquement à imprimer un titre de bibliographie, sans contenu. la commande \cmd{printbibliography} imprime un ensemble de références bibliographiques issues des fichiers qui ont été référencés en préambule du document au moyen de la commande \cmd{addbibresource} (voir le fichier maître \file{main.tex}). La commande \cmd{printbibliography} sélectionne des références sur la base de critères de sélection passés en arguments. Comme le montre les lignes ci-dessus, les options \texttt{heading}, \texttt{filter}, \texttt{type} et \texttt{keyword} sont utilisées comme critères de sélection. -On notera en particulier que l'ensemble des références jurisprudentielles affichées sont des \bibtype{set}, et que le champ \bibfield{keywords} est utilisé de façon à filter les références par juridictions. - -Le tableau \ref{clesjuridictions} propose des exemples de mots-clés pour la plupart des juridictions françaises. Bien entendu, ces mots-clés sont à la discrétion du rédacteur. +On notera en particulier que le champ \bibfield{keywords} est utilisé de façon à filter les références de type \bibtype{jurisdiction} par juridictions. Le tableau \ref{clesjuridictions} propose des exemples de mots-clés pour la plupart des juridictions françaises. Bien entendu, ces mots-clés sont à la discrétion du rédacteur. \begin{table} \tablesetup @@ -981,7 +1028,11 @@ \subsubsection{\file{index.tex}} -Ce fichier imprime l'index par versets. +Ce fichier imprime l'index par versets de base et l'index d'auteurs par verset, au moyen des commandes suivantes. +\begin{ltxexample} +\printindexv +\printindexa +\end{ltxexample} \subsubsection{\file{toc.tex}} @@ -1005,7 +1056,8 @@ \begin{lstlisting}[style=plain]{} pdflatex main.tex makeindex -s main.ist -o main.idx main.ind -makeindex -s main.gst -o main.gds main.glo +makeindex -s main.ist -o auteurs.idx auteurs.ind +makeindex -s main.gst -o main.gls main.glo biber main.bcf pdflatex main.tex pdflatex main.tex @@ -1013,7 +1065,7 @@ % Plusieurs passes sur le programme \texttt{pdflatex} sont nécessaires pour résoudre les problèmes de références croisées. -Le programme \texttt{makeindex} est à appeler deux fois, pour l'index et le glossaire. Les fichiers d'extension \file{.ist} et \file{.gst} sont des fichiers de style passés en paramètre de \texttt{makeindex}; ils sont créés à la première passe pdflatex si absents. +Le programme \texttt{makeindex} est à appeler trois fois, pour l'index de base, l'index d'auteurs et le glossaire. Les fichiers d'extension \file{.ist} et \file{.gst} sont des fichiers de style passés en paramètre de \texttt{makeindex}; ils sont créés à la première passe de pdflatex si absents. \texttt{\biber} intervient dans la génération de la bibliographie. Il doit être appelé une fois en lieu et place de \bibtex. @@ -1033,7 +1085,7 @@ \end{lstlisting} % -Le fichier \file{.latexmkrc} contient des paramètres de compilation prédéfinis; sa présence dans le répertoire de travail est indispensable. +Le fichier \file{.latexmkrc} contient des paramètres permettant d'exécuter automatiquement la séquence manuelle définie dans la section précédente; sa présence dans le répertoire de travail est donc \emph{indispensable}. %\subsection{Adaptation de l'exemple} %TODO: finir cette section @@ -1095,24 +1147,21 @@ \begin{itemize} \item Pour les \bibtype{jurisdiction}, on peut utiliser le nom de l'institution suivi de la date précise de l'arrêt au format YYYYMMDD; \item Pour les \bibtype{commentary}, même chose, en indiquant en plus le nom de l'auteur principal du commentaire d'arrêt; -\item Pour les \bibtype{set} englobant les deux types précédents, même principe, mais en en suffixant avec le terme "set". \end{itemize} Exemple: \begin{lstlisting}[style=bibtex]{} -@JURISDICTION{<<cass1civ:20100622>>, - institution = {Cass 1\iere{} civ.}, - eventdate = {2010-06-22} -} - @COMMENTARY{<<cass1civ:20100622:dupond>>, editor = {Dupond, Albert}, ... } -@SET{<<cass1civ:20100622:set>>, - entryset = {cass1civ:20100622, cass1civ:20100622:dupond} +@JURISDICTION{<<cass1civ:20100622>>, + institution = {Cass 1\iere{} civ.}, + eventdate = {2010-06-22}, + related = {cass1civ:20100622:dupond} } + \end{lstlisting} \subsubsection{Clés du champ \texttt{keywords}} @@ -1342,21 +1391,6 @@ \end{lstlisting} % -\subsubsection{Groupes d'entrées} -\label{use_use_set} - -Les groupe de références sont des entités pouvant être cités dans une seule citation et imprimé d'un seul bloc dans la bibliographie. Ils sont créés à l'aide du type spécial \bibtype{set} et du champ \bibfield{entryset}, contenant une liste de clés de références préexistantes: - -\begin{lstlisting}[style=bibtex]{} -<<@Set>>{<<set1>>, - <<entryset>> = {<<key1,key2,key3>>}, -} -\end{lstlisting} -% -L'utilisation des groupes se prête particulièrement à la jurisprudence française: voir \secref{template} pour un exemple concret d'utilisation. - -Attention: il est nécessaire d'utiliser à la compilation le programme \biber en lieu et place de \bibtex pour bénéficier des groupes d'entrées. - \subsubsection{Numéros de page dans les citations} \label{use_cav_pag} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/droit-fr/example/.latexmkrc new/doc/latex/droit-fr/example/.latexmkrc --- old/doc/latex/droit-fr/example/.latexmkrc 2013-05-10 00:54:20.000000000 +0200 +++ new/doc/latex/droit-fr/example/.latexmkrc 2014-02-09 00:11:50.000000000 +0100 @@ -3,7 +3,7 @@ # compilation via pdflatex uniquement $pdf_mode = 1; -$pdflatex = 'pdflatex -interaction=nonstopmode -synctex=1 %O %S'; +$pdflatex = 'pdflatex -synctex=1 %O %S'; #$dvi_mode = 0; # génération de la bibliographie diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/droit-fr/example/bibliographie.bib new/doc/latex/droit-fr/example/bibliographie.bib --- old/doc/latex/droit-fr/example/bibliographie.bib 2013-05-10 00:54:20.000000000 +0200 +++ new/doc/latex/droit-fr/example/bibliographie.bib 2014-02-09 00:11:50.000000000 +0100 @@ -4,6 +4,7 @@ @BOOK{alland:dicoculturejur, author = {Alland, Denis and Rials, Stéphane}, title = {Dictionnaire de la culture juridique}, + subtitle = {Test}, date = {2003}, publisher = {Lamy-PUF}, keywords = {french, special} @@ -41,17 +42,15 @@ publisher = {Defrénois - Lextenso Éditions} } -@ARTICLE{gouttenoire:sudreFrette, +@ARTICLE{gouttenoire:reponsecedh, author = {Gouttenoire, Adeline and Sudre, Frédéric}, title = {L'imprévisible réponse de la Cour européenne des droits de l'homme à la question de l'adoption par un parent homosexuel: l'arrêt Fretté c/ France du 26 février 2002}, journaltitle = {JCP G.}, - date = {2002-05-08}, + date = {2002}, volume = {II}, - number = {19}, - pages = {10074}, - bookpagination = {number}, + chapter = {10074}, keywords = {ue}, pagination = {number} } @@ -62,7 +61,7 @@ du droit administratif}, journaltitle = {D.}, pages = {119}, - volume = {chron.}, + chapter = {chron.}, date = {1966}, keywords = {french}, } @@ -124,11 +123,8 @@ @JURISDICTION{cass:ass:19910531, keywords = {french}, eventdate = {1991-05-31}, - institution = {Cass. Ass. Plén.} -} - -@SET{cass:ass:19910531:set, - entryset = {cass:ass:19910531, cass:ass:19910531:thouvenin, cass:ass:19910531:gobert}, + institution = {Cass. Ass. Plén.}, + related = {cass:ass:19910531:thouvenin, cass:ass:19910531:gobert}, keywords = {cassass} } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/droit-fr/example/bibliographie.tex new/doc/latex/droit-fr/example/bibliographie.tex --- old/doc/latex/droit-fr/example/bibliographie.tex 2013-05-10 00:54:20.000000000 +0200 +++ new/doc/latex/droit-fr/example/bibliographie.tex 2014-02-09 00:11:50.000000000 +0100 @@ -48,19 +48,19 @@ \printbibliography[heading=lois,type=legislation,keyword=french] \printbibliography[heading=rapports,type=report,keyword=french] \printbibheading[heading=jurisprudence] - \printbibliography[heading=juris:ccel, type=set, sorting=iymd, keyword=ccel] - \printbibliography[heading=juris:ce, type=set, sorting=iymd, keyword=ce] + \printbibliography[heading=juris:ccel, type=jurisdiction, sorting=iymd, keyword=ccel] + \printbibliography[heading=juris:ce, type=jurisdiction, sorting=iymd, keyword=ce] \printbibheading[heading=juris:cass] - \printbibliography[heading=juris:cass:ass, type=set, sorting=iymd, keyword=cassass] - \printbibliography[heading=juris:cass:1civ, type=set, sorting=iymd, keyword=cass1civ] - \printbibliography[heading=juris:cass:2civ, type=set, sorting=iymd, keyword=cass2civ] - \printbibliography[heading=juris:cass:3civ, type=set, sorting=iymd, keyword=cass3civ] - \printbibliography[heading=juris:cass:com, type=set, sorting=iymd, keyword=casscom] - \printbibliography[heading=juris:cass:soc, type=set, sorting=iymd, keyword=casssoc] - \printbibliography[heading=juris:cass:crim, type=set, sorting=iymd, keyword=casscrim] - \printbibliography[heading=juris:ca, type=set, sorting=iymd, keyword=ca] - \printbibliography[heading=juris:tgi, type=set, sorting=iymd, keyword=tgi] - \printbibliography[heading=juris:ti, type=set, sorting=iymd, keyword=ti] + \printbibliography[heading=juris:cass:ass, type=jurisdiction, sorting=iymd, keyword=cassass] + \printbibliography[heading=juris:cass:1civ, type=jurisdiction, sorting=iymd, keyword=cass1civ] + \printbibliography[heading=juris:cass:2civ, type=jurisdiction, sorting=iymd, keyword=cass2civ] + \printbibliography[heading=juris:cass:3civ, type=jurisdiction, sorting=iymd, keyword=cass3civ] + \printbibliography[heading=juris:cass:com, type=jurisdiction, sorting=iymd, keyword=casscom] + \printbibliography[heading=juris:cass:soc, type=jurisdiction, sorting=iymd, keyword=casssoc] + \printbibliography[heading=juris:cass:crim, type=jurisdiction, sorting=iymd, keyword=casscrim] + \printbibliography[heading=juris:ca, type=jurisdiction, sorting=iymd, keyword=ca] + \printbibliography[heading=juris:tgi, type=jurisdiction, sorting=iymd, keyword=tgi] + \printbibliography[heading=juris:ti, type=jurisdiction, sorting=iymd, keyword=ti] \printbibliography[heading=generaux, filter=gen, keyword=french] \printbibliography[heading=theses, type=thesis, keyword=french] \printbibliography[heading=speciaux, filter=spec, keyword=french] @@ -71,7 +71,7 @@ \printbibliography[heading=lois, type=legislation, keyword=ue] \printbibliography[heading=rapports, type=report, keyword=ue] -\printbibliography[heading=jurisprudence, type=set, sorting=tymdi, keyword=ue] +\printbibliography[heading=jurisprudence, type=jurisdiction, sorting=tymdi, keyword=ue] \printbibliography[heading=generaux, filter=gen, keyword=ue] \printbibliography[heading=speciaux, filter=spec, keyword=ue] \printbibliography[heading=collectifs, filter=col, keyword=ue] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/droit-fr/example/index.tex new/doc/latex/droit-fr/example/index.tex --- old/doc/latex/droit-fr/example/index.tex 2012-02-18 00:53:42.000000000 +0100 +++ new/doc/latex/droit-fr/example/index.tex 2014-02-09 00:11:50.000000000 +0100 @@ -1,6 +1,12 @@ +% index de base \renewcommand{\preindexhook}{% Les entrées référencées renvoient à des numéros de verset.\\% Les numéros de verset en \textbf{gras} indiquent la référence principale d'une entrée.% \vskip\onelineskip\par} - \printindexv + +% index d'auteurs séparé +\renewcommand{\indexname}{Index des auteurs} +\renewcommand{\preindexhook}{} +\printindexa + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/droit-fr/example/introduction.tex new/doc/latex/droit-fr/example/introduction.tex --- old/doc/latex/droit-fr/example/introduction.tex 2013-05-10 00:54:20.000000000 +0200 +++ new/doc/latex/droit-fr/example/introduction.tex 2014-02-09 00:11:50.000000000 +0100 @@ -2,7 +2,7 @@ \markright{Introduction} \addcontentsline{toc}{chapter}{Introduction} -\verset{Liens internes.} +\verset{Liens internes!} Un exemple de note en bas de page\footnote{Une note de bas de page.}. Des exemples de liens divers: \begin{itemize} @@ -18,12 +18,17 @@ \item \ref{spt:nom} d'intitulé \titleref{spt:nom}, commençant à la page \pageref{spt:nom} \end{itemize} -\verset{Citations d'ouvrages bibliographiques.} -Première\cite{cass:ass:19910531:set}, seconde\cite[35]{malaurie:obligations} et troisième citation\cite[39]{malaurie:obligations} d'ouvrages. +\verset{Citations d'ouvrages bibliographiques\ldots} +Première\cite{cass:ass:19910531}, seconde\cite[35]{malaurie:obligations} et troisième citation\cite[39]{malaurie:obligations} d'ouvrages. Une citation d'un article du code civil\cite[1642-1]{cciv} suivie d'une autre\cite[1642-2]{cciv}. -\verset{Guillemets.} +D'autres citations +\cite[100]{gouttenoire:reponsecedh} +\cite[101]{gouttenoire:reponsecedh} +\cite[102]{gouttenoire:reponsecedh}. + +\verset{Guillemets ?} Voici un exemple d'utilisation des \enquote{guillemets français de premier et \enquote{second} niveau}. \verset{} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/droit-fr/example/journaux.bib new/doc/latex/droit-fr/example/journaux.bib --- old/doc/latex/droit-fr/example/journaux.bib 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/droit-fr/example/journaux.bib 2014-02-09 00:11:50.000000000 +0100 @@ -0,0 +1,21 @@ +% This file was created with JabRef 2.9b2. +% Encoding: UTF8 + +@STRING{bullciv = {Bull. civ.}} + +@STRING{bullcrim = {Bull. crim.}} + +@STRING{d = {D.}} + +@STRING{drfam = {Dr. Fam.}} + +@STRING{jcp = {JCP}} + +@STRING{jcpg = {JCP G.}} + +@STRING{lpa = {LPA}} + +@STRING{puf = {PUF}} + +@STRING{rtdciv = {RTD civ.}} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/droit-fr/example/main.tex new/doc/latex/droit-fr/example/main.tex --- old/doc/latex/droit-fr/example/main.tex 2013-05-10 00:54:20.000000000 +0200 +++ new/doc/latex/droit-fr/example/main.tex 2014-02-09 00:11:50.000000000 +0100 @@ -1,7 +1,14 @@ -\documentclass[a4paper,12pt,british,french,twoside]{droit-fr} +\documentclass[a4paper,12pt,british,french,twoside,footnotereset=true]{droit-fr} + +\usepackage[utf8]{inputenc} +\usepackage{times} % police Times +\usepackage[T1]{fontenc} +\usepackage{lipsum} % génération de texte automatique +\usepackage{hyperref} % hyperliens PDF +\usepackage{bookmark} % signets PDF % paramètres du style de bibliographie -\usepackage[style=droit-fr,backend=biber]{biblatex} +\usepackage[style=droit-fr,backend=biber,indexing=true]{biblatex} % paramètres des hyperliens PDF \hypersetup{% @@ -10,28 +17,35 @@ } % paramètres des signets PDF -\bookmarksetup{numbered=true, depth=4} +\bookmarksetup{numbered=true,depth=4} -% création du glossaire et de l'index -\makeglossary % fichié généré: .gls -\makeindex % fichié généré: .idx +% création du glossaire et des indexs +\makeglossary % glossaire, fichié généré: .gls +\makeindexv % index de base par versets, fichié généré: .idx +\makeindexa % index d'auteurs par versets, fichié généré: .idx + +% index des auteurs séparé de l'index de base +\DeclareIndexNameFormat{default}{% + \usebibmacro{index:name}{\indexa}{#1}{#3}{#5}{#7}} % chargement des fichiers de sources bibliographiques +\addbibresource{journaux.bib} \addbibresource{bibliographie.bib} -%TC: header \partie [2] -%TC: header \titre [2] -%TC: header \chapitre [2] -%TC: header \sectio [2] -%TC: header \paragraphe [2] -%TC: header \souspara [2] -%TC: header \alinea [2] -%TC: header \sousalinea [2] -%TC: header \point [2] -%TC: header \souspoint [2] +% marges +\settrimmedsize{297mm}{210mm}{*} +\setlength{\trimtop}{0pt} +\setlength{\trimedge}{\stockwidth} +\addtolength{\trimedge}{-\paperwidth} +\settypeblocksize{634pt}{448.13pt}{*} +\setulmargins{4cm}{*}{*} +\setlrmargins{*}{*}{1.5} +\setmarginnotes{17pt}{51pt}{\onelineskip} +\setheadfoot{\onelineskip}{2\onelineskip} +\setheaderspaces{*}{2\onelineskip}{*} +\checkandfixthelayout -%TC: macro \verset [1] -%TC: macro \autoref 1 +\listfiles \begin{document} @@ -39,8 +53,8 @@ \pagestyle{plain} % en-tetes vides \include{titre} % page de titre \include{misc} % avertissement, remerciements, résumé -\input{sommaire} -\input{glossaire} +\include{sommaire} +\include{glossaire} \mainmatter % pages en chiffres arabes, sections numérotées \pagestyle{corpus} % en-tetes/pied-de-pages en style "corpus" @@ -54,8 +68,7 @@ \include{annexes} \include{bibliographie} \pagestyle{plain} % en-tetes vides -\input{index} -\input{toc} % table des matières - +\include{index} +\include{toc} % table des matières \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/droit-fr/example/partie1.tex new/doc/latex/droit-fr/example/partie1.tex --- old/doc/latex/droit-fr/example/partie1.tex 2013-05-10 00:54:20.000000000 +0200 +++ new/doc/latex/droit-fr/example/partie1.tex 2014-02-09 00:11:50.000000000 +0100 @@ -26,7 +26,7 @@ \lipsum % texte de remplissage \footnote{Note de remplissage.} -\paragraphe{Un nom de paragraphe} +\paragraphe{Un \emph{nom} de paragraphe} \label{pg:nom} \verset{} @@ -66,4 +66,4 @@ \verset{} \lipsum % texte de remplissage -\footnote{Note de remplissage.} \ No newline at end of file +\footnote{Note de remplissage.} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/droit-fr/example/sommaire.tex new/doc/latex/droit-fr/example/sommaire.tex --- old/doc/latex/droit-fr/example/sommaire.tex 2013-05-10 00:54:20.000000000 +0200 +++ new/doc/latex/droit-fr/example/sommaire.tex 2014-02-09 00:11:50.000000000 +0100 @@ -20,7 +20,7 @@ %\renewcommand{\cftbookleader}{\cftdotfill{\cftdotsep}} \renewcommand{\cftbeforepartskip}{0.5em} -\renewcommand{\cftpartfont}{\normalfont\scshape} +\renewcommand{\cftpartfont}{\normalfont} \renewcommand{\cftpartindent}{0.5em} %\renewcommand{\cftpartnumwidth}{} \renewcommand{\cftpartpagefont}{\normalfont\scshape} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/droit-fr/example/toc.tex new/doc/latex/droit-fr/example/toc.tex --- old/doc/latex/droit-fr/example/toc.tex 2013-05-10 00:54:20.000000000 +0200 +++ new/doc/latex/droit-fr/example/toc.tex 2014-02-09 00:11:50.000000000 +0100 @@ -12,63 +12,63 @@ \renewcommand{\cftbookbreak}{\addpenalty{-\@highpenalty}\clearpage} \makeatother \renewcommand{\cftbeforebookskip}{2em} -\renewcommand{\cftbookfont}{\normalfont\bfseries\Large} +\renewcommand{\cftbookfont}{\bfseries\huge} \renewcommand{\cftbookindent}{0em} -%\renewcommand{\cftbooknumwidth}{} +\renewcommand{\cftbooknumwidth}{2em} %\renewcommand{\cftafterbookskip}{} \renewcommand{\cftbookleader}{\cftdotfill{\cftdotsep}} \renewcommand{\cftbeforepartskip}{1.5em} -\renewcommand{\cftpartfont}{\normalfont\bfseries\large} +\renewcommand{\cftpartfont}{\huge} \renewcommand{\cftpartindent}{0em} %\renewcommand{\cftpartnumwidth}{} \renewcommand{\cftpartleader}{\cftdotfill{\cftdotsep}} \renewcommand{\cftbeforechapterskip}{1em} -\renewcommand{\cftchapterfont}{\normalfont\bfseries\large} +\renewcommand{\cftchapterfont}{\LARGE} \renewcommand{\cftchaptername}{Chapitre\space} \renewcommand{\cftchapterindent}{0em} %\renewcommand{\cftchapternumwidth}{} \renewcommand{\cftchapterleader}{\cftdotfill{\cftdotsep}} \renewcommand{\cftbeforesectionskip}{0.5em} -\renewcommand{\cftsectionfont}{\normalfont\large} +\renewcommand{\cftsectionfont}{\Large} %\renewcommand{\cftsectionname}{Section\space} \renewcommand{\cftsectionindent}{0em} \renewcommand{\cftsectionnumwidth}{5.5em} %\renewcommand{\cftsectionleader}{\cftdotfill{\cftdotsep}} \renewcommand{\cftbeforesubsectionskip}{0.5em} -\renewcommand{\cftsubsectionfont}{\normalfont\scshape} +\renewcommand{\cftsubsectionfont}{\large} %\renewcommand{\cftsubsectionname}{} \renewcommand{\cftsubsectionindent}{0em} \renewcommand{\cftsubsectionnumwidth}{2em} %\renewcommand{\cftsubsectionleader}{\cftdotfill{\cftdotsep}} %\renewcommand{\cftbeforesubsubsectionskip}{} -\renewcommand{\cftsubsubsectionfont}{\normalfont\itshape} +\renewcommand{\cftsubsubsectionfont}{\normalsize} %\renewcommand{\cftsubsubsectionname}{} \renewcommand{\cftsubsubsectionindent}{1em} \renewcommand{\cftsubsubsectionnumwidth}{2em} %\renewcommand{\cftsubsubsectionleader}{\cftdotfill{\cftdotsep}} %\renewcommand{\cftbeforeparagraphskip}{} -\renewcommand{\cftparagraphfont}{\normalfont} +\renewcommand{\cftparagraphfont}{\normalsize} %\renewcommand{\cftparagraphname}{} \renewcommand{\cftparagraphindent}{2em} \renewcommand{\cftparagraphnumwidth}{2em} %\renewcommand{\cftparagraphleader}{\cftdotfill{\cftdotsep}} %\renewcommand{\cftbeforesubparagraphskip}{} -\renewcommand{\cftsubparagraphfont}{\normalfont} +\renewcommand{\cftsubparagraphfont}{\normalsize} %\renewcommand{\cftsubparagraphname}{} \renewcommand{\cftsubparagraphindent}{3em} \renewcommand{\cftsubparagraphnumwidth}{2em} %\renewcommand{\cftsubparagraphleader}{\cftdotfill{\cftdotsep}} -\renewcommand{\cftsubsubparagraphfont}{\normalfont\small} +\renewcommand{\cftsubsubparagraphfont}{\small} -\renewcommand{\cftsubsubsubparagraphfont}{\normalfont\footnotesize} +\renewcommand{\cftsubsubsubparagraphfont}{\footnotesize} \clearpage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/droit-fr.doc.tlpobj new/tlpkg/tlpobj/droit-fr.doc.tlpobj --- old/tlpkg/tlpobj/droit-fr.doc.tlpobj 2013-05-10 03:42:46.000000000 +0200 +++ new/tlpkg/tlpobj/droit-fr.doc.tlpobj 2014-02-09 03:23:26.000000000 +0100 @@ -1,10 +1,11 @@ name droit-fr.doc category Package -revision 30356 +revision 32918 shortdesc doc files of droit-fr relocated 1 -docfiles size=95 +docfiles size=99 RELOC/doc/latex/droit-fr/.latexmkrc + RELOC/doc/latex/droit-fr/CHANGELOG RELOC/doc/latex/droit-fr/README RELOC/doc/latex/droit-fr/droit-fr.pdf RELOC/doc/latex/droit-fr/droit-fr.tex @@ -16,6 +17,7 @@ RELOC/doc/latex/droit-fr/example/glossaire.tex RELOC/doc/latex/droit-fr/example/index.tex RELOC/doc/latex/droit-fr/example/introduction.tex + RELOC/doc/latex/droit-fr/example/journaux.bib RELOC/doc/latex/droit-fr/example/main.tex RELOC/doc/latex/droit-fr/example/misc.tex RELOC/doc/latex/droit-fr/example/partie1.tex ++++++ droit-fr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/droit-fr/droit-fr.bbx new/tex/latex/droit-fr/droit-fr.bbx --- old/tex/latex/droit-fr/droit-fr.bbx 2013-05-10 00:54:20.000000000 +0200 +++ new/tex/latex/droit-fr/droit-fr.bbx 2014-02-09 00:11:50.000000000 +0100 @@ -1,4 +1,4 @@ -\ProvidesFile{droit-fr.bbx}[2013/05/04 v0.2 style droit francais] +\ProvidesFile{droit-fr.bbx}[2014/01/30 v0.4 style droit francais] \RequireBibliographyStyle{verbose-ibid} \RequireBiber[3] @@ -44,6 +44,8 @@ \setlength{\bibitemsep}{1.5\itemsep} % espacement entre 2 références \renewcommand*{\newunitpunct}{\addcomma\space} % separation des units par une virgule \renewcommand*{\mkbibnamelast}[1]{\textsc{\textnohyphenation{#1}}} % petites maj. pour toutes les langues. +\renewcommand*{\subtitlepunct}{\addcolon\space} % separation entre titre et sous-titre + % ------------------------------------------------------------------ % FIELD FORMATS @@ -62,6 +64,8 @@ % pas de P. majuscule \DeclareFieldFormat{postnote}{\midsentence\mkpageprefix[pagination]{#1}} +\DeclareFieldFormat{volcitepages}{\midsentence\mkpageprefix[pagination]{#1}} +\DeclareFieldFormat{multipostnote}{\midsentence\mkpageprefix[pagination]{#1}} % Used in the bibliography @@ -69,13 +73,12 @@ \DeclareFieldFormat{pages}{\midsentence\mkpageprefix[bookpagination]{#1}} \DeclareFieldFormat{pagetotal}{\midsentence\mkpagetotal[bookpagination]{#1}} - % tout italique, sauf legislation \DeclareFieldFormat{title}{\mkbibemph{#1\isdot}} \DeclareFieldFormat[thesis]{title}{\mkbibemph{#1\isdot}} \DeclareFieldFormat[legislation]{title}{#1\isdot} -\DeclareFieldFormat{chapter}{#1\midsentence} % pas de 'chap.' +\DeclareFieldFormat{chapter}{#1} % pas de 'chap.' \DeclareFieldFormat[jurisdiction,legislation]{number}{\biblcstring{number}~#1}% no de l'arret \DeclareFieldFormat[case]{journaltitle}{#1}% pas d'italique' \DeclareFieldFormat[case]{volume}{#1}% pas de 't.' @@ -134,51 +137,42 @@ \usebibmacro{name:first-last}{#1}{#4}{#5}{#7} \usebibmacro{name:andothers}} -% définition d'un nouveau schéma de tri nyt, prenant en compte des champs institution et eventdate -%\DeclareSortingScheme{nytx}{ -% \sort{ -% \field{presort} -% } -% \sort[final]{ -% \field{sortkey} -% } -% \sort{ -% \field{sortname} -% \field{author} -% \field{editor} -% \field{translator} -% \field{sorttitle} -% \field{title} -% } -% % début ajouts -% \sort{ -% \field{institution} -% } -% \sort{ -% \field{eventyear} -% } -% \sort{ -% \field[padside=left,padwidth=2,padchar=0]{eventmonth} -% \literal{00} -% } -% \sort{ -% \field[padside=left,padwidth=2,padchar=0]{eventday} -% \literal{00} -% } -% % fin ajouts -% \sort{ -% \field{sortyear} -% \field{year} -% } -% \sort{ -% \field{sorttitle} -% \field{title} -% } -% \sort{ -% \field[padside=left,padwidth=4,padchar=0]{volume} -% \literal{0000} -% } -%} + +% caractère de séparation entre plusieurs entrées référencées dans "related" +\renewcommand*{\relateddelim}{\addsemicolon\addspace} + +% modification du champ "related" pour les commentaires d'arrêt +\newbibmacro*{related:default}[1]{% + \entrydata{#1}{\usedriver{}{commentary}}} + +% indexation des auteurs seulement +\renewbibmacro*{bibindex}{% + \ifbibindex + {\indexnames{labelname}} + {}} + +\renewcommand*{\mkbibindexname}[4]{% + \ifuseprefix + {\ifblank{#3}{}{#3 }% + \@firstofone #1% remove spurious braces + \ifblank{#4}{}{ #4}% + \ifblank{#2}{}{, #2}% + \actualoperator + \ifblank{#3}{}{\MakeCapital{#3} }% + #1% + \ifblank{#4}{}{ #4}% + \ifblank{#2}{}{, #2}} + {\@firstofone #1% remove spurious braces + \ifblank{#4}{}{ #4}% ajouté + \ifblank{#2#3}{}{,}% ajouté + \ifblank{#2}{}{ #2}% ajouté + \ifblank{#3}{}{ #3} % ajouté + \actualoperator % ajouté + \textsc{#1}% + \ifblank{#4}{}{ #4}% + \ifblank{#2#3}{}{,}% + \ifblank{#2}{}{ #2}% + \ifblank{#3}{}{ #3}}} % schéma de tri destiné à la jurisprudence: institution, date de décision \DeclareSortingScheme{iymd}{ @@ -354,6 +348,8 @@ \printfield{addendum}% \newunit\newblock \usebibmacro{pageref}% + \setunit{\addsemicolon\addspace}\newblock + \usebibmacro{related}% \usebibmacro{finentry}} % cas de jurisprudence anglaise @@ -445,8 +441,8 @@ \usebibmacro{bibindex}% \usebibmacro{begentry}% \usebibmacro{journal+issuetitle}% - \newunit\newblock - \usebibmacro{chapter+pages}% + \setunit{\bibpagespunct}% + \printfield{pages}% \newunit\newblock \usebibmacro{byeditor+others}% \newunit\newblock @@ -483,7 +479,8 @@ \newunit} % macro utilisée dans article, legislation, commentary. -% journal et date toujours séparés par un espace. +% - journal et date toujours séparés par un espace. +% - ajout de "part" et "chapter", pour des journaux comprenant des partie thématiques (Dalloz, JCP, etc) \renewbibmacro*{journal+issuetitle}{% \usebibmacro{journal}% \setunit{\addspace}% @@ -493,6 +490,10 @@ \newunit \printfield{volume}% \newunit + \printfield{part}% + \newunit + \printfield{chapter}% + \newunit \iffieldundef{series} {} {\printfield{series}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/droit-fr/droit-fr.cbx new/tex/latex/droit-fr/droit-fr.cbx --- old/tex/latex/droit-fr/droit-fr.cbx 2013-05-10 00:54:20.000000000 +0200 +++ new/tex/latex/droit-fr/droit-fr.cbx 2014-02-09 00:11:50.000000000 +0100 @@ -1,11 +1,23 @@ -\ProvidesFile{droit-fr.cbx}[2013/05/04 v0.2 style droit francais] +\ProvidesFile{droit-fr.cbx}[2014/01/30 v0.4 style droit francais] \RequireCitationStyle{verbose-ibid} \renewcommand*{\mkibid}{\emph} % mots latins en italique +% indexation des auteurs seulement +\renewbibmacro*{citeindex}{% + \ifciteindex + {\indexnames{labelname}} + {}} + % pas de version raccourcie des note de bas de page passée la 1ère référence. -\renewbibmacro*{cite:short}{\usebibmacro{cite:full}} +\renewbibmacro*{cite:short}{% + \usebibmacro{cite:full:citepages}% + \printtext{% + \usedriver + {\DeclareNameAlias{sortname}{default}} + {\thefield{entrytype}}}% + \usebibmacro{shorthandintro}} % commande de citation générique, dérivée de \smartcite. \DeclareCiteCommand{\cite}[\iffootnote\bibfootnotewrapper\mkbibfootnote] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/droit-fr/droit-fr.cls new/tex/latex/droit-fr/droit-fr.cls --- old/tex/latex/droit-fr/droit-fr.cls 2013-05-10 00:54:20.000000000 +0200 +++ new/tex/latex/droit-fr/droit-fr.cls 2014-02-09 00:11:50.000000000 +0100 @@ -1,38 +1,35 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{droit-fr}[2013/05/04 v0.2 classe pour droit francais] +\ProvidesClass{droit-fr}[2014/01/30 v0.4 classe pour droit francais] \LoadClassWithOptions{memoir} % classe de référence: memoir -%%% PACKAGES REQUIS %%% - -\RequirePackage[utf8]{inputenc} -\RequirePackage[T1]{fontenc} -\RequirePackage{mathptmx} % police Times -\RequirePackage{engrec} % compteur à symbole grecs -\RequirePackage{filecontents} % génération des fichers de style makeindex -\RequirePackage{lipsum} % génération de texte automatique -\RequirePackage{ifdraft} % comportements spécifiques quand l'option de classe draft est présente -\RequirePackage{xifthen} % code conditionnel -\RequirePackage{kvoptions} % support des options de type clé=valeur -\RequirePackage{babel} % support des langues -\RequirePackage[babel]{csquotes} % support des guillemets babel -\RequirePackage{hyperref} % hyperliens PDF -\RequirePackage{bookmark} % signets PDF - %%% OPTIONS %%% +\RequirePackage{kvoptions} % support des options de type clé=valeur \SetupKeyvalOptions{family=drfr,prefix=drfr@} -\DeclareBoolOption{footnotereset} +\DeclareBoolOption[true]{footnotereset} +\DeclareBoolOption[true]{versetitle} \ProcessKeyvalOptions{drfr} \ifdrfr@footnotereset % reset des notes de bas de page à chaque nouvelle page -\RequirePackage[perpage]{footmisc} +\PassOptionsToPackage{perpage}{footmisc} \else % numérotation continue des notes de bas de pages du début à la fin \counterwithout{footnote}{chapter} \fi +%%% PACKAGES REQUIS %%% +\RequirePackage[utf8]{inputenc} % pour bonne interprétation des caractère spéciaux dans la classe +\RequirePackage{ifdraft} % comportements spécifiques quand l'option de classe draft est présente +\RequirePackage{xifthen} % code conditionnel +\RequirePackage{xstring} % code conditionnel +\RequirePackage{footmisc} % gestion des notes de bas de page +\RequirePackage{engrec} % compteur à symbole grecs +\RequirePackage{filecontents} % génération des fichers de style makeindex +\usepackage{babel} % support des langues +\usepackage[babel]{csquotes} % support des guillemets babel + %%% PAGE DE TITRE %%% % université @@ -84,10 +81,10 @@ \thispagestyle{empty} \begin{center} -{\LARGE Université \theuniversity \\[1\onelineskip]} -{\large École doctorale de \theschool \\[2\onelineskip]} +{\LARGE Universit\'e \theuniversity \\[1\onelineskip]} +{\large \'Ecole doctorale de \theschool \\[2\onelineskip]} -{Thèse de doctorat en \thespeciality \\ +{Th\`ese de doctorat en \thespeciality \\ soutenue le \theapprovaldate \\[2\onelineskip]} {\LARGE\bfseries \thetitle \\[2\onelineskip]} @@ -161,11 +158,11 @@ %%% SECTIONS %%% -% parties ("Première partie") +% [-2] parties ("Première partie") % macro de conversion compteur => chaine de caractères de genre féminin \newcommand{\counterToFrenchF}[1]{\ifcase\value{#1}\or Première\or - Seconde\or Troisième\or Quatrième\or Cinquième\or + Deuxième\or Troisième\or Quatrième\or Cinquième\or Sixième\or Septième\or Huitième\or Neuvième\or Dixième\or Onzième\or Douzième\or Treizième\or Quatorzième\or Quinzième\or Seizième\or Dix-septième\or Dix-huitième\or Dix-neuvième\or Vingtième\fi} @@ -174,7 +171,7 @@ \renewcommand{\printbooknum}{} % numéro \newcommand{\partie}{\book} -% titres (I) +% [-1] titres (I) \AtBeginDocument{% \renewcommand*{\partname}{Titre} @@ -182,77 +179,81 @@ \counterwithin*{part}{book}% RAZ du compteur \part dans un nouveau book \newcommand{\titre}{\part} -% chapitres (1) +% [0] chapitres (1) \counterwithin*{chapter}{part}% RAZ du compteur \chapter dans une nouvelle part \newcommand{\chapitre}{\chapter} -% sections (I) +% [1] sections (I) \renewcommand*{\thesection}{Section \Roman{section}} %\setbeforesecskip{} %\setsecindent{} \setaftersecskip{2em} -\setsecheadstyle{\LARGE\bfseries} -\newcommand{\sectio}{\section} +\setsecheadstyle{\LARGE\bfseries\raggedright} +\setsechook{\needspace{4\baselineskip}} -% paragraphes (§1) +% [2] paragraphes (§1) -\renewcommand*{\thesubsection}{\S\ \arabic{subsection}.} +\renewcommand*{\thesubsection}{\S~\arabic{subsection}.} %\setbeforesubsecskip{} %\setsubsecindent{} \setaftersubsecskip{1.5em} -\setsubsecheadstyle{\Large\bfseries} +\setsubsecheadstyle{\Large\bfseries\raggedright} +\setsubsechook{\needspace{4\baselineskip}} \newcommand{\paragraphe}{\subsection} -% sous-paragraphes (A.) +% [3] sous-paragraphes (A.) \renewcommand*{\thesubsubsection}{\Alph{subsubsection}.} %\setbeforesubsubsecskip{} %\setsubsubsecindent{} %\setaftersubsubsecskip{} -\setsubsubsecheadstyle{\large\bfseries} +\setsubsubsecheadstyle{\large\bfseries\raggedright} +\setsubsubsechook{\needspace{4\baselineskip}} \newcommand{\souspara}{\subsubsection} -% alinéas (1.) +% [4] alinéas (1.) \renewcommand*{\theparagraph}{\arabic{paragraph}.} %\setbeforeparaskip{} %\setparaindent{} %\setafterparaskip{} -%\setparaheadstyle{} +\setparaheadstyle{\bfseries\raggedright} +\setparahook{\needspace{4\baselineskip}} \newcommand{\alinea}{\paragraph} -% sous-alinéas (a.) +% [5] sous-alinéas (a.) \renewcommand*{\thesubparagraph}{\alph{subparagraph}.} %\setbeforesubparaskip{} -%\setsubparaindent{} -%\setaftersubparaskip{} -%\setsubparaheadstyle{} +\setsubparaindent{0pt} +%\setaftersubparaskip{} % +\setsubparaheadstyle{\bfseries\raggedright} +\setsubparahook{\needspace{4\baselineskip}} \newcommand{\sousalinea}{\subparagraph} -% points (i.) +% [6] points (i.) \newcommand{\subsubparagraph}{\@startsection{subsubparagraph} {6}{\parindent}{1\baselineskip plus 0.25\baselineskip} - {.5em}{\normalsize\bfseries}} + {.5em}{\normalsize\bfseries\raggedright}} \newlistentry[subparagraph]{subsubparagraph}{toc}{5} \newcommand*{\subsubparagraphmark}[1]{} % gobble heading mark \renewcommand{\thesubsubparagraph}{\roman{subsubparagraph}.} \newcommand{\point}{\subsubparagraph} -% souspoints (alpha.) +% [7] souspoints (alpha.) \newcommand{\subsubsubparagraph}{\@startsection{subsubsubparagraph} {7}{\parindent}{1\baselineskip plus 0.25\baselineskip} - {.5em}{\normalsize\bfseries}} + {.5em}{\normalsize\bfseries\raggedright}} \newlistentry[subsubparagraph]{subsubsubparagraph}{toc}{6} \newcommand*{\subsubsubparagraphmark}[1]{} % gobble heading mark \renewcommand{\thesubsubsubparagraph}{\engrec{subsubsubparagraph}.} \newcommand{\souspoint}{\subsubsubparagraph} -% versets (paragraphes numérotés) +% [8] versets (paragraphes numérotés) \newcommand{\versetsec}[1]{\@startsection{versetsec} {8}{\parindent}{0.5\baselineskip} @@ -261,15 +262,48 @@ \newcommand*{\versetsecmark}[1]{} % gobble heading mark \renewcommand{\theversetsec}{\arabic{versetsec}.} -\newcommand{\versetsecfilled}{\versetsec{-0.5em}} +\newcommand{\versetsecfilled}{\versetsec{-1em}} \newcommand{\versetsecblank}{\versetsec{-0em}} % référencement des versets dans l'index \newcounter{indexv} -\newcommand{\verset}[1]{% + +% style des versets: caractères séparateur avec le texte +\newcommand{\versetsep}{} +\newcommand{\versetsepifempty}{} +\newcommand{\versetsepspace}{1em} +\newcommand{\versetsepstyle}{\normalfont} + +% ajout de point final si nécessaire. +% aucun point n'est ajouté si le verset est déjà fini par "!", "?", "." ou "/ldots". +\newcommand{\versetdot}[1]{% + \IfEndWith{#1}{.}{}{% + \IfEndWith{#1}{?}{}{% + \IfEndWith{#1}{!}{}{% + \IfEndWith{#1}{\ldots}{}{.}% + }% + }% + }% +} + +\newcommand{\versetcontent}[1]{% \ifthenelse{\equal{#1}{}}% {\versetsecblank{#1}}% - {\versetsecfilled{#1}}% + {\versetsecfilled{#1\protect\versetdot{#1}}}% +} + +\newcommand{\verset}[1]{% + \ifdrfr@versetitle% + \ifthenelse{\equal{#1}{}}% + {\ifthenelse{\equal{\versetsepifempty}{}}% + {\versetcontent{#1}}% + {\versetcontent{{\versetsepstyle\versetsepifempty}}}}% + {\ifthenelse{\equal{\versetsep}{}}% + {\versetcontent{#1}}% + {\versetcontent{#1\hspace{\versetsepspace}{\versetsepstyle\versetsep}}}}% + \else% + \versetcontent{{\versetsepstyle\versetsepifempty}}% + \fi% \addtocounter{indexv}{1}% } @@ -278,6 +312,8 @@ \maxsecnumdepth{all} \setcounter{secnumdepth}{7} % pour points (6) et sous-points (7) +% option pour éviter les pbs d'hyperliens ambigus (de \part et \chapter) +\PassOptionsToPackage{hypertexnames=false}{hyperref} %%% REFERENCES CROISEES @@ -295,13 +331,6 @@ \renewcommand{\memglodesc}[1]{\hspace{1ex}#1} \renewcommand{\memglonum}[1]{} -% groupes par lettre alphabétique -\newcommand{\doglobookmark}[1]{% -{\bfseries\centering% -#1\phantomsection\pdfbookmark[1]{#1}{#1-glo}% -\vskip\onelineskip\par}} - - %%% INDEX %%% \renewcommand*{\seename}{\textit{voir}} @@ -309,30 +338,25 @@ \ifdraft{\showindexmarks}{} -\newcommand{\indexv}[1]{\specialindex{\jobname}{indexv}{#1}} -\newcommand{\printindexv}{\printindex[\jobname]} +% index de base par versets +\newcommand{\indexvfilename}{\jobname} +\newcommand{\makeindexv}{\makeindex[\indexvfilename]} +\newcommand{\indexv}[1]{\specialindex{\indexvfilename}{indexv}{#1}} +\newcommand{\printindexv}{\printindex[\indexvfilename]} + +% index d'auteur par versets +\newcommand{\indexafilename}{auteurs} +\newcommand{\makeindexa}{\makeindex[\indexafilename]} +\newcommand{\indexa}[1]{\specialindex{\indexafilename}{indexv}{#1}} +\newcommand{\printindexa}{\printindex[\indexafilename]} +% entête de l'index \newcommand{\idxmark}[1]{#1\markboth{#1}{#1}} +% raccourcis de style pour entrées indexées \newcommand{\hyperbf}[1]{\textbf{\hyperpage{#1}}} \newcommand{\hyperit}[1]{\textit{\hyperpage{#1}}} -% groupes par lettre alphabétique -\newcommand{\doidxbookmark}[1]{% -{\def\@tempa{Symbols}\def\@tempb{#1}% -\bfseries\centering \ifx\@tempa\@tempb % -Symboles -\phantomsection% -\pdfbookmark[1]{Symboles}{Analphabetics-idx}% -\label{AnalphabeticsAnalphabeticsAnalphabetics-idx}% -\else -#1% -\phantomsection% -\pdfbookmark[1]{#1}{#1-idx}% -% \label{#1#1#1-idx}% -\fi% -\vskip\onelineskip\par}} - %%% SOMMAIRE & TABLE DES MATIERES %%% @@ -476,9 +500,9 @@ % not forgetting the subitem case% added 2008 item_x1 "} \n \\subitem " % Wrap and uppercase head letters -headings_flag 1 -heading_prefix "\\doidxbookmark{" -heading_suffix "}" +heading_prefix "{\\bfseries\\hfil " +heading_suffix "\\hfil}\\nopagebreak\n" +headings_flag 1 \end{filecontents} % génération du fichier de style .gst @@ -489,9 +513,9 @@ item_0 "\n\\glossitem" delim_0 "{\\memglonum{" encap_suffix "}}}" +heading_prefix "{\\bfseries\\hfil " +heading_suffix "\\hfil}\\nopagebreak\n" headings_flag 1 -heading_prefix "\\doglobookmark{" -heading_suffix "}" % Input style parameters keyword "\\glossaryentry" \end{filecontents} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/droit-fr.tlpobj new/tlpkg/tlpobj/droit-fr.tlpobj --- old/tlpkg/tlpobj/droit-fr.tlpobj 2013-05-10 03:42:47.000000000 +0200 +++ new/tlpkg/tlpobj/droit-fr.tlpobj 2014-02-09 03:23:27.000000000 +0100 @@ -1,17 +1,18 @@ name droit-fr category Package -revision 30356 +revision 32918 shortdesc Document class and bibliographic style for French law. relocated 1 longdesc The bundle provides a toolkit intended for students writing a -longdesc thesis in French law. It features: - a LaTeX document class; - -longdesc a bibliographic style for Biblatex package; - a practical -longdesc example of french thesis document; and - documentation. +longdesc thesis in French law. It features: a LaTeX document class; a +longdesc bibliographic style for Biblatex package; a practical example +longdesc of french thesis document; and documentation. The class assumes +longdesc use of biber and biblatex. runfiles size=9 RELOC/tex/latex/droit-fr/droit-fr.bbx RELOC/tex/latex/droit-fr/droit-fr.cbx RELOC/tex/latex/droit-fr/droit-fr.cls catalogue-ctan /macros/latex/contrib/droit-fr -catalogue-date 2013-05-09 13:28:31 +0200 +catalogue-date 2014-02-08 13:46:42 +0100 catalogue-license lppl1.3 -catalogue-version 0.2 +catalogue-version 0.4 ++++++ dtxgallery.source.tar.xz ++++++ ++++++ dtxgen.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/dtxgen/README new/texmf-dist/doc/support/dtxgen/README --- old/texmf-dist/doc/support/dtxgen/README 2013-04-24 00:11:26.000000000 +0200 +++ new/texmf-dist/doc/support/dtxgen/README 2014-04-26 02:12:22.000000000 +0200 @@ -1,24 +1,15 @@ ----------------------------------------------------------------- -dtxgen --- generate template for LaTeX self-extracting .dtx file -Version: 1.03 -Author: Wybo Dekker -E-mail: wybo@xs4all.nl -License: Released under the GNU General Public License -See: http://www.gnu.org/copyleft/gpl.html ----------------------------------------------------------------- + script: dtxgen - generate template for LaTeX self-extracting .dtx file + type: bash + author: Wybo Dekker + email: wybo@dekkerdocumenten.nl +version: 1.04 +license: Released under the GNU General Public License +-------------------------------------------------------------------------------- +dtxgen creates a template for a self-extracting .dtx file, based on the model described by +U{www.texdev.net/2009/10/06/a-model-dtx-file/}{Joseph Wright}. It is useful for +those who plan to create a new Documented LaTeX Source (.dtx) file. -Short description: -dtxgen creates a template for a self-extracting .dtx file. It is useful for -those who plan to create a new Documented LaTeX Source (.dtx) file. +Changes with respect version 1.03: +- Clearer comments +- scripts' README information incorporated in the documentation. -The script takes some variables such as: -- name and email address of the author, -- a short description of the class or package generated from the .dtx file, -- a date -from environment variables, or from command line options and generates a -template for the .dtx file with some minimal examples. Of course, the user -will have to replace those examples with the real work. - -Major changes of release 1.03 relative to 1.00: -- dtx files contain only one version number -- presence of sed executable is tested Files old/texmf-dist/doc/support/dtxgen/dtxgen.pdf and new/texmf-dist/doc/support/dtxgen/dtxgen.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtxgen.doc.tlpobj new/tlpkg/tlpobj/dtxgen.doc.tlpobj --- old/tlpkg/tlpobj/dtxgen.doc.tlpobj 2013-04-24 03:41:38.000000000 +0200 +++ new/tlpkg/tlpobj/dtxgen.doc.tlpobj 2014-04-26 03:25:16.000000000 +0200 @@ -1,7 +1,7 @@ name dtxgen.doc category Package -revision 30077 +revision 33681 shortdesc doc files of dtxgen -docfiles size=17 +docfiles size=12 texmf-dist/doc/support/dtxgen/README texmf-dist/doc/support/dtxgen/dtxgen.pdf ++++++ dtxgen.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/dtxgen/dtxgen new/texmf-dist/scripts/dtxgen/dtxgen --- old/texmf-dist/scripts/dtxgen/dtxgen 2013-04-24 00:11:26.000000000 +0200 +++ new/texmf-dist/scripts/dtxgen/dtxgen 2014-04-26 02:12:22.000000000 +0200 @@ -1,144 +1,137 @@ #!/bin/bash -<<'LATEX' -== dtxgen - generate template for LaTeX self-extracting .dtx file -== Usage +version=1.04 +myname=$(basename $0) - dtxgen [options] basename.[sty|cls] +<<'DOC' += dtxgen - generate template for LaTeX self-extracting .dtx file -== Options += Synopsis +dtxgen [options] basename.[sty,cls] -\B{dtxgen} recognizes the following options: - -\tabtx -|-s, --short=...|& -A short, one-liner, description for the class or package. By default, the -string `A new LaTeX class' or `A new LaTeX package' will be used.\\ - -|-n, --name=...|& -Your name (first name, followed by surname). Alternatively, you can set a -default value in the environment variable |NAME|; if you do so and still -use this option, the option's value will have priority.\\ - -|-m, --mail=...|& -Your email address. Alternatively, you can set a default value in the -environment variable |EMAIL|; if you do so and still use this option, the -option's value will have priority.\\ - -|-c, --class=...|& -For class templates only: inserts a |\LoadClass{...}|, so that the new -class will start with the properties of the \F{...} class. The default is -\F{article}.\\ - -|-d, --date=...|& -Set the initial version's date. By default, the current date will be used. -The date should be entered in the |yyyymmdd| format, although it will be -stored the LaTeX way: |yyyy/mm/dd|.\\ - -|-V, --version|& -Prints the script's version and exits.\\ - -|-h, --help|& -Prints help information and exits.\\ -\end{tabularx} - -== Description - -This script is based on the self-extracting model dtx file described by -Joseph Wright, see\\\url{http://www.texdev.net/2009/10/06/a-model-dtx-file/}. - -You can use \B{dtxgen} when you decide to create a new LaTeX class or style. -For example, when you decide to make a class named \S{myclass}, you could run: += Description +dtxgen creates a template for a self-extracting .dtx file, based on the model described by +U{www.texdev.net/2009/10/06/a-model-dtx-file/}{Joseph Wright}. It is useful for +those who plan to create a new Documented LaTeX Source (.dtx) file. +Usage example: + dtxgen -n 'your name' -m 'your@email.ad' myclass.cls -or, if you have an environment with your name and email address defined in +The script takes some variables such as: +- name and email address of the author, +- a short description of the class or package generated from the .dtx file, +- a date +from environment variables, or from command line options and generates, +among more, a template for the .dtx file with some minimal examples. Of +course, the user will have to replace those examples with the real work, +but the dates, basename, author's name and email address are already in +place and, depending on whether you use used a .cls or a .sty extension +in the argument, it is formatted to be either a class or a package +source file. + +If you have an environment with your name and email address defined in NAME and EMAIL, you could simply type: dtxgen myclass.cls -and you would end up with five files: \F{myclass.dtx}, \F{myclass.cls}, -\F{myclass.pdf}, \F{README}, and \F{Makefile}. +and you would end up with five files: |myclass.dtx|, |myclass.cls|, +|myclass.pdf|, |README|, and |Makefile|. -The resulting .dtx file is a template file in which some minimal example -content will have to be replaced with real content, but the dates, -basename, author's name and email address are already in place and, -depending on whether you use used a .cls or a .sty extension in the -argument, it is formatted to be either a class or a package source file. - -== Makefile - -The \F{Makefile} can be used to compile new versions of your work; it contains the following targets: - -\tabtx -all & (the default) generate the style or class file, the pdf-documentation, and a README file.\\ -distclean & remove all files that can be regenerated,\\ -clean & same, except the style or class file, the pdf-documentation, and a README file.\\ -inst & install in the user's TeX tree,\\ -install & install in the local TeX tree (uses sudo)\\ -zip & produce a zip file ready for upload to CTAN -\end{tabularx} - -LATEX - -VERSION=1.03 -MYNAME=`basename $0` - -function help { - cat <<-EOF - This is dtxgen version $VERSION - - Usage: dtxgen [options] filename.[cls|sty] - - Options: - -h, --help print this help and exit - -v, --version print version and exit - -s, --short short description; default: A new LaTeX package/class - -d, --date date in yyyymmdd format; default: today (`date +%Y%m%d`) - -n, --name author's name; default: \$NAME (${NAME:-(not set)}) - -m, --mail author's email address; default: \$EMAIL (${EMAIL:-(not set)}) - -c, --class for class files: the class to be \\LoadClass\'d; default: article - -q, --quiet be quiet - EOF -} += Options +dtxgen recognizes the following options: -# print error message, remove temporary files, and exit -function die { - echo -e "$*" - exit 1 -} +-s,--short=... + A short, one-liner, description for the class or package. + By default, the string /A new LaTeX class/ or /A new LaTeX package/ + will be used. +-n,--name=... + Your name (first name, followed by surname). Alternatively, + you can set a default value in the environment variable |NAME|; + if you do so and still use this option, the option's value wills + have priority. +-m,--mail=... + Your email address. Alternatively, you can set a default value ins + the environment variable |EMAIL|; if you do so and still use this + option, the option's value will have priority. +-c,--class=... + For class templates only: inserts a |\LoadClass{...}|, so that the + new class will start with the properties of the |...| class. + The default is |article|. +-d,--date=... + Set the initial version's date. By default, the current date will + be used. The date should be entered in the |yyyymmdd| format, + although it will be stored the LaTeX way: |yyyy/mm/dd|. +-q,--quiet + Run quietly +-V,--version + Prints the script's version and exits. +-h,--help + Prints help information and exits. +-H,--Help + print full documentation via less and exit + += Makefile +The |Makefile| can be used to compile new versions of your work; it contains the following targets: + +all (the default) generate the style or class file, the pdf-documentation, + and a README file. +distclean remove all files that can be regenerated, +clean same, except the style or class file, the pdf-documentation, + and a README file. +inst install in the user's TeX tree, +install install in the local TeX tree (uses sudo) +zip produce a zip file ready for upload to CTAN + += Changes +Changes with respect version 1.03: +- Clearer comments +- scripts' README information incorporated in the documentation. + += Author and copyright +Author Wybo Dekker +Email U{Wybo@dekkerdocumenten.nl}{wybo@dekkerdocumenten.nl} +License Released under the U{www.gnu.org/copyleft/gpl.html}{GNU General Public License} +DOC + + die() { echo -e "$myname: $Err$@$Nor" 1>&2; exit 1; } + help() { sed -n '/^= Synopsis/,/^= /p' $0|sed '1s/.*/Usage:/;/^= /d'; exit; } +helpall() { sed -n '/^<<.DOC.$/,/^DOC$/p' $0|sed -n '1d;$d;p'|less; exit; } +version() { echo $version; exit; } +install() { which instscript>&/dev/null && instscript -zp $myname; exit; } + +Nor='\e[0m' # reset color ] +Err='\e[31;1m' # light red ] +test ${BASH_VERSINFO[0]} -ge 4 || die "Need bash version >= 4 (you have $BASH_VERSION)" # using the label in arg 2, read template from my self, filter it -# throught the script in arg 1, and write the output to the file in arg 3. +# through the script in arg 1, and write the output to the file in arg 3. # The default for arg 3 is arg 2 function createfile { - FILE=$3 - test "$FILE" = "" && FILE=$2 - sed -n "/^<<'$2'/,/^$2/p" $0 |tail -n +2 |head -n -1 |sed "$1" >$FILE + file=$3 + test "$file" = "" && file=$2 + sed -n "/^<<'$2'/,/^$2/p" $0 |tail -n +2 |head -n -1 |sed "$1" >$file } -test ${BASH_VERSINFO[0]} -ge 4 || - die Your bash has version $BASH_VERSION, but it should be at least version 4 -for i in sed getopt; do - type $i >&/dev/null || - die dtxgen needs sed and getopt, but $i is not in your PATH -done - -if ! options=$(getopt -o s:n:m:c:d:hvqI \ - -l help,short:,name:,mail:,class:,date:,version,quiet -- "$@"); then exit 1; fi +if ! options=$(getopt \ + -n $myname \ + -o s:n:m:c:d:hHVqI \ + -l short:,name:,mail:,class:,date:,help,Help,version,quiet -- "$@" +); then exit 1; fi eval set -- "$options" while [ $# -gt 0 ]; do case $1 in - -h|--help) help; exit 0;; - -v|--version) echo $VERSION; exit 0;; - -s|--short) short=$2; shift 2;; - -d|--date) date=$2; shift 2;; - -m|--mail) mail=$2; shift 2;; - -n|--name) name=$2; shift 2;; - -c|--class) loadclass=$2; shift 2;; - -q|--quiet) quiet=--quiet; shift;; - -I) instscript $MYNAME; exit 0;; # not for general use + (-h|--help) help;; + (-H|--Help) helpall;; + (-V|--version) version;; + (-I) install;; + (-s|--short) short=$2; shift 2;; + (-d|--date) date=$2; shift 2;; + (-m|--mail) mail=$2; shift 2;; + (-n|--name) name=$2; shift 2;; + (-c|--class) loadclass=$2; shift 2;; + (-q|--quiet) quiet=--quiet; shift;; (--) shift; break;; (*) break;; esac @@ -146,37 +139,37 @@ name=${name:-${NAME:-(not set)}} mail=${mail:-${EMAIL:-(not set)}} -date=${date:-`date +%Y%m%d`} +date=${date:-$(date +%Y%m%d)} year=${date:0:4} loadclass=${loadclass:-article} # date must be 8 digits; insert the two /'s: if [[ ! $date =~ ^[[:digit:]]{8}$ ]]; then die illegal date; fi -date=`sed 's/\(....\)\(..\)\(..\)/\1\\\\\/\2\\\\\/\3/' <<<$date` +date=$(sed 's/\(....\)\(..\)\(..\)/\1\\\/\2\\\/\3/' <<<$date) # argument must have .clls or .sty extension: -read base ext <<<`echo $1 |sed 's/\./ /'` +read base ext <<<$(echo $1 |sed 's/\./ /') case "$ext" in -cls) typ=class; Typ=Class; +(cls) typ=class; Typ=Class; short=${short:-A new LaTeX class} lcl='\\LoadClass[a4paper,fleqn]{'"$loadclass}" ;; -sty) typ=package; Typ=Package; +(sty) typ=package; Typ=Package; short=${short:-A new LaTeX package} use='\\usepackage{\\jobname}' ;; -*) die "The argument must have .cls or .sty extension +(*) die "The argument must have .cls or .sty extension (try the --help option)" esac # The short description may contain TeX commands, but then we need # a version without them at some places; note that this removes only # simple contructs: -shrt=`sed 's/\\\\[[:alpha:]]\\+{\\([^}]*\\)}/\\1/g;s/\\\\//g' <<<$short` +shrt=$(sed 's/\\[[:alpha:]]\\+{\\([^}]*\\)}/\\1/g;s/\\//g' <<<$short) # Any \'s in the short description need to be duplicated for the script: -short=`sed 's/\\\\/\\\\\\\\/g' <<<$short` +short=$(sed 's/\\/\\\\/g' <<<$short) test -z "$mail" && die "author's email not set - use option or environment variable EMAIL" test -z "$name" && die "author's name not set - use option or environment variable NAME" @@ -283,9 +276,9 @@ %name%. This work consists of the file %base%.dtx and a Makefile. -Running make generates the derived files README.txt, %base%.pdf and %base%.%ext%. -Running make inst installs the files in the user's TeX tree. -Running make install installs the files in the local TeX tree. +Running "make" generates the derived files README, %base%.pdf and %base%.%ext%. +Running "make inst" installs the files in the user's TeX tree. +Running "make install" installs the files in the local TeX tree. \endpostamble @@ -414,32 +407,3 @@ % \end{macrocode} %\Finale DTX - -<<'README' ----------------------------------------------------------------- -dtxgen --- generate template for LaTeX self-extracting .dtx file -Version: %VERSION% -Author: Wybo Dekker -E-mail: wybo@xs4all.nl -License: Released under the GNU General Public License -See: http://www.gnu.org/copyleft/gpl.html ----------------------------------------------------------------- - -Short description: -dtxgen creates a template for a self-extracting .dtx file. It is useful for -those who plan to create a new Documented LaTeX Source (.dtx) file. - -The script takes some variables such as: -- name and email address of the author, -- a short description of the class or package generated from the .dtx file, -- a date -from environment variables, or from command line options and generates a -template for the .dtx file with some minimal examples. Of course, the user -will have to replace those examples with the real work. - -Major changes of release %VERSION% relative to 1.00: -- dtx files contain only one version number -- presence of sed executable is tested -README - -# $Id: dtxgen,v 1.8 2013/04/22 15:33:25 wybo Exp $ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtxgen.tlpobj new/tlpkg/tlpobj/dtxgen.tlpobj --- old/tlpkg/tlpobj/dtxgen.tlpobj 2013-04-24 03:41:38.000000000 +0200 +++ new/tlpkg/tlpobj/dtxgen.tlpobj 2014-04-26 03:25:16.000000000 +0200 @@ -1,6 +1,6 @@ name dtxgen category Package -revision 30077 +revision 33681 shortdesc Creates a template for a self-extracting .dtx file. longdesc The bash script dtxgen creates a template for a self-extracting longdesc .dtx file. It is useful for those who plan to create a new @@ -9,6 +9,6 @@ runfiles size=4 texmf-dist/scripts/dtxgen/dtxgen catalogue-ctan /support/dtxgen -catalogue-date 2013-04-22 18:47:59 +0200 +catalogue-date 2014-04-25 13:42:50 +0200 catalogue-license gpl -catalogue-version 1.03 +catalogue-version 1.04 ++++++ dvicopy.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/dvicopy.1 new/texmf-dist/doc/man/man1/dvicopy.1 --- old/texmf-dist/doc/man/man1/dvicopy.1 2013-04-08 23:16:34.000000000 +0200 +++ new/texmf-dist/doc/man/man1/dvicopy.1 2014-04-29 00:59:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH DVICOPY 1 TeX "24 January 1999" "Web2C 2013" +.TH DVICOPY 1 TeX "24 January 1999" "Web2C 2014" .\"===================================================================== .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP .if n .ds TX TeX Files old/texmf-dist/doc/man/man1/dvicopy.man1.pdf and new/texmf-dist/doc/man/man1/dvicopy.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dvicopy.doc.tlpobj new/tlpkg/tlpobj/dvicopy.doc.tlpobj --- old/tlpkg/tlpobj/dvicopy.doc.tlpobj 2013-04-09 03:40:06.000000000 +0200 +++ new/tlpkg/tlpobj/dvicopy.doc.tlpobj 2014-04-29 03:29:03.000000000 +0200 @@ -1,6 +1,6 @@ name dvicopy.doc category TLCore -revision 29764 +revision 33736 shortdesc doc files of dvicopy docfiles size=3 texmf-dist/doc/man/man1/dvicopy.1 ++++++ dvidvi.tar.xz ++++++ Files old/texmf-dist/doc/man/man1/dvidvi.man1.pdf and new/texmf-dist/doc/man/man1/dvidvi.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dvidvi.tlpobj new/tlpkg/tlpobj/dvidvi.tlpobj --- old/tlpkg/tlpobj/dvidvi.tlpobj 2013-04-09 03:40:07.000000000 +0200 +++ new/tlpkg/tlpobj/dvidvi.tlpobj 2014-04-29 03:29:04.000000000 +0200 @@ -1,6 +1,6 @@ name dvidvi category TLCore -revision 29764 +revision 33736 shortdesc Convert one DVI file into another. longdesc The output DVI file's contents are specified by page selection longdesc commands; series of pages and page number ranges may be ++++++ dviljk.doc.tar.xz ++++++ Files old/texmf-dist/doc/man/man1/dvihp.man1.pdf and new/texmf-dist/doc/man/man1/dvihp.man1.pdf differ Files old/texmf-dist/doc/man/man1/dvilj.man1.pdf and new/texmf-dist/doc/man/man1/dvilj.man1.pdf differ Files old/texmf-dist/doc/man/man1/dvilj2p.man1.pdf and new/texmf-dist/doc/man/man1/dvilj2p.man1.pdf differ Files old/texmf-dist/doc/man/man1/dvilj4.man1.pdf and new/texmf-dist/doc/man/man1/dvilj4.man1.pdf differ Files old/texmf-dist/doc/man/man1/dvilj4l.man1.pdf and new/texmf-dist/doc/man/man1/dvilj4l.man1.pdf differ Files old/texmf-dist/doc/man/man1/dvilj6.man1.pdf and new/texmf-dist/doc/man/man1/dvilj6.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dviljk.doc.tlpobj new/tlpkg/tlpobj/dviljk.doc.tlpobj --- old/tlpkg/tlpobj/dviljk.doc.tlpobj 2013-04-09 03:40:07.000000000 +0200 +++ new/tlpkg/tlpobj/dviljk.doc.tlpobj 2014-04-29 03:29:04.000000000 +0200 @@ -1,6 +1,6 @@ name dviljk.doc category TLCore -revision 29764 +revision 33736 shortdesc doc files of dviljk docfiles size=54 texmf-dist/doc/man/man1/dvihp.1 ++++++ dvipdfmx-def.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dvipdfmx-def/dvipdfmx.def new/tex/latex/dvipdfmx-def/dvipdfmx.def --- old/tex/latex/dvipdfmx-def/dvipdfmx.def 2008-07-06 02:42:25.000000000 +0200 +++ new/tex/latex/dvipdfmx-def/dvipdfmx.def 2014-05-02 23:13:48.000000000 +0200 @@ -1,23 +1,30 @@ %% This is file `dvipdfmx.def' for DVIPDFMx by J.-H. Cho and S. Hirata -%% which is written based on `dvipdf.def' in the LaTeX `Graphics Bundle'. +%% based upon `dvipdf.def' in the LaTeX `Graphics Bundle'. %% -%% This is file `dvipdf.def', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% drivers.dtx (with options: `dvipdf,color1,psrulesZ') +%% Copyright 2005-2014 Jin-Hwan Cho, Shunsaku Hirata +%% (with contributions from many others) %% -%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% -%% This file is part of the Standard LaTeX `Graphics Bundle'. +%% This file is not part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. %% Either version 1.0 or, at your option, any later version. %% +%% This driver is developed at: +%% http://puszcza.gnu.org.ua/projects/latexfmxdef +%% Please report bugs and patches through the tracker there. +%% Official releases, though, are made through CTAN: +%% http://www.ctan.org/pkg/dvipdfmx-def +%% http://www.ctan.org/pkg/dvipdfmx-def +%% +%% The original source files were: +%% drivers.dtx (with options: `dvipdf,color1,psrulesZ') +%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle +%% Copyright (C) 1994 David Carlisle Sebastian Rahtz +%% +% emacs-page \ProvidesFile{dvipdfmx.def} - [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)] + [2014/04/28 v4.01 LaTeX color/graphics driver for dvipdfmx (TeX Live/ChoF)] +% \def\c@lor@arg#1{% \dimen@#1\p@ \ifdim\dimen@<\z@\dimen@\maxdimen\fi @@ -108,7 +115,7 @@ \@makeother\-% \immediate\openin\@inputcheck#1 % \ifeof\@inputcheck - \immediate\write18{extractbb \Gin@base\Gin@ext} + \immediate\write18{extractbb \Gin@base\Gin@ext}% \immediate\openin\@inputcheck#1 % \fi \ifeof\@inputcheck @@ -168,7 +175,11 @@ \def\@tempa{!}% \special{pdf:image\space \ifx\Gin@page\@tempa\else page\space\Gin@page\space\fi - \ifGin@bbox + % The next line was \ifGin@bbox previously. However, LaTeX can read + % BoundingBox from a .xbb file even when \Gin@bboxfalse. + % Thus, we give bbox in the cases of trim/viewport, since + % trim/viewport don't work without bbox. + \ifx\Gin@ollx\@undefined\else bbox\space\Gin@llx\space\Gin@lly\space\Gin@urx\space\Gin@ury\space clip\space\ifGin@clip 1\else 0\fi\space \fi @@ -185,15 +196,31 @@ \def\Ginclude@eps#1{% \message{<#1>}% \bgroup + \newif\if@trim@vport + \ifx\Undefined\Gin@vllx\else\@trim@vporttrue\fi \def\@tempa{!}% + \dimen@\Gin@urx\p@ + \advance\dimen@ -\Gin@llx\p@ + \if@trim@vport + \advance\dimen@ \Gin@vllx\p@ + \fi + \edef\Gin@urx{\strip@pt\dimen@}% + \dimen@\Gin@ury\p@ + \advance\dimen@ -\Gin@lly\p@ + \if@trim@vport + \advance\dimen@ \Gin@vlly\p@ + \fi + \edef\Gin@ury{\strip@pt\dimen@}% \dimen@\Gin@req@width \dimen@ii.1bp% \divide\dimen@\dimen@ii \@tempdima\Gin@req@height \divide\@tempdima\dimen@ii \special{PSfile="#1"\space - llx=\Gin@llx\space - lly=\Gin@lly\space + \if@trim@vport + llx=\Gin@vllx\space + lly=\Gin@vlly\space + \fi urx=\Gin@urx\space ury=\Gin@ury\space \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\space\fi @@ -210,19 +237,43 @@ \def\Gin@PS@restored#1{\special{" #1}} \def\Gin@PS@literal@header#1{\AtBeginDvi{\special{! #1}}} \def\Gin@PS@file@header#1{\AtBeginDvi{\special{header=#1}}} -\def\Gin@extensions{.pdf,.jpg,.jpeg,.png,.bmp,.ps,.eps,.pz,.eps.Z,.ps.Z,.ps.gz,.eps.gz} +\def\Gin@extensions{% order here is like xetex.def, except for PS + .pdf,.PDF,.ai,.AI,% + .png,.PNG,.jpg,.JPG,.jpeg,.JPEG,.bmp,.BMP,% + .ps,.PS,.eps,.EPS,% + .pz,.eps.Z,.ps.Z,.ps.gz,.eps.gz} +% \@namedef{Gin@rule@.pdf}#1{{pdf}{.xbb}{#1}} +\@namedef{Gin@rule@.PDF}#1{{pdf}{.xbb}{#1}} +% +\@namedef{Gin@rule@.ai}#1{{pdf}{.xbb}{#1}} +\@namedef{Gin@rule@.AI}#1{{pdf}{.xbb}{#1}} +% \@namedef{Gin@rule@.jpg}#1{{bmp}{.xbb}{#1}} +\@namedef{Gin@rule@.JPG}#1{{bmp}{.xbb}{#1}} +% \@namedef{Gin@rule@.jpeg}#1{{bmp}{.xbb}{#1}} +\@namedef{Gin@rule@.JPEG}#1{{bmp}{.xbb}{#1}} +% \@namedef{Gin@rule@.png}#1{{bmp}{.xbb}{#1}} +\@namedef{Gin@rule@.PNG}#1{{bmp}{.xbb}{#1}} +% \@namedef{Gin@rule@.bmp}#1{{bmp}{.xbb}{#1}} +\@namedef{Gin@rule@.BMP}#1{{bmp}{.xbb}{#1}} +% \@namedef{Gin@rule@.ps}#1{{eps}{.ps}{#1}} +\@namedef{Gin@rule@.PS}#1{{eps}{.ps}{#1}} +% \@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}} +\@namedef{Gin@rule@.EPS}#1{{eps}{.eps}{#1}} +% +% (don't bother with uppercase versions for these Unixish extensions) \@namedef{Gin@rule@.pz}#1{{eps}{.xbb}{`gunzip -c #1}} \@namedef{Gin@rule@.eps.Z}#1{{eps}{.eps.xbb}{`gunzip -c #1}} \@namedef{Gin@rule@.ps.Z}#1{{eps}{.ps.xbb}{`gunzip -c #1}} \@namedef{Gin@rule@.ps.gz}#1{{eps}{.ps.xbb}{`gunzip -c #1}} \@namedef{Gin@rule@.eps.gz}#1{{eps}{.eps.xbb}{`gunzip -c #1}} +% \@namedef{Gin@rule@*}#1{{eps}{\Gin@ext}{#1}} \endinput %% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dvipdfmx-def.tlpobj new/tlpkg/tlpobj/dvipdfmx-def.tlpobj --- old/tlpkg/tlpobj/dvipdfmx-def.tlpobj 2010-06-10 18:25:35.000000000 +0200 +++ new/tlpkg/tlpobj/dvipdfmx-def.tlpobj 2014-05-03 03:26:37.000000000 +0200 @@ -1,6 +1,13 @@ name dvipdfmx-def category Package -revision 15878 +revision 33800 +shortdesc Configuration file for dvipdfmx graphics. relocated 1 -runfiles size=2 +longdesc This is the graphics driver for use when output is to be +longdesc processed by dvipdfmx. +runfiles size=3 RELOC/tex/latex/dvipdfmx-def/dvipdfmx.def +catalogue-ctan /macros/latex/contrib/dvipdfmx-def/dvipdfmx.def +catalogue-date 2014-05-02 18:56:42 +0200 +catalogue-license lppl +catalogue-version 4.01 ++++++ dvipdfmx.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/dvipdfm.1 new/texmf-dist/doc/man/man1/dvipdfm.1 --- old/texmf-dist/doc/man/man1/dvipdfm.1 2012-05-28 19:40:26.000000000 +0200 +++ new/texmf-dist/doc/man/man1/dvipdfm.1 2014-04-29 00:59:31.000000000 +0200 @@ -1,358 +1 @@ -.de EX -.sp -.in +5 -.nf -.ft CW -.. -.de EE -.in -5 -.ft R -.sp -.fi -.. -.TH "DVIPDFM" "1" "28 April 2011" "20120420" "DVIPDFMx" -.SH NAME -dvipdfm \- produce PDF files directly from DVI files - -.SH SYNOPSIS -.B dvipdfm -.RI [ options ] -.I file\c -.RB [ .dvi ] - -.SH DESCRIPTION -In TeX Live, -.B dvipdfm -is another incarnation of -.B dvipdfmx -rather than a separate program. Compatibility is attempted as best as -possible. (The change was made due to duplicated security and -configuration issues arising repeatedly.) Please report problems with -this -.B dvipdfm -to the -.B dvipdfmx -maintainers at dvipdfmx (at) ktug.or.kr. - -The program -.B dvipdfm -generates a -.SM PDF -file from a -.SM DVI -file. -.SM DVI -files are the output format -produced by TeX. -Output from -.B groff -can be converted to -.SM DVI -format -using -.BR grodvi . - -The program -.B dvipdfm -recognizes several commonly used -.BR \especial -commands, which are extensions to the -.SM DVI -format. -Specifically, it understands -color specials, papersize specials, -tpic specials (which allow it to be used with -.BR pic ), -hypertex specials, and some PostScript -specials. These extensions allow documents -to contain color, figures, and hyperlinks. -The program tries to mimic -the behavior of -.B dvips -so that many -macro packages produced for use with -.B dvips -will work with -.B dvipdfm. -Dvipdfm understands its own specific -.B \especial -commands to allow access to PDF features -such as annotations and bookmarks. - -For issues related to bounding boxes (and hence image sizes), please see -.BR extractbb (1). - -.SH OPTIONS - -.TP 5 -.B \-\^c -Ignore color -.BR \especials . -The -.B \-\^c -toggles a flag that disables color -.B \especial -processing. -Unless changed in the configuration file, -that flag is off, and color -.BR \especial "s" -are interpreted normally. -The -.B \-\^c -option may be used to produce a black and white document -from a document containing color TeX -.B \especial -commands. - -.TP 5 -.B \-\^d -Remove thumbnail images after including them. -(See the -.B \-\^t -option for more information.) - -.TP 5 -.B \-\^e -Toggle partial font embedding flag. If partial -font embedding is off, embedded fonts are -.I fully -embedded. -The default, if not changed in the configuration file, -is to embed only those glyphs actually used in the document. - -.TP 5 -.B \-\^f map_file -Set the name of the font map file to -.IR map_file . -The format of the font map file -is documented in the -.IR "Dvipdfm User's Manual" . - -.TP 5 -.B \-\^l -Select landscape mode. In other words, exchange the -.I x -and -.I y -dimensions of the paper. - -.TP 5 -.B \-\^m " mag" -Magnify the input document by -.IR mag . - -.TP 5 -.B \-\^o " name" -Generate PDF output file having the name -.IR name . -By default, the name of the output -file is -.IR file .pdf. - -.TP 5 -.B \-\^p " paper" -Select the papersize by name (e.g., -.BR letter ", " legal ", " ledger ", " tabloid ", " a3 ", " a4 ", or " a5 -) - -.TP 5 -.B \-\^r " size" -Set resolution of bitmapped fonts to -.B size -dots per inch. Bitmapped fonts are generated -by the Kpathsea library, which uses Metafont. Bitmapped -fonts are included as type 3 fonts in the PDF output file. - -.TP 5 -.B \-\^s " page_specifications" -Select the pages of the -.SM DVI -file to be converted. -The -.I page_specifications -consists of a comma separated list of -.I page_ranges: - -.EX -.IR "page_specifications := page_specification" "[," page_specifications "]" -.EE - -where - -.EX -.IR "page_specification := single_page" | page_range - -.IR "page_range := " [ first_page ]\^\-\^[ last_page ] -.EE - -An empty -.I first_page -is implied to be the first page of the -.SM DVI -file. -An empty -.I last_page -is treated as the last page of the -.SM DVI -file. - -Examples: -.RS -.TP 5 -.B "\-\^s 1,3,5" -includes pages 1, 3, and 5; -.TP 5 -.B "\-\^s \-" -includes all pages; -.TP 5 -.B "\-\^s \-,\-" -includes two copies of all pages in the -.SM DVI -file; -and -.TP 5 -.B "\-\^s 1\-10" -includes the first ten pages of the -.SM DVI -file. -.RE -.TP 5 -.B \-\^t -Search for thumbnail images of each page -in the directory named by the -.B TMPDIR -environment variable. -The thumbnail images must be named in a specific format. -They must have the same base name -as the -.SM DVI -file and they must have the page number as the extension -to the file name. Dvipdfm does not -generate the thumbnails itself, but it is distributed with a wrapper -program named -.B dvipdft -that does so. - -.TP 5 -.B \-\^v -Increase verbosity. -Results of the -.B \-\^v -option are cumulative (e.g., -.B \-\^vv -) increases the verbosity by two increments. - -.TP 5 -.B \-\^x x_offset -Set the left margin to -.IR x_offset . -The default left margin is -.BR 1.0in . -The dimension may be specified in any units understood by TeX (e.g., -.BR bpt ", " pt ", " in ", " cm -) - -.TP 5 -.B \-\^y y_offset -Set the top margin to -.IR y_offset . -The default top margin is -.BR 1.0in . -The dimension may be specified in any units understood by TeX (e.g., -.BR bpt ", " pt ", " in ", " cm -) - -.TP 5 -.B \-\^z compression_level -Set the compression level to -.IR compression_level . -Compressions levels range from 0 (no compression) to -9 (maximum compression) and correspond to the values understood by zlib. - -.SH "IMAGE BOUNDING BOXES" - -When including images with -.BR dvipdfm , -their bounding boxes should be generated by running -.BR ebb , -or extractbb -m. -The result will be in an -.B .bb -file. - -When including images with -.BR dvipdfmx , -their bounding boxes should be generated by running -.BR extractbb . -The result will be in an -.B .xbb -file; the xbb information is the same as for the PDF format. - -.SH ENVIRONMENT - -.B Dvipdfm -uses the -.B kpathsea -library for locating the files that it opens. Hence, -the environment variables documented in the -.I Kpathsea library -documentation influence -.B dvipdfm. - -Dvipdfm also reads the following environment variables: - -.TP 5 -TMP -The directory to search for thumbnail images of each page. - -.SH FILES -The precise location of the following files is determined by the -.I Kpathsea library -configuration. The location may be determined by using kpsewhich, e.g., -.nf -.B kpsewhich \-progname=dvipdfm \-format='other text files' config -.fi - -.TP 5 -.I config -Startup options - -.TP 5 -.I t1fonts.map -The default font map file (this name may be changed in the config file). - -.TP 5 -.I *.tfm -TeX font metrics - -.TP 5 -.I *.vf -TeX virtual font files - -.TP 5 -.I *.pfb -PostScript Type 1 font files - -.TP 5 -.I -texmf.cnf -The Kpathsea library configuration file. -The location of this file may be found by typing -.nf -.B kpsewhich texmf.cnf -.fi - - -.SH "SEE ALSO" -.BR dvipdft "(1), " -.BR tex "(1), " dvips "(1), " groff "(1), " grodvi "(1), " pic "(1), " -.BR extractbb "(1), " -and the -.I "Kpathsea library" -info documentation. - -.SH AUTHOR -Mark A. Wicks. But for the version in TeX Live, all bugs and other -reports should go to the -.B dvipdfmx -maintainers at dvipdfmx (at) ktug.or.kr. +.so man1/dvipdfmx.1 Files old/texmf-dist/doc/man/man1/dvipdfm.man1.pdf and new/texmf-dist/doc/man/man1/dvipdfm.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/dvipdfmx.1 new/texmf-dist/doc/man/man1/dvipdfmx.1 --- old/texmf-dist/doc/man/man1/dvipdfmx.1 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/man/man1/dvipdfmx.1 2014-04-29 00:59:31.000000000 +0200 @@ -0,0 +1,335 @@ +.de EX +.sp +.in +5 +.nf +.ft CW +.. +.de EE +.in -5 +.ft R +.sp +.fi +.. +.TH "DVIPDFMX" "1" "9 Apr 2014" +.SH NAME +dvipdfmx, xdvipdfmx, dvipdfm \- produce PDF files directly from DVI files +.SH SYNOPSIS +.B dvipdfmx +or +.B dvipdfm +.RI [ options ] +.I file\c +.RB [ .dvi ] +.SH DESCRIPTION +The program +.B dvipdfmx +generates a PDF file from a DVI file. DVI files are the output produced +by TeX. +.B groff +can also generate DVI files using +.BR grodvi (-Tdvi). + +In TeX Live, +.B dvipdfm +is another incarnation of +.B dvipdfmx +rather than a separate program. Compatibility is attempted as best as +possible. Please report problems to the +.B dvipdfmx +maintainers at tex-live (at) tug.org. + +In addition, +.B xdvipdfmx +is yet another incarnation. It is used as the back end for +.BR xetex (1) +and is not intended to be invoked directly. + +.B dvipdfmx +recognizes several commonly used +.BR \especial +commands, which are extensions to the DVI format. Specifically, it +understands color specials, papersize specials, tpic specials (which +allow it to be used with +.BR pic ), +hypertex specials, and some PostScript specials. These extensions allow +documents to contain color, figures, and hyperlinks. The program tries +to mimic the behavior of +.B dvips +where possible, so that many macro packages produced for use with +.B dvips +will also work with +.B dvipdfmx. +In addition, +.b Dvipdfmx +understands its own specific +.B \especial +commands to allow access to PDF features such as annotations and +bookmarks. + +Unrecognized specials will generate warning messages. Packages that may need a +.B dvipdfm +or +.B dvipdfmx +driver option include +.I geometry, +.I hyperref, +.I bookmark, +.I graphicx, +and +.I xcolor. + +For issues related to bounding boxes (and hence image sizes), see +.BR extractbb (1). +.SH OPTIONS +.TP 5 +.B \-\^c +Ignore (or accept) color +.BR \especials . +By default, color +.BR \especial "s" +are interpreted normally (changeable in the configuration file). The +.B \-\^c +option may be used to produce a black and white document +from a document containing color TeX +.B \especial +commands. +.TP 5 +.B \-\-\^dvipdfm +Enable +.B dvipdfm +emulation mode. This is the default if the executable name is `dvipdfm'. +.TP 5 +.B \-\^d number +Specify the number of decimal digits in the PDF output; must be between +0 and 5, default is 2. +.TP 5 +.B \-\^e +Ignored, for (semi-)compatibility with +.BR dvipdfm . +.TP 5 +.B \-\^f map_file +Read the font map file given by +.IR map_file . +The default map file in TeX Live is +.IR pdftex.map , +as defined in the configuration file. +.B \-\-\^help +Show a help message and exit successfully. +.TP 5 +.B \-\^l +Select landscape mode. In other words, exchange the +.I x +and +.I y +dimensions of the paper. +.TP 5 +.B \-\^m " mag" +Magnify the input document by +.IR mag . +.TP 5 +.B \-\^o " filename" +Set the PDF output file name; use `-' for stdout. +By default, the name of the output +file is derived from the input, that is, +.IR file .pdf. +.TP 5 +.B \-\^p " paper" +Select the papersize by name (e.g., +.BR letter ", " legal ", " ledger ", " tabloid ", " a3 ", " a4 ", or " a5 +) +.TP 5 +.B \-\^q +Quiet mode. +.TP 5 +.B \-\^r " size" +Set resolution of bitmapped fonts to +.B size +dots per inch. Bitmapped fonts are generated +by the Kpathsea library, which uses Metafont. Bitmapped +fonts are included as Type 3 fonts in the PDF output file. Default is 600. +.TP 5 +.B \-\^s " page_specifications" +Select the pages of the DVI file to be processed; default is `-', +meaning all pages. The +.I page_specifications +consists of a comma separated list of +.IR page_ranges : +.EX +.IR "page_specifications := page_specification" "[," page_specifications "]" +.EE +where +.EX +.IR "page_specification := single_page" | page_range +.IR "page_range := " [ first_page ]\^\-\^[ last_page ] +.EE +An empty +.I first_page +is treated as the first page of the DVI file, and +an empty +.I last_page +is treated as the last page of the DVI file. + +Examples: +.RS +.TP 5 +.B "\-\^s 1,3,5" +includes pages 1, 3, and 5; +.TP 5 +.B "\-\^s \-" +includes all pages; +.TP 5 +.B "\-\^s \-,\-" +includes two copies of all pages in the DVI file; +and +.TP 5 +.B "\-\^s 1\-10" +includes the first ten pages of the DVI +file. +.RE +.TP 5 +.B \-\^t +Search for thumbnail images of each page +in the directory named by the +.B TMPDIR +environment variable. The thumbnail images must be named in a specific +format: the same base name as the DVI file and the page number as the +extension to the file name. +.B dvipdfmx +does not generate such thumbnails itself, but it is distributed with a +wrapper program named +.B dvipdft +that does so. +.TP 5 +.B \-\-\^version +Show a help message and exit successfully. +.TP 5 +.B \-\^v +Increase verbosity. +Results of the +.B \-\^v +option are cumulative (e.g., +.B \-\^vv +increases the verbosity by two increments). Maximum verbosity is four. +.TP 5 +.B \-\-\^kpathsea-debug number +Have Kpathsea output debugging information; `-1' for everything (voluminous). +.TP 5 +.B \-\^x x_offset +Set the left margin to +.IR x_offset . +The default left margin is +.BR 1.0in . +The dimension may be specified in any units understood by TeX (e.g., +.BR bp ", " pt ", " in ", " cm ). +.TP 5 +.B \-\^y y_offset +Set the top margin to +.IR y_offset . +The default top margin is +.BR 1.0in . +The dimension may be specified in any units understood by TeX (e.g., +.BR bpt ", " pt ", " in ", " cm ). +.TP 5 +.B \-\^z number +Set the compression level to +.IR compression_level . +Compressions levels range from 0 (no compression) to +9 (maximum compression) and correspond to the values understood by zlib; +default is 9. +.TP 5 +.B \-\^C number +Miscellaneous option flags; see the --help output for details. +.TP 5 +.B \-\^D template +PostScript to PDF conversion command line template; the default is taken +from the configuration file, which also gives all the details and +mentions several possibilities. +.TP 5 +.B \-\^E +Always try to embed fonts, ignoring licensing flags, etc. +.TP 5 +.B \-\^I number +Image cache life in hours; default is -2, meaning to not cache images at +all. A value of -1 means to erase all old images and also new images; 0 +means to erase all old images but leave new images. +.TP 5 +.B \-\^K number +Encryption key length; default 40. +.TP 5 +.B \-\^M +Process MetaPost PostScript output. +.TP 5 +.B \-\^O number +Set maximum depth of open bookmark items; default 0. +.TP 5 +.B \-\^P number +Set permission flags for PDF encryption; default 0x003C. +.TP 5 +.B \-\^S +Enable PDF encryption. +.TP 5 +.B \-\^V number +Set PDF minor version; default 5 (from the configuration file). +.SH "IMAGE BOUNDING BOXES" +When including images with +.BR dvipdfmx , +their bounding boxes should be generated by running +.BR extractbb . +The result will be in an +.B .xbb +file; the xbb information is the same as for the PDF format. +.SH ENVIRONMENT +.B dvipdfmx +uses the +.B kpathsea +library for locating the files that it opens. Hence, the environment +variables documented in the +.I Kpathsea library +documentation influence +.BR dvipdfmx . +It also uses the value of the environment variable TMPDIR as the +directory to search for thumbnail images of each page. +.SH FILES +The precise location of the following files is determined by the +.I Kpathsea library +configuration. The location may be determined by using kpsewhich, e.g., +.nf +.B kpsewhich \-progname=dvipdfmx \-format='other text files' dvipdfmx.cfg +.fi +.TP 5 +.I dvipdfmx.cfg +Default configuration file +.TP 5 +.I pdftex.map +The default font map file (this may be changed in the config file). +.TP 5 +.I *.tfm +TeX font metrics +.TP 5 +.I *.vf +TeX virtual font files +.TP 5 +.I *.pfb +PostScript Type 1 font files +.TP 5 +.I +texmf.cnf +The Kpathsea library configuration file. +The location of this file may be found by typing +.nf +.B kpsewhich texmf.cnf +.fi +.SH "SEE ALSO" +.BR dvipdft "(1), " +.BR extractbb "(1), " +.BR tex "(1), " dvips "(1), " groff "(1), " grodvi "(1), " pic "(1), " +and the +.I "Kpathsea library" +Info documentation (http://tug.org/kpathsea). +.SH AUTHOR +Primarily Mark A. Wicks; dvipdfmx extensions primarily by Jin-Hwan Cho, +Shunsaku Hirata, and Matthias Franz. For the version in TeX Live, all +bugs and other reports should go to the +.B dvipdfmx +maintainers at tex-live (at) tug.org. This man page edited for TeX Live +by Bob Tennent and others. Files old/texmf-dist/doc/man/man1/dvipdfmx.man1.pdf and new/texmf-dist/doc/man/man1/dvipdfmx.man1.pdf differ Files old/texmf-dist/doc/man/man1/dvipdft.man1.pdf and new/texmf-dist/doc/man/man1/dvipdft.man1.pdf differ Files old/texmf-dist/doc/man/man1/ebb.man1.pdf and new/texmf-dist/doc/man/man1/ebb.man1.pdf differ Files old/texmf-dist/doc/man/man1/extractbb.man1.pdf and new/texmf-dist/doc/man/man1/extractbb.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/xdvipdfmx.1 new/texmf-dist/doc/man/man1/xdvipdfmx.1 --- old/texmf-dist/doc/man/man1/xdvipdfmx.1 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/man/man1/xdvipdfmx.1 2014-04-29 00:59:31.000000000 +0200 @@ -0,0 +1 @@ +.so man1/dvipdfmx.1 Files old/texmf-dist/doc/man/man1/xdvipdfmx.man1.pdf and new/texmf-dist/doc/man/man1/xdvipdfmx.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dvipdfmx.doc.tlpobj new/tlpkg/tlpobj/dvipdfmx.doc.tlpobj --- old/tlpkg/tlpobj/dvipdfmx.doc.tlpobj 2013-05-11 01:30:25.000000000 +0200 +++ new/tlpkg/tlpobj/dvipdfmx.doc.tlpobj 2014-05-01 04:54:52.000000000 +0200 @@ -1,8 +1,8 @@ name dvipdfmx.doc category TLCore -revision 30386 +revision 33771 shortdesc doc files of dvipdfmx -docfiles size=135 +docfiles size=145 texmf-dist/doc/dvipdfm/Makefile texmf-dist/doc/dvipdfm/dvipdfm.pdf texmf-dist/doc/dvipdfm/dvipdfm.tex @@ -21,9 +21,13 @@ texmf-dist/doc/dvipdfmx/dvipdfmx-special.tex texmf-dist/doc/man/man1/dvipdfm.1 texmf-dist/doc/man/man1/dvipdfm.man1.pdf + texmf-dist/doc/man/man1/dvipdfmx.1 + texmf-dist/doc/man/man1/dvipdfmx.man1.pdf texmf-dist/doc/man/man1/dvipdft.1 texmf-dist/doc/man/man1/dvipdft.man1.pdf texmf-dist/doc/man/man1/ebb.1 texmf-dist/doc/man/man1/ebb.man1.pdf texmf-dist/doc/man/man1/extractbb.1 texmf-dist/doc/man/man1/extractbb.man1.pdf + texmf-dist/doc/man/man1/xdvipdfmx.1 + texmf-dist/doc/man/man1/xdvipdfmx.man1.pdf ++++++ dvipdfmx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/fonts/map/dvipdfmx/updmap/kanjix.map new/texmf-dist/fonts/map/dvipdfmx/updmap/kanjix.map --- old/texmf-dist/fonts/map/dvipdfmx/updmap/kanjix.map 2013-04-19 03:42:10.000000000 +0200 +++ new/texmf-dist/fonts/map/dvipdfmx/updmap/kanjix.map 2013-12-11 03:20:52.000000000 +0100 @@ -3,7 +3,7 @@ % Don't change this file directly. Use updmap[-sys] instead. % See the updmap documentation. % A log of the run that created this file is available here: -% /tmp/web2c/updmap.log +% /tmp/umap/web2c/updmap.log % morisawa.map futogo-b H FutoGoB101-Bold futogo-b-v V FutoGoB101-Bold @@ -114,18 +114,32 @@ % otf-up-noEmbed.map uphgothb-h UniJIS-UTF16-H !GothicBBB-Medium,Bold uphgothb-v UniJIS-UTF16-V !GothicBBB-Medium,Bold +uphgothbn-h UniJIS2004-UTF16-H !GothicBBB-Medium,Bold +uphgothbn-v UniJIS2004-UTF16-V !GothicBBB-Medium,Bold uphgotheb-h UniJIS-UTF16-H !GothicBBB-Medium,Bold uphgotheb-v UniJIS-UTF16-V !GothicBBB-Medium,Bold +uphgothebn-h UniJIS2004-UTF16-H !GothicBBB-Medium,Bold +uphgothebn-v UniJIS2004-UTF16-V !GothicBBB-Medium,Bold uphgothr-h UniJIS-UTF16-H !GothicBBB-Medium uphgothr-v UniJIS-UTF16-V !GothicBBB-Medium +uphgothrn-h UniJIS2004-UTF16-H !GothicBBB-Medium +uphgothrn-v UniJIS2004-UTF16-V !GothicBBB-Medium uphmgothr-h UniJIS-UTF16-H !GothicBBB-Medium uphmgothr-v UniJIS-UTF16-V !GothicBBB-Medium +uphmgothrn-h UniJIS2004-UTF16-H !GothicBBB-Medium +uphmgothrn-v UniJIS2004-UTF16-V !GothicBBB-Medium uphminb-h UniJIS-UTF16-H !Ryumin-Light,Bold uphminb-v UniJIS-UTF16-V !Ryumin-Light,Bold +uphminbn-h UniJIS2004-UTF16-H !Ryumin-Light,Bold +uphminbn-v UniJIS2004-UTF16-V !Ryumin-Light,Bold uphminl-h UniJIS-UTF16-H !Ryumin-Light uphminl-v UniJIS-UTF16-V !Ryumin-Light +uphminln-h UniJIS2004-UTF16-H !Ryumin-Light +uphminln-v UniJIS2004-UTF16-V !Ryumin-Light uphminr-h UniJIS-UTF16-H !Ryumin-Light uphminr-v UniJIS-UTF16-V !Ryumin-Light +uphminrn-h UniJIS2004-UTF16-H !Ryumin-Light +uphminrn-v UniJIS2004-UTF16-V !Ryumin-Light % ptex-noEmbed.map gbm H !GothicBBB-Medium gbmv V !GothicBBB-Medium diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dvipdfmx.tlpobj new/tlpkg/tlpobj/dvipdfmx.tlpobj --- old/tlpkg/tlpobj/dvipdfmx.tlpobj 2013-05-11 01:30:25.000000000 +0200 +++ new/tlpkg/tlpobj/dvipdfmx.tlpobj 2014-05-01 04:54:53.000000000 +0200 @@ -1,6 +1,6 @@ name dvipdfmx category TLCore -revision 30386 +revision 33771 shortdesc An extended version of dvipdfm. longdesc Dvipdfmx (formerly dvipdfm-cjk) is a development of dvipdfm longdesc created to support multi-byte character encodings and large @@ -25,5 +25,5 @@ texmf-dist/fonts/map/dvipdfmx/updmap/kanjix.map tlpkg/tlpostcode/dvipdfmx.pl catalogue-ctan /dviware/dvipdfmx/dvipdfmx.tar.gz -catalogue-date 2012-04-21 10:57:19 +0200 +catalogue-date 2013-09-22 09:06:20 +0200 catalogue-license gpl ++++++ dvipng.doc.tar.xz ++++++ ++++ 4102 lines of diff (skipped) ++++++ dvipos.doc.tar.xz ++++++ Files old/texmf-dist/doc/man/man1/dvipos.man1.pdf and new/texmf-dist/doc/man/man1/dvipos.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dvipos.doc.tlpobj new/tlpkg/tlpobj/dvipos.doc.tlpobj --- old/tlpkg/tlpobj/dvipos.doc.tlpobj 2013-04-09 03:40:08.000000000 +0200 +++ new/tlpkg/tlpobj/dvipos.doc.tlpobj 2014-04-29 03:29:20.000000000 +0200 @@ -1,6 +1,6 @@ name dvipos.doc category TLCore -revision 29764 +revision 33736 shortdesc doc files of dvipos docfiles size=3 texmf-dist/doc/man/man1/dvipos.1 ++++++ dvips.doc.tar.xz ++++++ ++++ 9829 lines of diff (skipped) ++++++ dvips.tar.xz ++++++ ++++ 16653 lines of diff (skipped) ++++++ dvips_config.dif ++++++ --- texmf-dist/dvips/config/config.ps +++ texmf-dist/dvips/config/config.ps 2015-03-30 07:16:30.017519469 +0000 @@ -46,7 +46,9 @@ Z0 % Partially download Type 1 fonts by default. Only reason not to do % this is if you encounter bugs. (Please report them to % @email{tex-k@tug.org} if you do.) -j +% Change for SUSE: The option j *does* trouble if a embedded eps file +% uses the same font but includes other characters as well (boo#897284). +j0 % This shows how to add your own map file. % Remove the comment and adjust the name: ++++++ dvisvgm.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/dvisvgm.1 new/texmf-dist/doc/man/man1/dvisvgm.1 --- old/texmf-dist/doc/man/man1/dvisvgm.1 2013-04-08 23:16:34.000000000 +0200 +++ new/texmf-dist/doc/man/man1/dvisvgm.1 2014-04-29 09:26:58.000000000 +0200 @@ -1,13 +1,13 @@ '\" t .\" Title: dvisvgm -.\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 03/01/2013 +.\" Author: Martin Gieseking <martin.gieseking@uos.de> +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 04/23/2014 .\" Manual: dvisvgm Manual -.\" Source: dvisvgm 1.2 +.\" Source: dvisvgm 1.6 .\" Language: English .\" -.TH "DVISVGM" "1" "03/01/2013" "dvisvgm 1\&.2" "dvisvgm Manual" +.TH "DVISVGM" "1" "04/23/2014" "dvisvgm 1\&.6" "dvisvgm Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -32,15 +32,19 @@ .SH "SYNOPSIS" .sp \fBdvisvgm\fR [ \fIoptions\fR ] \fIfile\fR [\&.dvi] +.sp +\fBdvisvgm\fR \-E [ \fIoptions\fR ] \fIfile\fR [\&.eps] .SH "DESCRIPTION" .sp -The command\-line utility \fBdvisvgm\fR converts DVI files, as generated by TeX/LaTeX, to the XML\-based scalable vector graphics format SVG\&. Since the current SVG standard 1\&.1 doesn\(cqt specify multi\-page graphics, dvisvgm creates separate SVG files for each DVI page\&. Because of compatibility reasons, only the first page is converted by default\&. In order to select a different page or arbitrary page sequences, use option \fB\-p\fR which is described below\&. +The command\-line utility \fBdvisvgm\fR converts DVI files, as generated by TeX/LaTeX, to the XML\-based scalable vector graphics format SVG\&. It supports the classic DVI format 2 as well as format 3 (created by pTeX in vertical mode), and format 5 which is also known as XDV (created by XeTeX)\&. Besides the basic DVI commands, dvisvgm also evaluates many so\-called \fIspecials\fR which heavily extend the capabilities of the DVI format\&. For a more detailed overview, see section \fBsupport of specials\fR below\&. +.sp +Since the current SVG standard 1\&.1 doesn\(cqt specify multi\-page graphics, dvisvgm creates separate SVG files for each DVI page\&. Because of compatibility reasons, only the first page is converted by default\&. In order to select a different page or arbitrary page sequences, use option \fB\-p\fR which is described below\&. .sp -dvisvgm should properly convert all pages that are made up of fonts and rules only\&. However, the utility also supports a couple of DVI extensions defined in terms of \fIDVI specials\fR\&. For a more detailed overview, see section \fBsupport of specials\fR below\&. +SVG is a vector\-based graphics format and therefore dvisvgm tries to convert the glyph outlines of all used fonts to scalable path descriptions\&. The fastest way to do that is to extract the path information from font files in PFB, TTF, or OTF format\&. If dvisvgm is able to find such a file, it extracts all necessary outline information about the glyphs from it\&. .sp -As SVG is a vector based graphics format, dvisvgm tries to convert the glyph outlines of all used fonts into scalable path descriptions\&. The fastest way to do that is to extract the path information from PFB (PostScript Type 1) files\&. So, if dvisvgm is able to find a PFB file for a required font, it will read the necessary information from this file\&. +However, TeX\(cqs main source for font descriptions is Metafont, which produces bitmap output (GF files)\&. That\(cqs why not all obtainable TeX fonts are available in a scalable format\&. In these cases, dvisvgm tries to vectorize Metafont\(cqs output by tracing the glyph bitmaps\&. The results are not as perfect as most (manually optimized) PFB or OTF counterparts, but are nonetheless really nice in most cases\&. .sp -TeX\(cqs main source for font descriptions is Metafont though, which produces bitmap output\&. That\(cqs why not all obtainable TeX fonts are available in PFB format\&. In these cases, dvisvgm tries to vectorize Metafont\(cqs output (GF fonts) by tracing the glyph bitmaps\&. The results are not as perfect as most (manually optimized) PFB outlines but are nonetheless really nice in most cases\&. +When running dvisvgm without option \fB\-\-no\-fonts\fR, \fIfont\fR elements (<font>\&...</font>) are used to embed the font data into the SVG files\&. Unfortunately, only few SVG renderes support these elements yet\&. Most web browsers and vector graphics applications don\(cqt evaluate them properly so that the text components of the resulting graphics might look strange\&. In order to create more compatible SVG files, command\-line option \fB\-\-no\-fonts\fR can be given to replace the font elements by plain graphics paths\&. .SH "OPTIONS" .PP \fB\-a, \-\-trace\-all\fR=[\fIretrace\fR] @@ -128,7 +132,6 @@ .TE .sp 1 .RE -.RE .PP \fBPage orientation\fR .RS 4 @@ -170,6 +173,7 @@ .sp .5v .RE .RE +.RE .PP \fB\-C, \-\-cache\fR[=\fIdir\fR] .RS 4 @@ -178,7 +182,7 @@ to overwrite the default\&. Furthermore, it is also possible to disable the font caching mechanism completely with option \fB\-\-cache=none\fR\&. If argument \fIdir\fR -is omitted, dvisvgm prints the path of the default cache directory and some information about the stored fonts\&. Additionally, outdated and corrupted cache files are removed\&. +is omitted, dvisvgm prints the path of the default cache directory together with further information about the stored fonts\&. Additionally, outdated and corrupted cache files are removed\&. .RE .PP \fB\-\-color\fR @@ -198,15 +202,16 @@ .PP \fB\-e, \-\-exact\fR .RS 4 -If this option is given, dvisvgm computes the precise bounding box of each character\&. By default, the values stored in a font\(cqs TFM file are used to determine a glyph\(cqs extent\&. As these values are intended to realize optimal character placements and are not designed to represent the exact dimensions, they don\(cqt necessarily correspond with the bounds of the visual glyphs\&. Thus, width and/or height of some glyphs may be larger than the respective TFM values\&. As a result, this can lead to clipped characters at the bounds of the SVG graphic\&. With option -\fB\-\-exact\fR, dvisvgm analyzes the actual shape of each character and derives a usually tight bounding box\&. +If this option is given, dvisvgm computes the precise bounding box of each character\&. By default, the values stored in a font\(cqs TFM file are used to determine a glyph\(cqs extent\&. As these values are intended to implement optimal character placements and are not designed to represent the exact dimensions, they don\(cqt necessarily correspond with the bounds of the visual glyphs\&. Thus, width and/or height of some glyphs may be larger (or smaller) than the respective TFM values\&. As a result, this can lead to clipped characters at the bounds of the SVG graphics\&. With option +\fB\-\-exact\fR +given, dvisvgm analyzes the actual shape of each character and derives a usually tight bounding box\&. .RE .PP \fB\-m, \-\-fontmap\fR=\fIfilenames\fR .RS 4 -Loads and evaluates a single or multiple font map files\&. These files are required to resolve font file names and encodings\&. dvisvgm does not provide its own map file but tries to read available ones coming with dvips or dvipdfm\&. If option -\fB\-\-fonrmapm\fR -is not given, dvisvgm looks for the default map files +Loads and evaluates a single or multiple font map files\&. These files are required to resolve font file names and encodings\&. dvisvgm does not provide its own map files but tries to read available ones coming with dvips or dvipdfm\&. If option +\fB\-\-fontmap\fR +is omitted, dvisvgm looks for the default map files ps2pk\&.map, dvipdfm\&.map, and psfonts\&.map @@ -248,9 +253,9 @@ myfile1\&.map replace previous entries\&. Afterwards, all definitions for the fonts given in myfile2\&.map -are removed again\&. +are removed from the font map tree\&. .sp -For further information about the map file formats, see the manuals of dvips and dvipdfm\&. +For further information about the map file formats and the mode specifiers, see the manuals of dvips and dvipdfm\&. .RE .RE .PP @@ -258,7 +263,7 @@ .RS 4 Prints a short summary of all available command\-line options\&. The optional \fImode\fR -parameter is an integer value between 0 and 2\&. It selects the display variant of the help text\&. Mode 0 lists all options divided into categories with section headers\&. This is also the default if dvisvgm is called without parameters\&. Mode 1 lists all options ordered by the short option name, while mode 2 sorts the lines by the long option name\&. +parameter is an integer value between 0 and 2\&. It selects the display variant of the help text\&. Mode 0 lists all options divided into categories with section headers\&. This is also the default if dvisvgm is called without parameters\&. Mode 1 lists all options ordered by the short option names, while mode 2 sorts the lines by the long option names\&. .RE .PP \fB\-\-keep\fR @@ -268,12 +273,46 @@ .PP \fB\-\-libgs\fR=\fIfilename\fR .RS 4 -This option is only available if the Ghostscript library is not directly linked to dvisvgm and if PostScript support was not completely disabled during compilation\&. In this case, dvisvgm tries to load the shared GS library dynamically during runtime\&. By default, it expects the library\(cqs name to be libgs\&.so (on Unix\-like systems) or gsdll32\&.dll/gsdll64\&.dll (Windows)\&. Option +This option is only available if the Ghostscript library is not directly linked to dvisvgm and if PostScript support was not completely disabled during compilation\&. In this case, dvisvgm tries to load the shared GS library dynamically during runtime\&. By default, it expects the library\(cqs name to be libgs\&.so\&.X (on Unix\-like systems, where X is the ABI version of the library) or gsdll32\&.dll/gsdll64\&.dll (Windows)\&. Option \fB\-\-libgs\fR can be used to give a different name\&. Alternatively, it\(cqs also possible to set the GS library name by the environment variable LIBGS\&. The latter has less precedence than the command\-line option\&. .RE .PP +\fB\-L, \-\-linkmark\fR=\fItype\fR +.RS 4 +Selects the method how to mark hyperlinked areas\&. The +\fItype\fR +argument can take one of the values +\fInone\fR, +\fIbox\fR, and +\fIline\fR, where +\fIbox\fR +is the default, i\&.e\&. a rectangle is drawn around the linked region if option +\fB\-\-linkmark\fR +is omitted\&. Type +\fIline\fR +just draws the lower edge of the bounding rectangle, and +\fInone\fR +tells dvisvgm not to add any visible objects to hyperlinks\&. The lines and boxes get the current text color selected\&. In order to apply a different, constant color, a colon followed by a color specifier can be appended to the type string\&. A +\fIcolor specifier\fR +is either a hexadecimal RGB value of the form +\fI#RRGGBB\fR, or a dvips color name as listed here: +http://en\&.wikibooks\&.org/wiki/LaTeX/Colors#The_68_standard_colors_known_to_dvips +.sp +Moreover, argument +\fItype\fR +can take a single color specifier to highlight the linked region by a frameless box filled with that color\&. An optional second color specifier separated by colon selects the frame color\&. +.sp +Examples: +\fBbox:red\fR +or +\fBbox:#ff0000\fR +draws red boxes around the linked areas\&. +\fByellow:blue\fR +creates yellow filled rectangles with blue frames\&. +.RE +.PP \fB\-l, \-\-list\-specials\fR .RS 4 Prints a list of registered special handlers and exits\&. Each handler processes a set of special statements belonging to the same category\&. In most cases, the categories are identified by the prefix of the special statements\&. It\(cqs usually a leading word separated from the rest of the statement by a colon or a blank, e\&.g\&. @@ -298,7 +337,7 @@ \fIfont\fR elements but uses \fIpaths\fR -instead\&. The resulting SVG files tends to be larger but concurrently more compatible with most applications that don\(cqt support SVG fonts yet\&. The optional argument +instead\&. The resulting SVG files tend to be larger but they are concurrently more compatible with most applications that don\(cqt support SVG fonts yet\&. The optional argument \fIvariant\fR selects the method how to substitute fonts by paths\&. Variant 0 creates \fIpath\fR @@ -652,13 +691,28 @@ .sp .5v .RE .RE +.PP +\fB\-Z, \-\-zoom\fR[=\fIfactor\fR] +.RS 4 +Multiplies the +\fIwidth\fR +and +\fIheight\fR +attributes of the SVG root element by argument +\fIfactor\fR +while the coordinate system of the graphic is retained\&. As a result, most SVG viewers zoom the graphics accordingly\&. If a negative zoom factor is given, the +\fIwidth\fR +and +\fIheight\fR +attributes are omitted\&. +.RE .SH "SUPPORT OF SPECIALS" .sp -dvisvgm supports several sets of \fIspecial commands\fR that can be used to enrich DVI files with additional features, like color, graphics or hyperlinks\&. The evaluation of special commands is delegated to various handlers\&. Each handler is responsible for all special statements of the same command set, i\&.e\&. commands beginning with the same prefix\&. To get a list of actually provided special handlers, use option \fB\-\-list\-specials\fR (see above)\&. +dvisvgm supports several sets of \fIspecial commands\fR that can be used to enrich DVI files with additional features, like color, graphics, and hyperlinks\&. The evaluation of special commands is delegated to various handlers\&. Each handler is responsible for all special statements of the same command set, i\&.e\&. commands beginning with the same prefix\&. To get a list of actually provided special handlers, use option \fB\-\-list\-specials\fR (see above)\&. This section gives an overview of the special commands currently supported\&. .PP \fBbgcolor\fR .RS 4 -Special statement for changing the background/page color\&. Since SVG 1\&.1 doesn\(cqt support background colors, dvisvgm inserts a rectangle of the chosen color\&. In the current version, this rectangle always gets the size of the minimal bounding box\&. This command is part of the color special set but is handled separately in order to let the user turn it off\&. For an overview of the command syntax, see the documentation of dvips, for instance\&. +Special statement for changing the background/page color\&. Since SVG 1\&.1 doesn\(cqt support background colors, dvisvgm inserts a rectangle of the chosen color into the generated SVG document\&. This rectangle always gets the same size as the selected or computed bounding box\&. This background color command is part of the color special set but is handled separately in order to let the user turn it off\&. For an overview of the command syntax, see the documentation of dvips, for instance\&. .RE .PP \fBcolor\fR @@ -763,6 +817,14 @@ These specials were introduced with the emTeX distribution by Eberhard Mattes\&. They provide line drawing statements, instructions for embedding MSP, PCX, and BMP image files, as well as two PCL commands\&. dvisvgm supports only the line drawing statements and ignores all other em specials silently\&. A description of the command syntax can be found in the DVI driver documentation coming with emTeX (see CTAN)\&. .RE .PP +\fBhtml\fR +.RS 4 +The hyperref specials allow the definition of hyperlinks inside DVI files in various flavors\&. dvisvgm supports the plain HyperTeX special constructs as created with hyperref package option +\fIhypertex\fR\&. Internal links, i\&.e\&. references to other parts of the same document, are only converted if the link and the corresponding link target are located on the same page\&. Links between different pages are not supported yet\&. By default, all linked areas of the document are marked by a rectangle\&. Option +\fB\-\-linkmark\fR +allows to change this behavior\&. See above for further details\&. Information on syntax and semantics of the HyperTeX specials can be found in the hyperref manual\&. +.RE +.PP \fBpdf\fR .RS 4 pdfTeX and dvipdfmx introduced several special commands related to the generation of PDF files\&. Currently, only two of them, @@ -776,20 +838,25 @@ .RS 4 The famous DVI driver dvips introduced its own set of specials in order to embed PostScript code into DVI files, which greatly improves the capabilities of DVI documents\&. One aim of dvisvgm is to completely evaluate all PostScript snippets and to convert a large amount of it to SVG\&. However, in contrast to dvips, dvisvgm uses floating point arithmetics to compute the precise position of each graphic element, i\&.e\&. it doesn\(cqt round the coordinates\&. Therefore, the relative locations of the graphic elements may slightly differ from those computed by dvips\&. .sp -Since PostScript is a rather complex language, dvisvgm does not try to implement its own PostScript interpreter but relies on Ghostscript instead\&. If the Ghostscript library was not linked while building dvisvgm, it is looked up and loaded dynamically during runtime\&. In this case, dvisvgm looks for -\fIlibgs\&.so\fR -on Unix\-like systems, and for +Since PostScript is a rather complex language, dvisvgm does not try to implement its own PostScript interpreter but relies on Ghostscript instead\&. If the Ghostscript library was not linked to the dvisvgm binary, it is looked up and loaded dynamically during runtime\&. In this case, dvisvgm looks for +\fIlibgs\&.so\&.X\fR +on Unix\-like systems (supported ABI versions: 7,8,9), and for \fIgsdll32\&.dll\fR or \fIgsdll64\&.dll\fR -on Windows\&. You can override these default file names with environment variable +on Windows\&. You can override the default file names with environment variable LIBGS or the command\-line option -\fB\-\-libgs\fR\&. The library must be installed and reachable through the ld search path (*nix) or the PATH environment variable (Windows)\&. If it cannot be found, the processing of PostScript specials is disabled\&. Use option +\fB\-\-libgs\fR\&. The library must be reachable through the ld search path (*nix) or the PATH environment variable (Windows)\&. Alternatively, the absolute file path can be specified\&. If the library cannot be found, dvisvgm disables the processing of PostScript specials\&. Use option \fB\-\-list\-specials\fR -to check whether PS support is available, i\&.e\&. the entry +to check whether PS support is available, i\&.e\&. entry \fIps\fR is present\&. +.sp +The PostScript handler also recognizes and evaluates bounding box data generated by the +\fIpreview\fR +package with option +\fItightpage\fR\&. If the data is present in a DVI file, dvisvgm adapts the bounding box of the generated SVG file accordingly, and prints a message showing the width, height, and depth of the box in TeX point units\&. Especially, the depth value can be used to vertically align the SVG graphics with the baseline of surrounding text in HTML or XSL\-FO documents, for example\&. .RE .PP \fBtpic\fR @@ -853,7 +920,7 @@ .sp The pre\-compiled Windows versions of dvisvgm require a working installation of MiKTeX 2\&.9 or above\&. dvisvgm does not work together with the portable edition of MiKTeX because it relies on MiKTeX\(cqs COM interface only accessible in a local installation\&. To enable the evaluation of PostScript specials, the original Ghostscript DLL \fIgsdll32\&.dll\fR must be present and reachable through the search path\&. 64\-bit Windows builds require the 64\-bit Ghostscript DLL \fIgsdll64\&.dll\fR\&. Both DLLs come with the corresponding Ghostscript installers available from www\&.ghostscript\&.com\&. .sp -The environment variable DVISVGM_COLORS specifies the colors used to highlight various parts of dvisvgm\(cqs message output\&. It is only evaluated if option \fB\-\-color\fR is given\&. The value of DVISVGM_COLORS is a list of colon\-separated entries of the form \fIgg\fR=\fIBF\fR, where \fIgg\fR denotes one of the color group indicators listed below, and \fIBF\fR are two hexadecimal digits specifying the background (first digit) and foreground/text color (second digit)\&. The color color values are defined as follows: 0=black, 1=red, 2=green, 3=yellow, 4=blue, 5=magenta, 6=cyan, 7=gray, 8=bright red, 9=bright green, A=bright yellow, B=bright blue, C=bright magenta, D=bright cyan, E=bright gray, F=white\&. Depending on the terminal, the colors may differ\&. Rather than changing both the text and background color, it\(cqs also possible to change only one of them: An asterisk (*) in place of a hexadecimal digit indicates the default text or background color of the terminal\&. +The environment variable DVISVGM_COLORS specifies the colors used to highlight various parts of dvisvgm\(cqs message output\&. It is only evaluated if option \fB\-\-color\fR is given\&. The value of DVISVGM_COLORS is a list of colon\-separated entries of the form \fIgg\fR=\fIBF\fR, where \fIgg\fR denotes one of the color group indicators listed below, and \fIBF\fR are two hexadecimal digits specifying the background (first digit) and foreground/text color (second digit)\&. The color values are defined as follows: 0=black, 1=red, 2=green, 3=yellow, 4=blue, 5=magenta, 6=cyan, 7=gray, 8=bright red, 9=bright green, A=bright yellow, B=bright blue, C=bright magenta, D=bright cyan, E=bright gray, F=white\&. Depending on the terminal, the colors may differ\&. Rather than changing both the text and background color, it\(cqs also possible to change only one of them: An asterisk (*) in place of a hexadecimal digit indicates the default text or background color of the terminal\&. .sp All malformed entries in the list are silently ignored\&. .TS @@ -1012,13 +1079,11 @@ .PP Project home page .RS 4 - http://dvisvgm\&.sourceforge\&.net .RE .PP SourceForge project site .RS 4 - http://sourceforge\&.net/projects/dvisvgm .RE .SH "BUGS" @@ -1029,4 +1094,10 @@ Written by Martin Gieseking <martin\&.gieseking@uos\&.de> .SH "COPYING" .sp -Copyright \(co 2005\-2013 Martin Gieseking\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 3 or, (at your option) any later version\&. +Copyright \(co 2005\-2014 Martin Gieseking\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 3 or, (at your option) any later version\&. +.SH "AUTHOR" +.PP +\fBMartin Gieseking\fR <\&martin\&.gieseking@uos\&.de\&> +.RS 4 +Author. +.RE Files old/texmf-dist/doc/man/man1/dvisvgm.man1.pdf and new/texmf-dist/doc/man/man1/dvisvgm.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dvisvgm.doc.tlpobj new/tlpkg/tlpobj/dvisvgm.doc.tlpobj --- old/tlpkg/tlpobj/dvisvgm.doc.tlpobj 2013-04-09 03:40:11.000000000 +0200 +++ new/tlpkg/tlpobj/dvisvgm.doc.tlpobj 2014-05-05 00:20:46.000000000 +0200 @@ -1,7 +1,7 @@ name dvisvgm.doc category TLCore -revision 29764 +revision 33825 shortdesc doc files of dvisvgm -docfiles size=18 +docfiles size=21 texmf-dist/doc/man/man1/dvisvgm.1 texmf-dist/doc/man/man1/dvisvgm.man1.pdf ++++++ easy-todo.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/easy-todo/README new/doc/latex/easy-todo/README --- old/doc/latex/easy-todo/README 2011-01-24 01:30:19.000000000 +0100 +++ new/doc/latex/easy-todo/README 2014-01-15 01:30:42.000000000 +0100 @@ -1,208 +1,3 @@ - README - The \texttt{easy-todo} package allows to add TODO notes all along the document and show the list of TODOs as an index with references. - -LICENCE - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +The easy-todo package allows you to create, track, show and hide notes in a document. Files old/doc/latex/easy-todo/easy-todo.pdf and new/doc/latex/easy-todo/easy-todo.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/easy-todo/easy-todo.tex new/doc/latex/easy-todo/easy-todo.tex --- old/doc/latex/easy-todo/easy-todo.tex 2011-01-14 01:19:45.000000000 +0100 +++ new/doc/latex/easy-todo/easy-todo.tex 2014-01-15 01:30:42.000000000 +0100 @@ -1,44 +1,57 @@ \documentclass[a4paper]{article} -\usepackage{listings} -\usepackage[enabled,section]{easy-todo} +\usepackage[obeyFinal]{easy-todo} \begin{document} \title{The \texttt{easy-todo} package} - \author{Juan Rada-Vilela} - \date{January, 2011} + \author{by Juan Rada-Vilela (\texttt{jcrada@fuzzylite.com})} + \date{January, 2014} \maketitle \begin{abstract} - The \texttt{easy-todo} package allows to add TODO notes all along the document and show the list of TODOs as an index with references. + The \texttt{easy-todo} package allows you to create, track, show and hide notes in a document. In addition, the package allows you to create a summary of notes with their respective points of reference. \end{abstract} \section{Options} - When including the package, the following options are available: + The following options are available: \begin{description} - \item [enabled] Shows the TODO notes as well as the index. - \item [disabled] Hides the TODO notes as well as the index. Useful for printing drafts without the TODO notes but keeping them in the document. - \item [final] Same as disabled. + \item [enable] Show the notes and the index. + \item [disable] Hide the notes and the index. + \item [obeyFinal] Hide the notes except when the documentclass is \textbf{final}. This option overrides the options \textbf{enable} and \textbf{disable}. \item [chapter] Prints the list of TODOs as a chapter. \item [section] Prints the list of TODOs as a section. \end{description} - For example: -\lstset{language=TeX} -\begin{lstlisting} -\usepackage[enabled,section]{easy-todo} -\end{lstlisting} \section{Commands} \begin{description} - \item [\textbackslash todo\{note\}] Adds in the same location a TODO note with text \texttt{note}. - \item [\textbackslash listoftodos] Creates the list of TODOs in the same location as used. + \item [\textbackslash todo\{note\}] Creates a note that shows the text ``\texttt{note}''. + \item [\textbackslash todoi\{note\}] Creates a note that only shows an automatically generated number. The text ``\texttt{note}'' appears in the index. + \item [\textbackslash todoii\{note\}\{information\}] Creates a note that shows the text ``\texttt{note}''. The text ``\texttt{information}'' appears at the index. + \item [\textbackslash listoftodos] Creates the list of notes. \end{description} - - \todo{This is a TODO note} - - \todo{I wish there was more to mention about this package, but it is so simple that it is straight-forward to understand the beginner's code} - - \listoftodos -\end{document} \ No newline at end of file + + \section{Example} + \texttt{\textbackslash usepackage[obeyFinal]\{easy-todo\}} + + This is a todo \todo{note} that appears in full everywhere. This is a todoi \todoi{note i} that appears as a number and the note at the index. This is a todoii \todoii{hint}{information} note that shows a hint in place and the information at the index. All these notes disappear when using \texttt{\textbackslash documentclass[final]...}, or when using instead \texttt{\textbackslash usepackage[disable]\{easy-todo\}}. + + \section{Changelog} + + \subsection{Version 3.0} + \begin{itemize} + \item Added option \textbf{obeyFinal} + \item Removed spaces caused by notes when hidden. + \item Option \textbf{section} is default. + \item Removed options \textbf{enabled}, \textbf{disabled} and \textbf{final}. + \end{itemize} + + \subsection{Version 2.0} + \begin{itemize} + \item Added options \textbf{enable} and \textbf{disable} + \item Added commands \textbf{todoi}, \textbf{todoii} + \end{itemize} + + \listoftodos +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/easy-todo.doc.tlpobj new/tlpkg/tlpobj/easy-todo.doc.tlpobj --- old/tlpkg/tlpobj/easy-todo.doc.tlpobj 2011-01-24 04:10:29.000000000 +0100 +++ new/tlpkg/tlpobj/easy-todo.doc.tlpobj 2014-01-15 03:24:09.000000000 +0100 @@ -1,9 +1,9 @@ name easy-todo.doc category Package -revision 21157 +revision 32677 shortdesc doc files of easy-todo relocated 1 -docfiles size=17 +docfiles size=38 RELOC/doc/latex/easy-todo/LICENSE RELOC/doc/latex/easy-todo/README RELOC/doc/latex/easy-todo/easy-todo.pdf ++++++ easy-todo.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/easy-todo/easy-todo.sty new/tex/latex/easy-todo/easy-todo.sty --- old/tex/latex/easy-todo/easy-todo.sty 2011-01-14 01:19:45.000000000 +0100 +++ new/tex/latex/easy-todo/easy-todo.sty 2014-01-15 01:30:42.000000000 +0100 @@ -1,42 +1,46 @@ % Created by Juan Rada-Vilela +% jcrada@fuzzylite.com \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{easy-todo}[2011/01/01] +\ProvidesPackage{easy-todo}[2014/01/01] -\def\@todoindexas{chapter} +\def\@todoindexas{section} \newcommand{\todoindexas}[1]{\def\@todoindexas{#1}} \def\@todoenable{true} \newcommand{\todoenable}[1]{\def\@todoenable{#1}} +\def\@todoobeyfinal{false} +\newcommand{\todoobeyfinal}[1]{\def\@todoobeyfinal{#1}} \DeclareOption{chapter}{\todoindexas{chapter}} \DeclareOption{section}{\todoindexas{section}} -\DeclareOption{final}{\todoenable{false}} -\DeclareOption{enabled}{\todoenable{true}} -\DeclareOption{disabled}{\todoenable{false}} +\DeclareOption{obeyFinal}{\todoobeyfinal{true}} +\DeclareOption{enable}{\todoenable{true}} +\DeclareOption{disable}{\todoenable{false}} + + \DeclareOption*{% - \PackageError{easy-todo}{What is \CurrentOption ?}{Options available: final, enabled, disabled, chapter, section}% + \PackageError{easy-todo}{What is \CurrentOption ?}{Options available: enable, disable, obeyFinal, chapter, section}% \todoindexas{chapter} } \ProcessOptions -% \RequirePackage[colorlinks]{hyperref} %Para hipervínculos en el documento (ver \iniciar) -\RequirePackage{color} %Para poner color en notas y pendientes -\RequirePackage{tocloft} %Para configurar índice general, de figuras y cuadros -\RequirePackage{ifthen} +\RequirePackage{color} %to add colour +\RequirePackage{tocloft} %to create index +\RequirePackage{ifthen} %to ifthenelse conditions +\RequirePackage{ifdraft} %to detect draft/final options \newcommand{\todoindextitle}{ToDo} \newcommand{\todoindexpagetitle}{P.} \newcommand{\todocolor}{\color{red}} -%Índice de Pendientes \newcommand{\listoftodosname}{\todoindextitle} \newlistof[part]{todos}{lod}{\listoftodosname} -%Comando: listoftodos -%Descripción: Crea el índice de pendientes. +%Command: listoftodos +%Description: Creates the todo list (Section or Chapter) \renewcommand{\listoftodos}{ { \ifthenelse{\equal{\@todoenable}{true}} @@ -57,13 +61,34 @@ } \renewcommand{\thetodos}{\@arabic\c@todos} -%Comando: pendiente -%Descripción: Agrega una anotación al índice de pendientes y la muestra en el lugar donde fue agregada. Para mostrar los pendientes, ejecutar antes de \configurar \habilitarpendientes -%Parámetros: [1] Texto del pendiente (e.g. Mejorar redacción) -\newcommand{\todo}[1]{ - \ifthenelse{\equal{\@todoenable}{true}}{ - \refstepcounter{todos} - \noindent{\todocolor\normalfont\scriptsize{\bfseries{\thetodos. }#1}} - \addcontentsline{lod}{todos}{\protect{\thetodos. }#1} - }{} +%Command: todo +%Description: Creates a todo note with the number and information +%Parameter: TODO note +\newcommand{\todo}[1]{% +\todoii{#1}{#1}\unskip% +} + +%Command: todoi +%Description: Creates a todo note with just a number +%Parameters: [1] the information to show at the list +\newcommand{\todoi}[1]{% +\todoii{}{#1}\unskip% +} + +%Command: todoii +%Description: Creates a todo note +%Parameters: [1] the note to show, [2] the information to show at the list +\newcommand{\todoii}[2]{% +\ifthenelse{\equal{\@todoobeyfinal}{true}}{% + \ifoptionfinal{\todoenable{false}}{\todoenable{true}}% +}{}% +\ifthenelse{\equal{\@todoenable}{true}}{% +\refstepcounter{todos}% +\noindent{\todocolor\normalfont\scriptsize{\bfseries{\thetodos.#1}}}% +\addcontentsline{lod}{todos}{\protect{\thetodos. }#2}% +}{}% } + + + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/easy-todo.tlpobj new/tlpkg/tlpobj/easy-todo.tlpobj --- old/tlpkg/tlpobj/easy-todo.tlpobj 2011-01-24 04:10:29.000000000 +0100 +++ new/tlpkg/tlpobj/easy-todo.tlpobj 2014-01-15 03:24:09.000000000 +0100 @@ -1,6 +1,6 @@ name easy-todo category Package -revision 21157 +revision 32677 shortdesc To-do notes in a document. relocated 1 longdesc The package provides to-do notes throughout a document, and @@ -8,6 +8,5 @@ runfiles size=1 RELOC/tex/latex/easy-todo/easy-todo.sty catalogue-ctan /macros/latex/contrib/easy-todo -catalogue-date 2011-01-20 10:27:03 +0100 +catalogue-date 2014-01-14 11:49:17 +0100 catalogue-license apache2 -catalogue-version 1.0 ++++++ easylist.doc.tar.xz ++++++ Files old/doc/latex/easylist/easylist-doc.pdf and new/doc/latex/easylist/easylist-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/easylist/easylist-doc.tex new/doc/latex/easylist/easylist-doc.tex --- old/doc/latex/easylist/easylist-doc.tex 2010-03-01 02:50:01.000000000 +0100 +++ new/doc/latex/easylist/easylist-doc.tex 2014-01-14 01:17:00.000000000 +0100 @@ -10,7 +10,7 @@ \usepackage{xcolor} \usepackage{fancyvrb} \usepackage{easylist} -\usepackage[pdfborder=0 0 1]{hyperref} +\usepackage[pdfborder={0 0 0}]{hyperref} \let\ref\autoref \title{\Example{12}{\bfseries The \texttt{easylist} package for numbered items}} @@ -1099,7 +1099,7 @@ We need some simple definitions, including a font definition for Zapf's Dingbats. \VI3. -Now, here's the command that handles numbers and their punctuation. It defines +\el@ItemCounter+, to be inserted in the final product. First, we turn user's input into commands for the +Numbers+ parameter. We do this here because a command such as +\l+ has to be local, since it's used to typeset some letter. The +\z+ command actually changes the font. +Now, here's the command that handles numbers and their punctuation. It defines +\el@ItemCounter+, to be inserted in the final product. The commands before match the +Numbers+ parameter with \LaTeX\ commands. \VI7. \noindent The definition is twofold: it prints the first numbers, and then the last one, i.e. the \n th one in an item of the \n th level. There are few differences. So, in case we're one of the first counters, i.e. in case +\el@ControlCounter+ is lower than +\el@CounterLevel+ (which basically records how many \S's we've seen), and if +Start*+ for this counter is unspecified (equal to +NA+) but +Start+ is not, then we turn that counter to the value of +Start+, set it back to +NA+ (because we don't want the counter to be stuck to that value), and reset lower counters. Indeed, if you say +\ListProperties(Start1=5)+ and then type \S\S, chances are you want the second counter to start at 1, don't you? @@ -1111,8 +1111,8 @@ \noindent Now, if the current counter is higher than +Hide+ for the current level, we print it or rather store it in +\el@ItemCounter+, which before all stores itself, i.e. previous values of itself, so when we reiterate we retrieve everything from the previous iteration. \VI*2. -\noindent We store the counter value in a group, because if its +Numbers+ parameter is +z+, we change the font, and we don't want that to spread. This parameter is used in a somewhat cumbersome but efficient fashion; we retrieve its value with +\csname Numbers\the\el@ControlCounter\endcsname+, which yields, say, +a+, and since it's enclosed in an additional +\csname+/+\endcsname+ pair, we get +\a+, which was defined at the beginning of the macro. -\VI*3. +\noindent We store the counter value in a group, because if its +Numbers+ parameter is +z+, we change the font, and we don't want that to spread. +\VI*4. \noindent Finally, we put the punctuation mark, close the +\el@ItemCounter+ and the conditional and set the stage for tail recursion: \VI*4. @@ -1124,7 +1124,7 @@ \VI*9. \noindent We build +\el@ItemCounter+ just the same except that if +FinalMark+ is specified, we put it instead of +Mark+. -\VI*11. +\VI*12. \noindent And we stop the iteration and close: \VI*4. @@ -1171,8 +1171,8 @@ \noindent If +Hang+ is turned off, we simply set +\parindent+ to value specified by the user: \VI*3. -\noindent Finally, we set the left margin, and with +\hangafter0+ we tell \TeX\ to start indenting from the first line on. Then we add the negative space (set to 0pt if +Align+ is not +alreadymoved+) and release the box. -\VI*2. +\noindent Finally, we set the left margin, and with +\hangafter0+ we tell \TeX\ to start indenting from the first line on. Then we add the negative space (set to 0pt if +Align+ is not +alreadymoved+) and release the box. The +\if@afterindent+ conditional is set to +true+ to prevent \LaTeX\ from removing indentation after section titles. +\VI*3. \noindent We're done with the counter and we must now set the stage for the item text. First, we open a group for the reason above, set +\@currentlabel+ (used by \LaTeX\ to know what should be +\label+'ed with +\label+) to +\el@ItemCounter+ and clear the latter (since it recusively defines itself, see above). \VI*3. @@ -1207,4 +1207,4 @@ At last, we restore the original catcodes and say goodbye. \VI5. -\end{document} \ No newline at end of file +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/easylist.doc.tlpobj new/tlpkg/tlpobj/easylist.doc.tlpobj --- old/tlpkg/tlpobj/easylist.doc.tlpobj 2011-05-10 04:18:12.000000000 +0200 +++ new/tlpkg/tlpobj/easylist.doc.tlpobj 2014-01-14 03:31:21.000000000 +0100 @@ -1,9 +1,9 @@ name easylist.doc category Package -revision 22362 +revision 32661 shortdesc doc files of easylist relocated 1 -docfiles size=105 +docfiles size=163 RELOC/doc/latex/easylist/README RELOC/doc/latex/easylist/easylist-doc.pdf RELOC/doc/latex/easylist/easylist-doc.tex ++++++ easylist.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/easylist/easylist.sty new/tex/latex/easylist/easylist.sty --- old/tex/latex/easylist/easylist.sty 2011-05-09 01:21:33.000000000 +0200 +++ new/tex/latex/easylist/easylist.sty 2014-01-14 01:17:00.000000000 +0100 @@ -1,6 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% %% -%% easylist.sty v.1.3 by Paul Isambert %% +%% easylist.sty v.1.4 by Paul Isambert %% %% See the documentation for a comment on the implementation. %% %% %% %% This set of macros is published under the LaTeX Project Public License. %% @@ -15,7 +15,7 @@ %% %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{easylist}[2010/02/28 v.1.3 Numbered items with a single command.] +\ProvidesPackage{easylist}[2014/01/11 v.1.4 Numbered items with a single command.] \makeatletter @@ -627,13 +627,13 @@ \def\el@NA{NA} \font\el@ZapfDingbats=pzdr +\expandafter\def\csname el@NumberDenotation:a\endcsname{\arabic}% +\expandafter\def\csname el@NumberDenotation:l\endcsname{\alph}% +\expandafter\def\csname el@NumberDenotation:L\endcsname{\Alph}% +\expandafter\def\csname el@NumberDenotation:r\endcsname{\roman}% +\expandafter\def\csname el@NumberDenotation:R\endcsname{\Roman}% +\expandafter\def\csname el@NumberDenotation:z\endcsname{\el@ZapfDingbats\arabic}% \def\el@PrintCounters{% -\def\a{\arabic}% -\def\l{\alph}% -\def\L{\Alph}% -\def\r{\roman}% -\def\R{\Roman}% -\def\z{\el@ZapfDingbats\arabic}% \ifnum\el@ControlCounter<\el@CounterLevel \expandafter\ifx\csname Start\the\el@ControlCounter*\endcsname\el@NA \expandafter\ifx\csname Start\the\el@ControlCounter\endcsname\el@NA @@ -653,7 +653,8 @@ \ifnum\el@ControlCounter>\csname Hide\the\el@CounterLevel\endcsname \xdef\el@ItemCounter{\el@ItemCounter \bgroup - \csname\csname Numbers\the\el@ControlCounter\endcsname\endcsname{List\the\el@ControlCounter}% + \csname el@NumberDenotation:\csname Numbers\the\el@ControlCounter\endcsname\endcsname{% + List\the\el@ControlCounter}% \egroup \csname Mark\the\el@ControlCounter\endcsname}% \fi @@ -674,7 +675,8 @@ \ifnum\el@ControlCounter>\csname Hide\the\el@CounterLevel\endcsname \xdef\el@ItemCounter{\el@ItemCounter \bgroup - \csname\csname Numbers\the\el@ControlCounter\endcsname\endcsname{List\the\el@ControlCounter}% + \csname el@NumberDenotation:\csname Numbers\the\el@ControlCounter\endcsname\endcsname{% + List\the\el@ControlCounter}% \egroup \expandafter\ifx\csname FinalMark\the\el@ControlCounter\endcsname\el@NA \csname Mark\the\el@ControlCounter\endcsname @@ -797,6 +799,7 @@ \else \parindent=\csname Indent\the\el@CounterLevel\endcsname \fi + \@afterindenttrue \hangafter0\hangindent\el@TotalMargin \hskip-\el@LeftMove\box\el@CounterBox \begingroup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/easylist.tlpobj new/tlpkg/tlpobj/easylist.tlpobj --- old/tlpkg/tlpobj/easylist.tlpobj 2011-05-10 04:18:12.000000000 +0200 +++ new/tlpkg/tlpobj/easylist.tlpobj 2014-01-14 03:31:21.000000000 +0100 @@ -1,6 +1,6 @@ name easylist category Package -revision 22362 +revision 32661 shortdesc Lists using a single active character. relocated 1 longdesc This package allows you to create lists of numbered items (as @@ -8,9 +8,9 @@ longdesc as the only command. A variety of parameters are available to longdesc configure the appearance of the list; lists may be nested longdesc (effectively to unlimited depth). -runfiles size=7 +runfiles size=8 RELOC/tex/latex/easylist/easylist.sty catalogue-ctan /macros/latex/contrib/easylist -catalogue-date 2010-02-28 15:24:01 +0100 +catalogue-date 2012-04-14 11:10:53 +0200 catalogue-license lppl catalogue-version 1.3 ++++++ eiad.doc.tar.xz ++++++ ++++++ eiad.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eiad.tlpobj new/tlpkg/tlpobj/eiad.tlpobj --- old/tlpkg/tlpobj/eiad.tlpobj 2010-06-10 18:26:46.000000000 +0200 +++ new/tlpkg/tlpobj/eiad.tlpobj 2014-04-18 02:51:17.000000000 +0200 @@ -82,5 +82,5 @@ RELOC/tex/latex/eiad/OT1eiadss.fd RELOC/tex/latex/eiad/OT1eiadtt.fd catalogue-ctan /fonts/eiad -catalogue-date 2008-12-05 21:50:47 +0100 -catalogue-license noinfo +catalogue-date 2012-06-04 11:02:08 +0200 +catalogue-license pd ++++++ eledmac.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/eledmac/Makefile new/doc/latex/eledmac/Makefile --- old/doc/latex/eledmac/Makefile 2012-09-19 01:43:55.000000000 +0200 +++ new/doc/latex/eledmac/Makefile 2013-08-17 01:05:57.000000000 +0200 @@ -16,7 +16,7 @@ %.sty: %.ins %.dtx - rm -f $*.sty led*tex + rm -f $*.sty $*tex @pdflatex $*.ins %.pdf: %.sty %.dtx @@ -28,8 +28,11 @@ dist: $(PACKAGE) + rm -rf eledmac + mkdir eledmac + cp $(PACKAGE) eledmac @$(RM) ../eledmac.zip - zip ../eledmac.zip $(PACKAGE) + zip -r ../eledmac.zip eledmac clean: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/eledmac/README new/doc/latex/eledmac/README --- old/doc/latex/eledmac/README 2012-09-19 01:43:55.000000000 +0200 +++ new/doc/latex/eledmac/README 2013-11-10 00:38:16.000000000 +0100 @@ -56,7 +56,7 @@ To install the eledmac package: -o run: latex eledmac.ins (which will generate ledmac.sty) +o run: latex eledmac.ins (which will generate eledmac.sty) o Move ledmac.sty (and ledpatch.sty if it exists) to a location where LaTeX will find it (for more information on this see the FAQ). Files old/doc/latex/eledmac/eledmac.pdf and new/doc/latex/eledmac/eledmac.pdf differ Files old/doc/latex/eledmac/eledpar.pdf and new/doc/latex/eledmac/eledpar.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eledmac.doc.tlpobj new/tlpkg/tlpobj/eledmac.doc.tlpobj --- old/tlpkg/tlpobj/eledmac.doc.tlpobj 2013-04-16 20:02:33.000000000 +0200 +++ new/tlpkg/tlpobj/eledmac.doc.tlpobj 2014-05-10 01:28:03.000000000 +0200 @@ -1,9 +1,9 @@ name eledmac.doc category Package -revision 29956 +revision 33944 shortdesc doc files of eledmac relocated 1 -docfiles size=327 +docfiles size=344 RELOC/doc/latex/eledmac/Makefile RELOC/doc/latex/eledmac/README RELOC/doc/latex/eledmac/eledmac.pdf ++++++ eledmac.tar.xz ++++++ ++++ 2313 lines of diff (skipped) ++++++ embrac.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/embrac/README new/doc/latex/embrac/README --- old/doc/latex/embrac/README 2013-05-14 01:44:35.000000000 +0200 +++ new/doc/latex/embrac/README 2014-05-09 00:43:52.000000000 +0200 @@ -3,13 +3,13 @@ Upright Brackets in Emphasized Text -2013/05/13 v0.4 +2014/05/07 v0.5 -------------------------------------------------------------------------- Clemens Niederberger Web: https://bitbucket.org/cgnieder/embrac/ E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- -Copyright 2012--2013 Clemens Niederberger +Copyright 2012--2014 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 @@ -34,4 +34,4 @@
“Die TeXnische Komödie” 2 (2012), pp. 51--53 which introduces code by Bruno Le Floch. Code parts and idea used with their kind permission. Many thanks!
\ No newline at end of file +-------------------------------------------------------------------------- Files old/doc/latex/embrac/embrac_en.pdf and new/doc/latex/embrac/embrac_en.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/embrac/embrac_en.tex new/doc/latex/embrac/embrac_en.tex --- old/doc/latex/embrac/embrac_en.tex 2013-05-14 01:44:35.000000000 +0200 +++ new/doc/latex/embrac/embrac_en.tex 2014-05-09 00:43:52.000000000 +0200 @@ -26,58 +26,28 @@ % % The Current Maintainer of this work is Clemens Niederberger. % -------------------------------------------------------------------------- -% The embrac package consists of the files -% - embrac.sty, embrac_en.tex, embrac_en.pdf, embrac_kerning_test.tex and -% README -% -------------------------------------------------------------------------- -% If you have any ideas, questions, suggestions or bugs to report, please -% feel free to contact me. -% -------------------------------------------------------------------------- -% -% if you want to compile this documentation you'll need the document class -% `cnpkgdoc' which you can get here: -% https://bitbucket.org/cgnieder/cnpkgdoc/ -% the class is licensed LPPL 1.3 or later -% -\documentclass[DIV10,toc=index,toc=bib]{cnpkgdoc} -\docsetup{ - pkg = [biblatex]embrac, - language = en , - code-box = { - backgroundcolor = gray!7!white , - skipbelow = .6\baselineskip plus .5ex minus .5ex , - skipabove = .6\baselineskip plus .5ex minus .5ex , - roundcorner = 3pt , - } , - gobble = 1 +\documentclass[load-preamble+]{cnltx-doc} +\usepackage[utf8]{inputenc} +\usepackage[biblatex]{embrac} + +\setcnltx{ + package = embrac , + authors = Clemens Niederberger , + email = contact@mychemistry.eu , + url = https://bitbucket.org/cgnieder/embrac/ , + quote-author-format = , + add-cmds = { + AddEmph, + ChangeEmph, + DeleteEmph, + EmbracOff, + EmbracOn, + printbibliography, + RenewEmph + } } -\usepackage{libertinehologopatch} -\usepackage{fnpct,ragged2e} -\cnpkgusecolorscheme{friendly} -\renewcommand*\othersectionlevelsformat[3]{% - \textcolor{main}{#3\autodot}\enskip} -\renewcommand*\partformat{% - \textcolor{main}{\partname~\thepart\autodot}} - -\newcommand*\Default[1]{% - \hfill\llap{% - \ifblank{#1} - {(initially~empty)} - {Default:~\code{#1}}% - }\newline -} - -\addcmds{ - AddEmph, - DeleteEmph, - EmbracOff, - EmbracOn, - printbibliography, - ChangeEmph -} - -\usepackage[backend=biber,style=alphabetic]{biblatex} +\usepackage{csquotes} \addbibresource{\jobname.bib} \usepackage{filecontents} \begin{filecontents}{\jobname.bib} @@ -106,56 +76,19 @@ } \end{filecontents} -% index: -\usepackage{imakeidx} -\begin{filecontents*}{\jobname.ist} - heading_prefix "{\\bfseries " - heading_suffix "\\hfil}\\nopagebreak\n" - headings_flag 1 - delim_0 "\\dotfill\\hyperpage{" - delim_1 "\\dotfill\\hyperpage{" - delim_2 "\\dotfill\\hyperpage{" - delim_r "}\\textendash\\hyperpage{" - delim_t "}" - suffix_2p "\\nohyperpage{\\,f.}" - suffix_3p "\\nohyperpage{\\,ff.}" -\end{filecontents*} -\indexsetup{noclearpage,othercode=\footnotesize} -\makeindex[options={-s \jobname.ist},intoc,columns=3] - \usepackage{fixfoot} \DeclareFixedFootnote\manythanks{Many thanks again for his kind permission to use it!} \RenewEmph{[}[-0.045em,.02em]{]}[.055em,-.09em] \ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em] -\usepackage{marginnote} -\makeatletter -\providecommand*\sinceversion[1]{% - \@bsphack - \marginnote{% - \footnotesize\sffamily\RaggedRight - \textcolor{black!75}{Introduced in version~#1}}% - \@esphack} -\providecommand*\changedversion[1]{% - \@bsphack - \marginnote{% - \footnotesize\sffamily\RaggedRight - \textcolor{black!75}{Changed in version~#1}}% - \@esphack} -\makeatother - \begin{document} -\section{License and Requirements}\secidx{License}\secidx{Requirements} -\embrac is placed under the terms of the LaTeX Project Public License, -version 1.3 or later (\url{http://www.latex-project.org/lppl.txt}). -It has the status ``maintained.'' - -\embrac loads and needs the packages \paket{expl3}, \paket{xparse} and -\paket{l3keys2e}, the first is part of the \paket{l3kernel} and the others are -part of the \paket{l3packages}. -\secidx*{License}\secidx*{Requirements} +\section{License and Requirements} +\license + +\embrac\ needs the the \bnd{l3kernel}~\cite{bnd:l3kernel} and +\bnd{l3packages}~\cite{bnd:l3packages}. \section{Acknowledgements} I like to thank both Dominik Waßenhoven for inspiration~\cite{dtk12-dw} and @@ -164,14 +97,15 @@ \section{New} \begin{description} - \item[v0.1a] The command \cmd{RenewEmph} has been renamed into - \cmd{ChangeEmph} and a new slightly different \cmd{RenewEmph} has been added. - \item[v0.2] Improved interaction with \paket{biblatex}. - \item[v0.3] Added support for \paket*{fontspec}'s \cmd{textsi}. + \item[v0.1a] The command \cs{RenewEmph} has been renamed into + \cs{ChangeEmph} and a new slightly different \cs{RenewEmph} has been added. + \item[v0.2] Improved interaction with \pkg{biblatex}. + \item[v0.3] Added support for \pkg*{fontspec}'s \cs{textsi}. + \item[v0.5] Don't replace brackets in math mode. \end{description} -\section{About}\label{sec:about}\secidx{About} -\begin{zitat}[{{\cite[85]{bringhurst04}}}] +\section{About}\label{sec:about} +\begin{cnltxquote}[{\cite[85]{bringhurst04}}] Parentheses and brackets are not letters, and it makes little sense to speak of them as roman or italic. There are vertical parentheses and sloped ones, and the parentheses on italic fonts are almost always sloped, but vertical @@ -187,7 +121,7 @@ should be used, no matter whether the text is roman or italic: \textquote{The View from My \emph{[sic]} Bed} and \textquote{\emph{the view from my [sic] bed}.\kern.05em} -\end{zitat} +\end{cnltxquote} \noindent Both this quote from~\citetitle{bringhurst04} by Robert Bringhurst and the @@ -197,203 +131,208 @@ originally provided by Bruno Le~Floch\manythanks\ answering a question on \href{http://tex.stackexchange.com}{TeX.sx}~\cite{lefloch11}. -\embrac tries to redefine \cmd{emph} and \cmd{textit} in a way that neither +\embrac\ tries to redefine \cs{emph} and \cs{textit} in a way that neither parentheses nor square brackets are sloped. In an ideal world you of course wouldn't need this package because the italic font you're using would have vertical parentheses and brackets by itself. -\begin{beispiel} - \emph{This is emphasized [sic] text.} \\ - \emph{This is emphasized text (as you can see).} -\end{beispiel} -\secidx*{About} - -\section{How it Works}\secidx{How it Works} -Both the commands \cmd{emph} and \cmd{textit} are redefined: -\begin{beschreibung} - \Befehl{emph}*{<emphasized text>} - \Befehl{textit}*{<text in italics>} - \Befehl{textsi}*{<text in italic small caps>}\newline - This command is only defined and thus redefined if you loaded \paket{fontspec}, - \emph{i.e.} if you're compiling your document with \XeLaTeX{} or \LuaLaTeX. -\end{beschreibung} -They now have a \code{*} argument that restores the original behaviour. +\begin{example} + \emph{This is emphasized [sic] text.} \par + \emph{This is emphasized text (as you can see).} +\end{example} + +\section{How it Works} +Both the commands \cs{emph} and \cs{textit} are redefined: +\begin{commands} + \command{emph}[\sarg\marg{emphasized text}] + Emphasizing text. + \command{textit}[\sarg\marg{text in italics}] + Italicizing text, + \command{textsi}[\sarg\marg{text in italic small caps}] + This command is only defined and thus redefined if you loaded + \pkg{fontspec}, \ie, if you're compiling your document with \XeLaTeX{} or + \LuaLaTeX. +\end{commands} +They now have a \sarg\ argument that restores the original behaviour. Otherwise they're used just as before. Let's see the example again: -\begin{beispiel} - \emph{This is emphasized [sic] text.} \\ - \emph{This is emphasized text (as you can see).} -\end{beispiel} -As you can see you don't have to do anything apart from loading \embrac in +\begin{example} + \emph{This is emphasized [sic] text.} \par + \emph{This is emphasized text (as you can see).} +\end{example} +As you can see you don't have to do anything apart from loading \embrac\ in your preamble. Well -- that's actually not entirely true. You have to take care of the kerning of the parentheses and brackets. Otherwise things could -look worse with \embrac than without. +look worse with \embrac\ than without. The following example demonstrates one point why you have to be very careful when using \embrac. Certain parenthesis-letter combinations might need adjustments of the kerning: -\begin{beispiel} - \emph{This is (just) emphasized text.} \\ - \emph{This is (\kern.1em just) emphasized text.} -\end{beispiel} +\begin{example} + \emph{This is (just) emphasized text.} \par + \emph{This is (\kern.1em just) emphasized text.} +\end{example} This of course strongly depends on the font you've chosen. Kerning is a very important aspect when using this package and you shouldn't use it without giving it a certain amount of attention. See the next section for more -details. \secidx*{How it Works} +details. \section{Adding More Brackets \&\ Adjusting the Kerning} -\secidx{Adding More Brackets}\secidx{Adjusting the Kerning} If you want you -can change the behaviour of \embrac. Maybe it should only affect squared -brackets? Or curly braces, too? This can be done with the following -commands. They all work locally which means if used inside a group outside of -it everything stays what it was. -\begin{beschreibung} - \Befehl{AddEmph}{<o>}\oa{<io-kern>,<oo-kern>}\ma{<c>}\oa{<ic-kern>,<oc-kern>} - \Befehl{ChangeEmph}{<o>}\oa{<io-kern>,<oo-kern>}\ma{<c>}\oa{<ic-kern>,<oc-kern>} - \Befehl{RenewEmph}{<o>}\oa{<io-kern>,<oo-kern>}\ma{<c>}\oa{<ic-kern>,<oc-kern>} - \Befehl{DeleteEmph}{<o>}\ma{<c>} -\end{beschreibung} -Here \code{<o>} means \emph{opening bracket} and \code{<c>} means -\emph{closing bracket}. The kerning arguments are all four optional and -require -- if given -- to be a length. If they're not given \cmd{AddEmph} and -\cmd{RenewEmph} insert \code{0pt} and \cmd{ChangeEmph} uses the value stored -by \cmd{AddEmph} or \cmd{RenewEmph} before. +If you want you can change the behaviour of \embrac. Maybe it should only +affect squared brackets? Or curly braces, too? This can be done with the +following commands. They all work locally which means if used inside a group +outside of it everything stays what it was. +\begin{commands} + \command{AddEmph}[\marg{o}\Oarg{\meta{io-kern},\meta{oo-kern}}% + \marg{c}\Oarg{\meta{ic-kern},\meta{oc-kern}}] + Add a pair of brackets to be left upright in italic text. + \command{ChangeEmph}[\marg{o}\Oarg{\meta{io-kern},\meta{oo-kern}}% + \marg{c}\Oarg{\meta{ic-kern},\meta{oc-kern}}] + Change the kerning values for a given pair of brackets. + \command{RenewEmph}[\marg{o}\Oarg{\meta{io-kern},\meta{oo-kern}}% + \marg{c}\Oarg{\meta{ic-kern},\meta{oc-kern}}] + Renew the kerning values for a given pair of brackets. See below for the + difference to \cs{ChangeEmph}. + \command{DeleteEmph}[\marg{o}\marg{c}] + Remove a pair of brackets from treatment. +\end{commands} +In the above descriptions \meta{o} means \emph{opening bracket} and \meta{c} +means \emph{closing bracket}. The kerning arguments are all four optional and +require -- if given -- to be a length. If they're not given \cs{AddEmph} and +\cs{RenewEmph} insert \code{0pt} and \cs{ChangeEmph} uses the value stored by +\cs{AddEmph} or \cs{RenewEmph} before. \sinceversion{0.4}To each of these commands there are two variants that are only semantically different\footnote{They're also using different lists internally but you shouldn't concern yourself with this.}. They are all -called \cmd*{<base>OpEmph} or \cmd*{<base>ClEmph} where \code{<base>} is +called \cs*{\meta{base}OpEmph} or \cs*{\meta{base}ClEmph} where \meta{base} is either \code{Add}, \code{Change}, \code{Renew} or \code{Delete}. Their arguments are all the same: the half of what the main commands have for either modifying the opening or the closing symbols. -\begin{beschreibung} - \Befehl{AddOpEmph}{<o>}\oa{<io-kern>,<oo-kern>} - \Befehl{AddClEmph}{<c>}\oa{<ic-kern>,<oc-kern>} -\end{beschreibung} +\begin{commands} + \command{AddOpEmph}[\marg{o}\Oarg{\meta{io-kern},\meta{oo-kern}}] + An an opening bracket to the treatment. + \command{AddClEmph}[\marg{c}\Oarg{\meta{ic-kern},\meta{oc-kern}}] + An a closing bracket to the treatment. +\end{commands} They allow you to add single symbols to \embrac's mechanism instead of adding pairs. -In all these commands the optional argument \code{<io-kern>} is inserted after -the opening bracket (inner opening), \code{<oo-kern>} is inserted before it -(outer opening). \code{<ic-kern>} is inserted before the closing bracket -(inner closing), \code{<oc-kern>} after it (outer closing). - -\embrac initially makes these definitions: -\begin{beispiel}[code only] - % add some defaults: - \AddEmph{[}{]}[.04em,-.12em] - \AddEmph{(}[-.04em]{)}[,-.15em] -\end{beispiel} +In all these commands the optional argument \meta{io-kern} is inserted after +the opening bracket (inner opening), \meta{oo-kern} is inserted before it +(outer opening). \meta{ic-kern} is inserted before the closing bracket (inner +closing), \meta{oc-kern} after it (outer closing). + +\embrac\ initially makes these definitions: +\begin{sourcecode} + % add some defaults: + \AddEmph{[}{]}[.04em,-.12em] + \AddEmph{(}[-.04em]{)}[,-.15em] +\end{sourcecode} This document however uses ``Linux Libertine O''\footnote{\url{http://www.linuxlibertine.org/}} both for the roman and the italic font and redefines them in this way (still not sure these are the best values): -\begin{beispiel}[code only] - \RenewEmph{[}[-0.045em,.02em]{]}[.055em,-.09em] - \ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em] -\end{beispiel} +\begin{sourcecode} + \RenewEmph{[}[-0.045em,.02em]{]}[.055em,-.09em] + \ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em] +\end{sourcecode} You can change them as you wish, but be careful with the kerning! What's too less for one letter might be too much for others: -\begin{beispiel} - \ChangeEmph{(}[.1em]{)}[.1em] - \emph{This is (just) emphasized text.} \\ % looks ok - \emph{This is emphasized text (as you can see).} % looks bad -\end{beispiel} +\begin{example} + \ChangeEmph{(}[.1em]{)}[.1em] + \emph{This is (just) emphasized text.} \par % looks OK, kind of + \emph{This is emphasized text (as you can see).} % looks bad +\end{example} To see why it is important to pay attention to the kerning values let's look at how \embrac's features look without kerning (\ie, \code{0pt} for each value), with the default settings and with the settings for this document: \begin{center} - \begin{minipage}{.5\linewidth} - \textbf{No Kerning:} + \begin{minipage}{.5\linewidth} + \textbf{No Kerning:} - \RenewEmph{[}{]}\RenewEmph{(}{)} - \emph{This is emphasized [sic] text.} \\ - \emph{This is emphasized text [as you can see].} \\ - \emph{This is emphasized (sic) text.} \\ - \emph{This is emphasized text (as you can see).} - \end{minipage}\bigskip + \RenewEmph{[}{]}\RenewEmph{(}{)} + \emph{This is emphasized [sic] text.} \\ + \emph{This is emphasized text [as you can see].} \\ + \emph{This is emphasized (sic) text.} \\ + \emph{This is emphasized text (as you can see).} + \end{minipage}\bigskip - \begin{minipage}{.5\linewidth} - \textbf{\embrac's Default Kerning:} + \begin{minipage}{.5\linewidth} + \textbf{\embrac's Default Kerning:} - \RenewEmph{[}{]}[.04em,-.12em]\RenewEmph{(}[-.04em]{)}[,-.15em] - \emph{This is emphasized [sic] text.} \\ - \emph{This is emphasized text [as you can see].} \\ - \emph{This is emphasized (sic) text.} \\ - \emph{This is emphasized text (as you can see).} - \end{minipage}\bigskip + \RenewEmph{[}{]}[.04em,-.12em]\RenewEmph{(}[-.04em]{)}[,-.15em] + \emph{This is emphasized [sic] text.} \\ + \emph{This is emphasized text [as you can see].} \\ + \emph{This is emphasized (sic) text.} \\ + \emph{This is emphasized text (as you can see).} + \end{minipage}\bigskip - \begin{minipage}{.5\linewidth} - \textbf{Adjusted Kerning:} + \begin{minipage}{.5\linewidth} + \textbf{Adjusted Kerning:} - \emph{This is emphasized [sic] text.} \\ - \emph{This is emphasized text [as you can see].} \\ - \emph{This is emphasized (sic) text.} \\ - \emph{This is emphasized text (as you can see).} - \end{minipage} + \emph{This is emphasized [sic] text.} \\ + \emph{This is emphasized text [as you can see].} \\ + \emph{This is emphasized (sic) text.} \\ + \emph{This is emphasized text (as you can see).} + \end{minipage} \end{center} Deleting a pair removes it completely from \embrac's mechanism. All information about the pair and its kerning values will be lost. So if you want the effects to be temporary use grouping. -\begin{beispiel} - \DeleteEmph{[}{]} - \emph{This is emphasized [sic] text.} \\ - \emph{This is emphasized text (as you can see).} -\end{beispiel} +\begin{example} + \DeleteEmph{[}{]} + \emph{This is emphasized [sic] text.} \par + \emph{This is emphasized text (as you can see).} +\end{example} By the way: this packages provides a simple file \code{embrac\_kerning\_test.tex} for testing kerning values. You should find -it in the same directory as this documentation. \secidx*{Adding More - Brackets}\secidx*{Adjusting the Kerning} +it in the same directory as this documentation. -\section{biblatex Compatibility}\secidx{biblatex Compatibility} + +\section{biblatex Compatibility} This is \embrac's only package option: -\begin{beschreibung} - \Option{biblatex}{\default{true}|on|parens|false|off|none}\Default{false} If - set to \code{true} (or one of its aliases) parentheses and squared brackets - as defined by \paket{biblatex} with \cmd{bibleftparen}, \cmd{bibrightparen}, - \cmd{bibleftbracket} and \cmd{bibrightbracket} are treated the same way (if - not removed from the treatment with \cmd{DeleteEmph}). +\begin{options} + \keychoice{biblatex}{\default{true},on,parens,false,off,none}\Default{false} + If set to \code{true} (or one of its aliases) parentheses and squared + brackets as defined by \pkg{biblatex} with \cs{bibleftparen}, + \cs{bibrightparen}, \cs{bibleftbracket} and \cs{bibrightbracket} are + treated the same way (if not removed from the treatment with \cs{DeleteEmph}). - The command \cmd{blx@imc@mkbibemph} is patched to use the original definition - of \cmd{emph}. -\end{beschreibung} - -\begin{beispiel} - % this document uses \usepackage[biblatex]{embrac} - \emph{Let's cite Bringhurst again:~\cite{bringhurst04}}. -\end{beispiel} -\secidx*{biblatex Compatibility} + The command \cs*{blx@imc@mkbibemph} is patched to use the original definition + of \cs{emph}. +\end{options} + +\begin{example} + % this document uses \usepackage[biblatex]{embrac} + \emph{Let's cite Bringhurst again:~\cite{bringhurst04}}. +\end{example} -\section{Turn \embrac Temporarily Off}\secidx{Turn \embrac Temporarily Off} -Redefining \cmd{emph} and \cmd{textit} is not without danger. Sometimes you +\section{Turn \embrac Temporarily Off} +Redefining \cs{emph} and \cs{textit} is not without danger. Sometimes you might find that you'd want to keep the original definition for a small portion of your document. You can use the following commands whose functions are obvious, I guess: -\begin{beschreibung} - \Befehl{EmbracOff} - \Befehl{EmbracOn} -\end{beschreibung} +\begin{commands} + \command{EmbracOff} + Turn \embrac's treatment off. + \command{EmbracOn} + Turn \embrac's treatment on. +\end{commands} Both commands are local. -\secidx*{Turn \embrac Temporarily Off} -\section{Watch out!}\secidx{Watch Out} -Please be aware that \embrac does not affect \cmd{itshape} nor \cmd{em} (nor -\cmd{it} which you shouldn't use in a \LaTeX{} document, anyway). -\begin{beispiel} - \itshape This is italic [sic] text. -\end{beispiel} -\secidx*{Watch Out} - -\printbibliography - -\indexprologue{\noindent Section titles are indicated \textbf{bold}, packages -\textsf{sans serif}, commands \cmd*{brown} and options \key*{yellow}.} -\printindex +\section{Watch out!} +Please be aware that \embrac does not affect \cs{itshape} nor \cs{em} (nor +\cs{it} which you shouldn't use in a \LaTeX{} document, anyway). +\begin{example} + \itshape This is italic [sic] text. +\end{example} + \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/embrac.doc.tlpobj new/tlpkg/tlpobj/embrac.doc.tlpobj --- old/tlpkg/tlpobj/embrac.doc.tlpobj 2013-05-14 03:50:07.000000000 +0200 +++ new/tlpkg/tlpobj/embrac.doc.tlpobj 2014-05-09 03:22:12.000000000 +0200 @@ -1,9 +1,9 @@ name embrac.doc category Package -revision 30450 +revision 33920 shortdesc doc files of embrac relocated 1 -docfiles size=116 +docfiles size=119 RELOC/doc/latex/embrac/README RELOC/doc/latex/embrac/embrac_en.pdf RELOC/doc/latex/embrac/embrac_en.tex ++++++ embrac.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/embrac/embrac.sty new/tex/latex/embrac/embrac.sty --- old/tex/latex/embrac/embrac.sty 2013-05-14 01:44:35.000000000 +0200 +++ new/tex/latex/embrac/embrac.sty 2014-05-09 00:43:52.000000000 +0200 @@ -8,7 +8,7 @@ % Web: https://bitbucket.org/cgnieder/embrac/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012--2013 Clemens Niederberger +% Copyright 2012--2014 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -34,8 +34,8 @@ \RequirePackage { expl3 , xparse , l3keys2e } \ProvidesExplPackage {embrac} - {2013/05/13} - {0.4} + {2014/05/07} + {0.5} {Upright Brackets in Emphasized Text} % -------------------------------------------------------------------------- @@ -75,9 +75,9 @@ biblatex .default:n = true } -\prg_new_conditional:Npnn \__embrac_if_fontspec: { T } +\prg_new_conditional:Npnn \embrac_if_fontspec: { T,F,TF } { - \@ifpackageloaded{fontspec} + \@ifpackageloaded {fontspec} { \prg_return_true: } { \prg_return_false: } } @@ -85,27 +85,30 @@ % save original commands, delay until begin document to catch `fontspec's % redefinitions: \AtBeginDocument{ - \cs_new_eq:Nc \__embrac_orig_emph:n { emph~ } - \cs_generate_variant:Nn \__embrac_orig_emph:n { V } - \cs_new_eq:Nc \__embrac_orig_textit:n { textit~ } - \cs_generate_variant:Nn \__embrac_orig_textit:n { V } - \__embrac_if_fontspec:T + \cs_new_eq:Nc \embrac_orig_emph:n { emph~ } + \cs_generate_variant:Nn \embrac_orig_emph:n { V } + \cs_new_eq:Nc \embrac_orig_textit:n { textit~ } + \cs_generate_variant:Nn \embrac_orig_textit:n { V } + \embrac_if_fontspec:T { - \cs_new_eq:Nc \__embrac_orig_textsi:n { textsi~ } - \cs_generate_variant:Nn \__embrac_orig_textsi:n { V } + \cs_new_eq:Nc \embrac_orig_textsi:n { textsi~ } + \cs_generate_variant:Nn \embrac_orig_textsi:n { V } } } % preparations: \cs_new_eq:NN \embrac_braces_format:n \textup -\cs_new_eq:NN \__embrac_kern:n \skip_horizontal:n +\cs_new_eq:NN \embrac_kern:n \skip_horizontal:n -\prg_new_conditional:Npnn \__embrac_empty_or_no_value:n #1 { F,TF } +\prg_new_conditional:Npnn \embrac_empty_or_no_value:n #1 { F,TF } { \IfNoValueTF { #1 } { \prg_return_true: } { \tl_if_blank:nTF { #1 } { \prg_return_true: } { \prg_return_false: } } } +\cs_new:Npn \embrac_nobreak: + { \tex_penalty:D \c_ten_thousand } + % -------------------------------------------------------------------------- % THE MAIN PART: % storage of the tokens to be replaced: @@ -115,27 +118,35 @@ \prop_new:N \l__embrac_emph_cbrackets_after_prop % do the replacing: -\cs_new_protected:Npn \__embrac_replace_brackets:N #1 +\cs_new_protected:Npn \embrac_replace_brackets:N #1 { \prop_map_inline:Nn \l__embrac_emph_obrackets_prop { \tl_replace_all:Nnn #1 { ##1 } { - \__embrac_kern:n - { \prop_get:Nn \l__embrac_emph_obrackets_before_prop { ##1 } } - \embrac_braces_format:n { ##1 \__embrac_kern:n { ##2 } } - \nobreak + \mode_if_math:TF + { ##1 } + { + \embrac_kern:n + { \prop_get:Nn \l__embrac_emph_obrackets_before_prop { ##1 } } + \embrac_braces_format:n { ##1 \embrac_kern:n { ##2 } } + \embrac_nobreak: + } } } \prop_map_inline:Nn \l__embrac_emph_cbrackets_prop { \tl_replace_all:Nnn #1 { ##1 } { - \nobreak - \embrac_braces_format:n - { \__embrac_kern:n { ##2 } ##1 } - \__embrac_kern:n - { \prop_get:Nn \l__embrac_emph_cbrackets_after_prop { ##1 } } + \mode_if_math:TF + { ##1 } + { + \embrac_nobreak: + \embrac_braces_format:n + { \embrac_kern:n { ##2 } ##1 } + \embrac_kern:n + { \prop_get:Nn \l__embrac_emph_cbrackets_after_prop { ##1 } } + } } } } @@ -144,44 +155,44 @@ \cs_new_protected:Npn \__embrac_emph:n #1 { \tl_set:Nx \l__embrac_tmpa_tl { #1 } - \__embrac_replace_brackets:N \l__embrac_tmpa_tl - \__embrac_orig_emph:V \l__embrac_tmpa_tl + \embrac_replace_brackets:N \l__embrac_tmpa_tl + \embrac_orig_emph:V \l__embrac_tmpa_tl } % internal \textit command: \cs_new_protected:Npn \__embrac_textit:n #1 { \tl_set:Nn \l__embrac_tmpa_tl { #1 } - \__embrac_replace_brackets:N \l__embrac_tmpa_tl - \__embrac_orig_textit:V \l__embrac_tmpa_tl + \embrac_replace_brackets:N \l__embrac_tmpa_tl + \embrac_orig_textit:V \l__embrac_tmpa_tl } % internal \textsi command: \AtBeginDocument{ - \__embrac_if_fontspec:T + \embrac_if_fontspec:T { \cs_new_protected:Npn \__embrac_textsi:n #1 { \tl_set:Nn \l__embrac_tmpa_tl { #1 } - \__embrac_replace_brackets:N \l__embrac_tmpa_tl - \__embrac_orig_textsi:V \l__embrac_tmpa_tl + \embrac_replace_brackets:N \l__embrac_tmpa_tl + \embrac_orig_textsi:V \l__embrac_tmpa_tl } } } % biblatex compatibility: -\cs_new_protected:Npn \__embrac_treat_bibparens: +\cs_new_protected:Npn \embrac_treat_bibparens: { \bool_if:NT \l__embrac_treat_biblatex_bool { - \__embrac_replace_brackets:N \bibleftbracket - \__embrac_replace_brackets:N \bibrightbracket - \__embrac_replace_brackets:N \bibleftparen - \__embrac_replace_brackets:N \bibrightparen + \embrac_replace_brackets:N \bibleftbracket + \embrac_replace_brackets:N \bibrightbracket + \embrac_replace_brackets:N \bibleftparen + \embrac_replace_brackets:N \bibrightparen } } -\cs_new_protected:Npn \__embrac_treat_bibemph: +\cs_new_protected:Npn \embrac_treat_bibemph: { \bool_if:NT \l__embrac_treat_biblatex_bool { @@ -192,37 +203,37 @@ } % internal \emph command, second layer: -\cs_new_protected:Npn \__embrac_new_emph:nn #1#2 +\cs_new_protected:Npn \embrac_emph:nn #1#2 { \group_begin: - \__embrac_treat_bibparens: + \embrac_treat_bibparens: \tl_if_eq:nnTF { #1 } { * } - { \__embrac_orig_emph:n { #2 } } + { \embrac_orig_emph:n { #2 } } { \__embrac_emph:n { #2 } } \group_end: } % internal \textit command, second layer: -\cs_new_protected:Npn \__embrac_new_textit:nn #1#2 +\cs_new_protected:Npn \embrac_textit:nn #1#2 { \group_begin: - \__embrac_treat_bibparens: + \embrac_treat_bibparens: \tl_if_eq:nnTF { #1 } { * } - { \__embrac_orig_textit:n { #2 } } + { \embrac_orig_textit:n { #2 } } { \__embrac_textit:n { #2 } } \group_end: } % internal \textsi command, second layer: \AtBeginDocument{ - \__embrac_if_fontspec:T + \embrac_if_fontspec:T { - \cs_new_protected:Npn \__embrac_new_textsi:nn #1#2 + \cs_new_protected:Npn \embrac_textsi:nn #1#2 { \group_begin: - \__embrac_treat_bibparens: + \embrac_treat_bibparens: \tl_if_eq:nnTF { #1 } { * } - { \__embrac_orig_textsi:n { #2 } } + { \embrac_orig_textsi:n { #2 } } { \__embrac_textsi:n { #2 } } \group_end: } @@ -233,27 +244,27 @@ \RenewDocumentCommand \emph { sm } { \IfBooleanTF { #1 } - { \__embrac_new_emph:nn { * } { #2 } } - { \__embrac_new_emph:nn { } { #2 } } + { \embrac_emph:nn { * } { #2 } } + { \embrac_emph:nn { } { #2 } } } % user command \textit: \RenewDocumentCommand \textit { sm } { \IfBooleanTF { #1 } - { \__embrac_new_textit:nn { * } { #2 } } - { \__embrac_new_textit:nn { } { #2 } } + { \embrac_textit:nn { * } { #2 } } + { \embrac_textit:nn { } { #2 } } } % user command \textsi: \AtBeginDocument{ - \__embrac_if_fontspec:T + \embrac_if_fontspec:T { \RenewDocumentCommand \textsi { sm } { \IfBooleanTF { #1 } - { \__embrac_new_textsi:nn { * } { #2 } } - { \__embrac_new_textsi:nn { } { #2 } } + { \embrac_textsi:nn { * } { #2 } } + { \embrac_textsi:nn { } { #2 } } } } } @@ -264,13 +275,13 @@ \NewDocumentCommand \EmbracOff {} { \RenewDocumentCommand \emph { sm } - { \__embrac_orig_emph:n { ##2 } } + { \embrac_orig_emph:n { ##2 } } \RenewDocumentCommand \textit { sm } - { \__embrac_orig_textit:n { ##2 } } + { \embrac_orig_textit:n { ##2 } } \cs_if_exist:NT \textsi { \RenewDocumentCommand \textsi { sm } - { \__embrac_orig_textsi:n { ##2 } } + { \embrac_orig_textsi:n { ##2 } } } } @@ -280,22 +291,22 @@ \RenewDocumentCommand \emph { sm } { \IfBooleanTF { ##1 } - { \__embrac_new_emph:nn { * } { ##2 } } - { \__embrac_new_emph:nn { } { ##2 } } + { \embrac_emph:nn { * } { ##2 } } + { \embrac_emph:nn { } { ##2 } } } \RenewDocumentCommand \textit { sm } { \IfBooleanTF { ##1 } - { \__embrac_new_textit:nn { * } { ##2 } } - { \__embrac_new_textit:nn { } { ##2 } } + { \embrac_textit:nn { * } { ##2 } } + { \embrac_textit:nn { } { ##2 } } } \cs_if_exist:NT \textsi { \RenewDocumentCommand \textsi { sm } { \IfBooleanTF { ##1 } - { \__embrac_new_textsi:nn { * } { ##2 } } - { \__embrac_new_textsi:nn { } { ##2 } } + { \embrac_textsi:nn { * } { ##2 } } + { \embrac_textsi:nn { } { ##2 } } } } } @@ -305,20 +316,20 @@ % internal add commands: \cs_new_protected:Npn \embrac_add_op_to_emph:nnn #1#2#3 { - \__embrac_empty_or_no_value:nTF { #2 } + \embrac_empty_or_no_value:nTF { #2 } { \prop_put_if_new:Nnn \l__embrac_emph_obrackets_prop { #1 } { 0pt } } { \prop_put_if_new:Nnn \l__embrac_emph_obrackets_prop { #1 } { #2 } } - \__embrac_empty_or_no_value:nTF { #3 } + \embrac_empty_or_no_value:nTF { #3 } { \prop_put_if_new:Nnn \l__embrac_emph_obrackets_before_prop { #1 } { 0pt } } { \prop_put_if_new:Nnn \l__embrac_emph_obrackets_before_prop { #1 } { #3 } } } \cs_new_protected:Npn \embrac_add_cl_to_emph:nnn #1#2#3 { - \__embrac_empty_or_no_value:nTF { #2 } + \embrac_empty_or_no_value:nTF { #2 } { \prop_put_if_new:Nnn \l__embrac_emph_cbrackets_prop { #1 } { 0pt } } { \prop_put_if_new:Nnn \l__embrac_emph_cbrackets_prop { #1 } { #2 } } - \__embrac_empty_or_no_value:nTF { #3 } + \embrac_empty_or_no_value:nTF { #3 } { \prop_put_if_new:Nnn \l__embrac_emph_cbrackets_after_prop { #1 } { 0pt } } { \prop_put_if_new:Nnn \l__embrac_emph_cbrackets_after_prop { #1 } { #3 } } } @@ -351,20 +362,20 @@ % internal renew commands: \cs_new_protected:Npn \embrac_renew_op_emph:nnn #1#2#3 { - \__embrac_empty_or_no_value:nTF { #2 } + \embrac_empty_or_no_value:nTF { #2 } { \prop_put:Nnn \l__embrac_emph_obrackets_prop { #1 } { 0pt } } { \prop_put:Nnn \l__embrac_emph_obrackets_prop { #1 } { #2 } } - \__embrac_empty_or_no_value:nTF { #3 } + \embrac_empty_or_no_value:nTF { #3 } { \prop_put:Nnn \l__embrac_emph_obrackets_before_prop { #1 } { 0pt } } { \prop_put:Nnn \l__embrac_emph_obrackets_before_prop { #1 } { #3 } } } \cs_new_protected:Npn \embrac_renew_cl_emph:nnn #1#2#3 { - \__embrac_empty_or_no_value:nTF { #2 } + \embrac_empty_or_no_value:nTF { #2 } { \prop_put:Nnn \l__embrac_emph_cbrackets_prop { #1 } { 0pt } } { \prop_put:Nnn \l__embrac_emph_cbrackets_prop { #1 } { #2 } } - \__embrac_empty_or_no_value:nTF { #3 } + \embrac_empty_or_no_value:nTF { #3 } { \prop_put:Nnn \l__embrac_emph_cbrackets_after_prop { #1 } { 0pt } } { \prop_put:Nnn \l__embrac_emph_cbrackets_after_prop { #1 } { #3 } } } @@ -380,9 +391,9 @@ { \prop_if_in:NnT \l__embrac_emph_obrackets_prop { #1 } { - \__embrac_empty_or_no_value:nF { #2 } + \embrac_empty_or_no_value:nF { #2 } { \prop_put:Nnn \l__embrac_emph_obrackets_prop { #1 } { #2 } } - \__embrac_empty_or_no_value:nF { #3 } + \embrac_empty_or_no_value:nF { #3 } { \prop_put:Nnn \l__embrac_emph_obrackets_before_prop { #1 } { #3 } } } } @@ -391,9 +402,9 @@ { \prop_if_in:NnT \l__embrac_emph_cbrackets_prop { #1 } { - \__embrac_empty_or_no_value:nF { #2 } + \embrac_empty_or_no_value:nF { #2 } { \prop_put:Nnn \l__embrac_emph_cbrackets_prop { #1 } { #2 } } - \__embrac_empty_or_no_value:nF { #3 } + \embrac_empty_or_no_value:nF { #3 } { \prop_put:Nnn \l__embrac_emph_cbrackets_after_prop { #1 } { #3 } } } } @@ -503,7 +514,7 @@ \ProcessKeysOptions { embrac } -\AtBeginDocument { \__embrac_treat_bibemph: } +\AtBeginDocument { \embrac_treat_bibemph: } \tex_endinput:D @@ -519,4 +530,6 @@ 2013/04/04 - v0.3a - bug fix in \EmbracOn and \EmbracOff 2013/05/13 - v0.4 - added versions of \AddEmph, \RenewEmph, \DeleteEmph and \ChangeEmph that allow setting opening or closing parts - separately \ No newline at end of file + separately +2014/05/07 - v0.5 - renaming of some internal commands + - leave brackets unchanged if in math mode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/embrac.tlpobj new/tlpkg/tlpobj/embrac.tlpobj --- old/tlpkg/tlpobj/embrac.tlpobj 2013-05-14 03:50:07.000000000 +0200 +++ new/tlpkg/tlpobj/embrac.tlpobj 2014-05-09 03:22:13.000000000 +0200 @@ -1,6 +1,6 @@ name embrac category Package -revision 30450 +revision 33920 shortdesc Upright brackets in emphasised text. relocated 1 longdesc The package redefines the commands \emph and \textit so that @@ -11,6 +11,6 @@ runfiles size=4 RELOC/tex/latex/embrac/embrac.sty catalogue-ctan /macros/latex/contrib/embrac -catalogue-date 2013-05-13 20:07:16 +0200 +catalogue-date 2014-05-08 14:35:28 +0200 catalogue-license lppl1.3 -catalogue-version 0.4 +catalogue-version 0.5 ++++++ texlive-specs-g-rpmlintrc ++++++ addFilter(".*dangling-symlink.*/fonts/.*") addFilter(".*dangling-symlink.*/zypper\.py.*") addFilter(".*description-shorter-than-summary.*") addFilter(".*devel-file-in-non-devel-package.*/doc/.*") addFilter(".*files-duplicate.*") addFilter(".*E:.*files-duplicated-waste.*") addFilter(".*spelling-error.*") addFilter(".*zero-length.*") addFilter(".*E:.*summary-too-long.*") addFilter(".*incorrect-fsf-address.*") addFilter(".*hidden-file-or-dir.*/\.tex.*") addFilter(".*wrong-script-end-of-line-encoding.*") addFilter(".*script-without-shebang.*/doc/.*") addFilter(".*wrong-script-interpreter.*/doc/.*") addFilter(".*non-executable-script.*/doc/.*")