[SCM] cecilia/master: tex aux and log files changed...

tiago at users.alioth.debian.org tiago at users.alioth.debian.org
Mon Feb 11 18:07:29 UTC 2013


The following commit has been merged in the master branch:
commit 7ff0c85f98585687482e07c8206d9fe2b50117b3
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Mon Feb 11 13:03:08 2013 -0500

    tex aux and log files changed...

diff --git a/doc/Cecilia5_manuel.aux b/doc/Cecilia5_manuel.aux
index 26ce507..72c9678 100644
--- a/doc/Cecilia5_manuel.aux
+++ b/doc/Cecilia5_manuel.aux
@@ -17,19 +17,11 @@
 \fi}
 \global\let\hyper at last\relax 
 \gdef\HyperFirstAtBeginDocument#1{#1}
-<<<<<<< HEAD
-\ifx\rEfLiNK\UnDef\gdef \rEfLiNK#1#2{#2}\fi
-=======
 \providecommand\HyField at AuxAddToFields[1]{}
->>>>>>> upstream/5.0.7+svn391
 \select at language{french}
 \@writefile{toc}{\select at language{french}}
 \@writefile{lof}{\select at language{french}}
 \@writefile{lot}{\select at language{french}}
-<<<<<<< HEAD
-\@writefile{lof}{\addvspace {10\p@ }}
-\@writefile{lot}{\addvspace {10\p@ }}
-=======
 \@writefile{toc}{\contentsline {chapter}{\numberline {1}Template}{5}{chapter.1}}
 \@writefile{lof}{\addvspace {10\p@ }}
 \@writefile{lot}{\addvspace {10\p@ }}
@@ -37,4 +29,3 @@
 \@writefile{toc}{\contentsline {subsection}{\numberline {1.1.1}Chapitres}{5}{subsection.1.1.1}}
 \@writefile{toc}{\contentsline {subsection}{\numberline {1.1.2}Images}{5}{subsection.1.1.2}}
 \@writefile{lof}{\contentsline {figure}{\numberline {1.1}{\ignorespaces Exemple d'insertion d'image simple.}}{6}{figure.1.1}}
->>>>>>> upstream/5.0.7+svn391
diff --git a/doc/Cecilia5_manuel.log b/doc/Cecilia5_manuel.log
index 160e3e2..3a0aff2 100644
--- a/doc/Cecilia5_manuel.log
+++ b/doc/Cecilia5_manuel.log
@@ -1,17 +1,3 @@
-<<<<<<< HEAD
-This is pdfTeX, Version 3.1415926-2.4-1.40.13 (TeX Live 2012/Debian) (format=latex 2013.2.5)  8 FEB 2013 14:20
-entering extended mode
- restricted \write18 enabled.
- %&-line parsing enabled.
-**\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCo
-de"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.
-{\g at addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\
-documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname
- tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{
-\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode xhtml,ooffice.a.b.c.\input 
- Cecilia5_manuel.tex
-(./Cecilia5_manuel.tex (/usr/share/texlive/texmf-dist/tex/latex/base/book.cls
-=======
 This is pdfTeX, Version 3.1415926-2.4-1.40.13 (TeX Live 2012/Debian) (format=pdflatex 2013.2.5)  7 FEB 2013 16:44
 entering extended mode
  restricted \write18 enabled.
@@ -22,7 +8,6 @@ LaTeX2e <2011/06/27>
 Babel <v3.8m> and hyphenation patterns for english, dumylang, nohyphenation, lo
 aded.
 (/usr/share/texlive/texmf-dist/tex/latex/base/book.cls
->>>>>>> upstream/5.0.7+svn391
 Document Class: book 2007/10/19 v1.4h Standard LaTeX document class
 (/usr/share/texlive/texmf-dist/tex/latex/base/bk11.clo
 File: bk11.clo 2007/10/19 v1.4h Standard LaTeX file (size option)
@@ -40,33 +25,12 @@ File: bk11.clo 2007/10/19 v1.4h Standard LaTeX file (size option)
 \belowcaptionskip=\skip42
 \bibindent=\dimen102
 )
-<<<<<<< HEAD
-(/usr/share/texmf/tex/generic/tex4ht/tex4ht.sty
-version 2008-10-27-17:23
-Package: tex4ht 
---------------------------------------
---- Note --- for _ at preamble, use the command line option `early_'
---------------------------------------
---------------------------------------
---- Note --- for ^ at preamble, use the command line option `early^'
---------------------------------------
-\tmp:toks=\toks14
-)
-(/usr/share/texmf/tex/generic/tex4ht/usepackage.4ht
-version 2009-05-21-09:32
-)
-=======
->>>>>>> upstream/5.0.7+svn391
 (/usr/share/texlive/texmf-dist/tex/latex/amsfonts/amssymb.sty
 Package: amssymb 2009/06/22 v3.00
 
 (/usr/share/texlive/texmf-dist/tex/latex/amsfonts/amsfonts.sty
 Package: amsfonts 2009/06/22 v3.00 Basic AMSFonts support
-<<<<<<< HEAD
-\@emptytoks=\toks15
-=======
 \@emptytoks=\toks14
->>>>>>> upstream/5.0.7+svn391
 \symAMSa=\mathgroup4
 \symAMSb=\mathgroup5
 LaTeX Font Info:    Overwriting math alphabet `\mathfrak' in version `bold'
@@ -82,11 +46,7 @@ Package: amstext 2000/06/29 v2.01
 
 (/usr/share/texlive/texmf-dist/tex/latex/amsmath/amsgen.sty
 File: amsgen.sty 1999/11/30 v2.0
-<<<<<<< HEAD
-\@emptytoks=\toks16
-=======
 \@emptytoks=\toks15
->>>>>>> upstream/5.0.7+svn391
 \ex@=\dimen103
 ))
 (/usr/share/texlive/texmf-dist/tex/latex/amsmath/amsbsy.sty
@@ -116,36 +76,21 @@ LaTeX Font Info:    Redeclaring font encoding OMS on input line 568.
 \dotsspace@=\muskip10
 \c at parentequation=\count95
 \dspbrk at lvl=\count96
-<<<<<<< HEAD
-\tag at help=\toks17
-\row@=\count97
-\column@=\count98
-\maxfields@=\count99
-\andhelp@=\toks18
-=======
 \tag at help=\toks16
 \row@=\count97
 \column@=\count98
 \maxfields@=\count99
 \andhelp@=\toks17
->>>>>>> upstream/5.0.7+svn391
 \eqnshift@=\dimen106
 \alignsep@=\dimen107
 \tagshift@=\dimen108
 \tagwidth@=\dimen109
 \totwidth@=\dimen110
 \lineht@=\dimen111
-<<<<<<< HEAD
-\@envbody=\toks19
-\multlinegap=\skip44
-\multlinetaggap=\skip45
-\mathdisplay at stack=\toks20
-=======
 \@envbody=\toks18
 \multlinegap=\skip44
 \multlinetaggap=\skip45
 \mathdisplay at stack=\toks19
->>>>>>> upstream/5.0.7+svn391
 LaTeX Info: Redefining \[ on input line 2666.
 LaTeX Info: Redefining \] on input line 2667.
 )
@@ -157,11 +102,7 @@ Package: graphicx 1999/02/16 v1.0f Enhanced LaTeX Graphics (DPC,SPQR)
 
 (/usr/share/texlive/texmf-dist/tex/latex/graphics/keyval.sty
 Package: keyval 1999/03/16 v1.13 key=value parser (DPC)
-<<<<<<< HEAD
-\KV at toks@=\toks21
-=======
 \KV at toks@=\toks20
->>>>>>> upstream/5.0.7+svn391
 )
 (/usr/share/texlive/texmf-dist/tex/latex/graphics/graphics.sty
 Package: graphics 2009/02/05 v1.0o Standard LaTeX Graphics (DPC,SPQR)
@@ -172,12 +113,6 @@ Package: trig 1999/03/16 v1.09 sin cos tan (DPC)
 (/usr/share/texlive/texmf-dist/tex/latex/latexconfig/graphics.cfg
 File: graphics.cfg 2010/04/23 v1.9 graphics configuration of TeX Live
 )
-<<<<<<< HEAD
-Package graphics Info: Driver file: dvips.def on input line 91.
-
-(/usr/share/texlive/texmf-dist/tex/latex/graphics/dvips.def
-File: dvips.def 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
-=======
 Package graphics Info: Driver file: pdftex.def on input line 91.
 
 (/usr/share/texlive/texmf-dist/tex/latex/pdftex-def/pdftex.def
@@ -190,7 +125,6 @@ Package: infwarerr 2010/04/08 v1.3 Providing info/warning/error messages (HO)
 Package: ltxcmds 2011/11/09 v1.22 LaTeX kernel commands for general use (HO)
 )
 \Gread at gobject=\count100
->>>>>>> upstream/5.0.7+svn391
 ))
 \Gin at req@height=\dimen112
 \Gin at req@width=\dimen113
@@ -200,13 +134,8 @@ Package: ltxcmds 2011/11/09 v1.22 LaTeX kernel commands for general use (HO)
 )
 (/usr/share/texlive/texmf-dist/tex/latex/base/inputenc.sty
 Package: inputenc 2008/03/30 v1.1d Input encoding file
-<<<<<<< HEAD
-\inpenc at prehook=\toks22
-\inpenc at posthook=\toks23
-=======
 \inpenc at prehook=\toks21
 \inpenc at posthook=\toks22
->>>>>>> upstream/5.0.7+svn391
 
 (/usr/share/texlive/texmf-dist/tex/latex/base/utf8.def
 File: utf8.def 2008/04/05 v1.1m UTF-8 support for inputenc
@@ -428,11 +357,7 @@ Language: frenchb 2010/08/21 v2.5a French support from the babel system
 
 (/usr/share/texlive/texmf-dist/tex/generic/babel/babel.def
 File: babel.def 2008/07/08 v3.8m Babel common definitions
-<<<<<<< HEAD
-\babel at savecnt=\count100
-=======
 \babel at savecnt=\count101
->>>>>>> upstream/5.0.7+svn391
 \U at D=\dimen116
 )
 
@@ -446,13 +371,8 @@ Package babel Info: Making ; an active character on input line 235.
 Package babel Info: Making ! an active character on input line 236.
 Package babel Info: Making ? an active character on input line 237.
 \FB at Mht=\dimen117
-<<<<<<< HEAD
-\std at mcc=\count101
-\dec at mcc=\count102
-=======
 \std at mcc=\count102
 \dec at mcc=\count103
->>>>>>> upstream/5.0.7+svn391
 \parindentFFN=\dimen118
 *************************************
 * Local config file frenchb.cfg used
@@ -463,19 +383,6 @@ Language: frenchb 2010/08/21 v2.5a French support from the babel system
 ))
 (/usr/share/texlive/texmf-dist/tex/latex/carlisle/scalefnt.sty)
 (/usr/share/texlive/texmf-dist/tex/latex/listings/listings.sty
-<<<<<<< HEAD
-\lst at mode=\count103
-\lst at gtempboxa=\box28
-\lst at token=\toks24
-\lst at length=\count104
-\lst at currlwidth=\dimen119
-\lst at column=\count105
-\lst at pos=\count106
-\lst at lostspace=\dimen120
-\lst at width=\dimen121
-\lst at newlines=\count107
-\lst at lineno=\count108
-=======
 \lst at mode=\count104
 \lst at gtempboxa=\box28
 \lst at token=\toks23
@@ -487,18 +394,12 @@ Language: frenchb 2010/08/21 v2.5a French support from the babel system
 \lst at width=\dimen121
 \lst at newlines=\count108
 \lst at lineno=\count109
->>>>>>> upstream/5.0.7+svn391
 \lst at maxwidth=\dimen122
 
 (/usr/share/texlive/texmf-dist/tex/latex/listings/lstmisc.sty
 File: lstmisc.sty 2007/02/22 1.4 (Carsten Heinz)
-<<<<<<< HEAD
-\c at lstnumber=\count109
-\lst at skipnumbers=\count110
-=======
 \c at lstnumber=\count110
 \lst at skipnumbers=\count111
->>>>>>> upstream/5.0.7+svn391
 \lst at framebox=\box29
 )
 (/usr/share/texlive/texmf-dist/tex/latex/listings/listings.cfg
@@ -512,16 +413,8 @@ Package: color 2005/11/14 v1.0j Standard LaTeX Color (DPC)
 (/usr/share/texlive/texmf-dist/tex/latex/latexconfig/color.cfg
 File: color.cfg 2007/01/18 v1.5 color configuration of teTeX/TeXLive
 )
-<<<<<<< HEAD
-Package color Info: Driver file: dvips.def on input line 130.
-
-(/usr/share/texlive/texmf-dist/tex/latex/graphics/dvipsnam.def
-File: dvipsnam.def 1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)
-))
-=======
 Package color Info: Driver file: pdftex.def on input line 130.
 )
->>>>>>> upstream/5.0.7+svn391
 (/usr/share/texlive/texmf-dist/tex/latex/hyperref/hyperref.sty
 Package: hyperref 2012/05/13 v6.82q Hypertext links for LaTeX
 
@@ -532,24 +425,15 @@ Package: hobsub-hyperref 2012/05/28 v1.13 Bundle oberdiek, subset hyperref (HO)
 (/usr/share/texlive/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty
 Package: hobsub-generic 2012/05/28 v1.13 Bundle oberdiek, subset generic (HO)
 Package: hobsub 2012/05/28 v1.13 Construct package bundles (HO)
-<<<<<<< HEAD
-Package: infwarerr 2010/04/08 v1.3 Providing info/warning/error messages (HO)
-Package: ltxcmds 2011/11/09 v1.22 LaTeX kernel commands for general use (HO)
-=======
 Package hobsub Info: Skipping package `infwarerr' (already loaded).
 Package hobsub Info: Skipping package `ltxcmds' (already loaded).
->>>>>>> upstream/5.0.7+svn391
 Package: ifluatex 2010/03/01 v1.3 Provides the ifluatex switch (HO)
 Package ifluatex Info: LuaTeX not detected.
 Package: ifvtex 2010/03/01 v1.5 Detect VTeX and its facilities (HO)
 Package ifvtex Info: VTeX not detected.
 Package: intcalc 2007/09/27 v1.1 Expandable calculations with integers (HO)
 Package: ifpdf 2011/01/30 v2.3 Provides the ifpdf switch (HO)
-<<<<<<< HEAD
-Package ifpdf Info: pdfTeX in PDF mode is not detected.
-=======
 Package ifpdf Info: pdfTeX in PDF mode is detected.
->>>>>>> upstream/5.0.7+svn391
 Package: etexcmds 2011/02/16 v1.5 Avoid name clashes with e-TeX commands (HO)
 Package etexcmds Info: Could not find \expanded.
 (etexcmds)             That can mean that you are not using pdfTeX 1.50 or
@@ -562,11 +446,7 @@ Package: pdftexcmds 2011/11/29 v0.20 Utility functions of pdfTeX for LuaTeX (HO
 Package pdftexcmds Info: LuaTeX not detected.
 Package pdftexcmds Info: \pdf at primitive is available.
 Package pdftexcmds Info: \pdf at ifprimitive is available.
-<<<<<<< HEAD
-Package pdftexcmds Info: \pdfdraftmode is ignored in DVI mode.
-=======
 Package pdftexcmds Info: \pdfdraftmode found.
->>>>>>> upstream/5.0.7+svn391
 Package: pdfescape 2011/11/25 v1.13 Implements pdfTeX's escape features (HO)
 Package: bigintcalc 2012/04/08 v1.3 Expandable calculations on big integers (HO
 )
@@ -590,33 +470,19 @@ Package: ifxetex 2010/09/12 v0.6 Provides ifxetex conditional
 Package: kvoptions 2011/06/30 v3.11 Key value format for package options (HO)
 )
 \@linkdim=\dimen123
-<<<<<<< HEAD
-\Hy at linkcounter=\count111
-\Hy at pagecounter=\count112
-=======
 \Hy at linkcounter=\count112
 \Hy at pagecounter=\count113
->>>>>>> upstream/5.0.7+svn391
 
 (/usr/share/texlive/texmf-dist/tex/latex/hyperref/pd1enc.def
 File: pd1enc.def 2012/05/13 v6.82q Hyperref: PDFDocEncoding definition (HO)
 Now handling font encoding PD1 ...
 ... no UTF-8 mapping file for font encoding PD1
 )
-<<<<<<< HEAD
-\Hy at SavedSpaceFactor=\count113
-=======
 \Hy at SavedSpaceFactor=\count114
->>>>>>> upstream/5.0.7+svn391
 
 (/usr/share/texlive/texmf-dist/tex/latex/latexconfig/hyperref.cfg
 File: hyperref.cfg 2002/06/06 v1.2 hyperref configuration of TeXLive
 )
-<<<<<<< HEAD
-Package hyperref Info: Option `colorlinks' set `true' on input line 3941.
-
-=======
->>>>>>> upstream/5.0.7+svn391
 
 Package hyperref Warning: Invalid value `0'
 (hyperref)                for option `pdfborder'.
@@ -629,53 +495,24 @@ Package hyperref Info: Plain pages OFF on input line 4077.
 Package hyperref Info: Backreferencing OFF on input line 4082.
 Package hyperref Info: Implicit mode ON; LaTeX internals redefined.
 Package hyperref Info: Bookmarks ON on input line 4300.
-<<<<<<< HEAD
-\c at Hy@tempcnt=\count114
-=======
 \c at Hy@tempcnt=\count115
->>>>>>> upstream/5.0.7+svn391
 (/usr/share/texlive/texmf-dist/tex/latex/url/url.sty
 \Urlmuskip=\muskip11
 Package: url 2006/04/12  ver 3.3  Verb mode for urls, etc.
 )
 LaTeX Info: Redefining \url on input line 4653.
-<<<<<<< HEAD
-\Fld at menulength=\count115
-\Field at Width=\dimen124
-\Fld at charsize=\dimen125
-\Field at toks=\toks25
-=======
 \Fld at menulength=\count116
 \Field at Width=\dimen124
 \Fld at charsize=\dimen125
->>>>>>> upstream/5.0.7+svn391
 Package hyperref Info: Hyper figures OFF on input line 5773.
 Package hyperref Info: Link nesting OFF on input line 5778.
 Package hyperref Info: Hyper index ON on input line 5781.
 Package hyperref Info: backreferencing OFF on input line 5788.
-<<<<<<< HEAD
-Package hyperref Info: Link coloring ON on input line 5791.
-=======
 Package hyperref Info: Link coloring OFF on input line 5793.
->>>>>>> upstream/5.0.7+svn391
 Package hyperref Info: Link coloring with OCG OFF on input line 5798.
 Package hyperref Info: PDF/A mode OFF on input line 5803.
 LaTeX Info: Redefining \ref on input line 5843.
 LaTeX Info: Redefining \pageref on input line 5847.
-<<<<<<< HEAD
-\Hy at abspage=\count116
-
-
-Package hyperref Message: Stopped early.
-
-)
-
-Package hyperref Message: Driver: htex4ht.
-
-(/usr/share/texlive/texmf-dist/tex/latex/hyperref/htex4ht.def
-File: htex4ht.def 2012/05/13 v6.82q Hyperref driver for TeX4ht
-Package hyperref Info: tex4ht is already loaded.
-=======
 \Hy at abspage=\count117
 \c at Item=\count118
 \c at Hfootnote=\count119
@@ -694,563 +531,11 @@ Package uniquecounter Info: New unique counter `rerunfilecheck' on input line 2
 82.
 )
 \Hy at SectionHShift=\skip46
->>>>>>> upstream/5.0.7+svn391
 )
 Package hyperref Info: Option `colorlinks' set `true' on input line 17.
 Package color Info: Redefining color green on input line 27.
 
-<<<<<<< HEAD
-(/usr/share/texmf/tex/generic/tex4ht/tex4ht.4ht
-version 2009-01-07-07:11
---------------------------------------
---- Note --- for additional information, use the command line option `info'
---------------------------------------
-
-::::::::::::::::::::::::::::::::::::::::::
- TeX4ht info is available in the log file 
-::::::::::::::::::::::::::::::::::::::::::
-) (/usr/share/texmf/tex/generic/tex4ht/tex4ht.sty
-version 2008-10-27-17:23
-
---- needs --- tex4ht Cecilia5_manuel ---
-\tmp:cnt=\count117
-\openout15 = `Cecilia5_manuel.tmp'.
-
-(./Cecilia5_manuel.tmp)
-\tmp:dim=\skip46
- (./Cecilia5_manuel.xref)
-\:refout=\write3
-\openout3 = `Cecilia5_manuel.xref'.
-
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-)
---------------------------------------
---- Note --- for marking of the base font, use the command line option `fonts+'
-
---------------------------------------
---------------------------------------
---- Note --- for non active _, use the command line option `no_'
---------------------------------------
---------------------------------------
---- Note --- for _ of catcode 13, use the command line option `_13'
---------------------------------------
---------------------------------------
---- Note --- for non active ^, use the command line option `no^'
---------------------------------------
---------------------------------------
---- Note --- for ^ of catcode 13, use the command line option `^13'
---------------------------------------
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
---------------------------------------
---- Note --- for end notes instead of footnotes, use the command line option `e
-ndnotes'
---------------------------------------
---------------------------------------
---- Note --- to request links from the tables of contents, use the command line
- option from `TocLink'
---------------------------------------
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-)
-\:tokwrite=\toks26
-\:tokpage=\toks27
---------------------------------------
---- Note --- for back links to toc, use the command line option `sections+'
---------------------------------------
---------------------------------------
---- Note --- for linear crosslinks of pages, use the command line option `next'
-
---------------------------------------
-\openout15 = `Cecilia5_manuel.4ct'.
-
-\:tocout=\write4
-\openout4 = `Cecilia5_manuel.4tc'.
-
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/latex.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
---------------------------------------
---- Note --- for enumerated list elements with valued data, use the command lin
-e option `enumerate+'
---------------------------------------
---------------------------------------
---- Note --- to hide clickable index and bibliography references use the comman
-d line option `hidden-ref'
---------------------------------------
-\tmp:bx=\box30
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
---------------------------------------
---- Note --- for tab-based layoutof equation environment use the command line o
-ption `tab-eq'
---------------------------------------
-))
-(/usr/share/texmf/tex/generic/tex4ht/fontmath.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
- [1
-
-]
-LaTeX Font Info:    Try loading font information for U+msa on input line 1375.
-
-(/usr/share/texlive/texmf-dist/tex/latex/amsfonts/umsa.fd
-File: umsa.fd 2009/06/22 v3.00 AMS symbols A
-)
-LaTeX Font Info:    Try loading font information for U+msb on input line 1375.
-
-(/usr/share/texlive/texmf-dist/tex/latex/amsfonts/umsb.fd
-File: umsb.fd 2009/06/22 v3.00 AMS symbols B
-) [2] [3] [4] [5]
-[6] [7] [8] [9] [10] [11] [12] [13] [14] [15] [16] [17] [18] [19] [20] [21]
-[22] [23] [24] [25] [26] [27] [28] [29] [30] [31] [32] [33] [34] [35] [36]
-[37] [38] [39] [40] [41] [42] [43] [44] [45] [46] [47] [48]
---------------------------------------
---- Note --- for sources failing to produce clean mathml code, try the command 
-line option `mathml-'
---------------------------------------
- [49] [50] [51]
-[52] [53]) (/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/book.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
---------------------------------------
---- Note --- for a degraded bibliography friendlier for conversion to .doc, use
- the command line option `bib-'
---------------------------------------
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/amssymb.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
- [54] [55] [56] [57] [58]
-[59] [60] [61] [62] [63] [64] [65] [66] [67] [68] [69] [70] [71] [72] [73]
-[74] [75] [76] [77] [78] [79] [80] [81] [82] [83] [84] [85] [86] [87] [88]
-[89] [90] [91] [92] [93] [94] [95] [96] [97] [98] [99] [100] [101] [102]
-[103] [104] [105] [106] [107] [108] [109] [110] [111] [112] [113] [114]
-[115] [116] [117] [118] [119] [120] [121] [122] [123] [124] [125] [126]
-[127] [128] [129] [130] [131] [132] [133] [134] [135] [136] [137] [138]
-[139] [140] [141] [142] [143] [144] [145] [146] [147] [148] [149] [150]
-[151] [152] [153] [154] [155] [156] [157] [158] [159] [160] [161] [162]
-[163] [164] [165] [166] [167] [168] [169] [170] [171] [172] [173] [174]
-[175] [176] [177] [178] [179] [180] [181] [182] [183] [184] [185] [186]
-[187] [188] [189] [190] [191] [192] [193] [194] [195] [196] [197] [198]
-[199] [200] [201] [202] [203] [204] [205] [206] [207] [208] [209] [210]
-[211] [212] [213] [214] [215] [216] [217] [218] [219] [220] [221] [222]
-[223] [224] [225] [226] [227] [228] [229] [230] [231] [232] [233] [234]
-[235] [236] [237] [238] [239] [240] [241] [242] [243] [244] [245] [246]
-[247] [248] [249] [250] [251] [252] [253] [254] [255] [256] [257])
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/amsfonts.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/amsmath.4ht
-version 2009-05-21-09:32
-\tmp:muskip=\muskip12
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
---------------------------------------
---- Note --- for tab-based layout of equation environment use the command line 
-option `tab-eq'
---------------------------------------
-))
-(/usr/share/texmf/tex/generic/tex4ht/amstext.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/amsbsy.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/amsopn.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/epsfig.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/graphicx.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/graphics.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/dvips.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/inputenc.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/utf8.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/babel.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/frenchb.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/listings.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
---------------------------------------
---- Note --- to ensure proper alignments use fixed size fonts (see listings.dtx
-)
---------------------------------------
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/color.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/dvipsnam.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texlive/texmf-dist/tex/latex/graphics/dvipsnam.def)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/hyperref.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texlive/texmf-dist/tex/latex/hyperref/nameref.sty
-Package: nameref 2010/04/30 v2.40 Cross-referencing by name of section
-
-(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/gettitlestring.sty
-Package: gettitlestring 2010/12/03 v1.4 Cleanup title references (HO)
-)
-\c at section@level=\count118
-)
-(/usr/share/texmf/tex/generic/tex4ht/nameref.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-LaTeX Info: Redefining \autoref on input line 99.
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/pd1enc.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/url.4ht
-version 2009-05-21-09:32
-
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
---------------------------------------
---- Note --- for URL encoding within href use the command line option `url-enc'
-; for hyperlink-less entry use the command line option `url-'
---------------------------------------
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-))
-(/usr/share/texmf/tex/generic/tex4ht/ooffice.4ht
-version 2009-06-11-09:32
-)
-(/usr/share/texmf/tex/generic/tex4ht/unicode.4ht
-version 2009-02-23-20:45
-)
-(/usr/share/texmf/tex/generic/tex4ht/mathml.4ht
-version 2009-04-18-11:08
-)
-(/usr/share/texmf/tex/generic/tex4ht/ooffice-mml.4ht
-version 2009-06-11-09:32
-)) (./Cecilia5_manuel.aux)
-=======
 No file Cecilia5_manuel.aux.
->>>>>>> upstream/5.0.7+svn391
 \openout1 = `Cecilia5_manuel.aux'.
 
 LaTeX Font Info:    Checking defaults for OML/cmm/m/it on input line 104.
@@ -1267,18 +552,6 @@ LaTeX Font Info:    Checking defaults for U/cmr/m/n on input line 104.
 LaTeX Font Info:    ... okay on input line 104.
 LaTeX Font Info:    Checking defaults for PD1/pdf/m/n on input line 104.
 LaTeX Font Info:    ... okay on input line 104.
-<<<<<<< HEAD
-LaTeX Info: Redefining \degres on input line 104.
-
-
-Package frenchb.ldf Warning: The definition of \@makecaption has been changed,
-(frenchb.ldf)                frenchb will NOT customise it;
-(frenchb.ldf)                reported on input line 104.
-
-LaTeX Info: Redefining \dots on input line 104.
-LaTeX Info: Redefining \up on input line 104.
-
-=======
 (/usr/share/texlive/texmf-dist/tex/context/base/supp-pdf.mkii
 [Loading MPS to PDF converter (version 2006.09.02).]
 \scratchcounter=\count122
@@ -1312,37 +585,10 @@ LaTeX Info: Redefining \dots on input line 104.
 LaTeX Info: Redefining \up on input line 104.
 
 
->>>>>>> upstream/5.0.7+svn391
 Package frenchb.ldf Warning: OT1 encoding should not be used for French. 
 (frenchb.ldf)                Add \usepackage[T1]{fontenc} to the preamble
 (frenchb.ldf)                of your document, on input line 104.
 
-<<<<<<< HEAD
-\c at lstlisting=\count119
-\AtBeginShipoutBox=\box31
-Package hyperref Info: Link coloring ON on input line 104.
-LaTeX Info: Redefining \ref on input line 104.
-LaTeX Info: Redefining \pageref on input line 104.
-LaTeX Info: Redefining \nameref on input line 104.
-[1] [2
-
-] [3] [1] (./Cecilia5_manuel.4ct) [2]
-Chapitre 1.
-(./chapitres/template.tex [3
-
-] [4] [5] [6] [7
-
-]
-
-! LaTeX Error: File `images/template/preferences' not found.
-
-See the LaTeX manual or LaTeX Companion for explanation.
-Type  H <return>  for immediate help.
- ...                                              
-                                                  
-l.43 ...nces}{Exemple d'insertion d'image simple.}
-                                                  
-=======
 \c at lstlisting=\count128
 \AtBeginShipoutBox=\box31
 Package hyperref Info: Link coloring ON on input line 104.
@@ -1428,30 +674,10 @@ Type  H <return>  for immediate help.
                                                   
 l.116 \section{PrŽsentation}
                             
->>>>>>> upstream/5.0.7+svn391
 ? 
 ! Emergency stop.
  ...                                              
                                                   
-<<<<<<< HEAD
-l.43 ...nces}{Exemple d'insertion d'image simple.}
-                                                  
-I could not locate the file with any of these extensions:
-.eps,.ps,.eps.gz,.ps.gz,.eps.Z
-Try typing  <return>  to proceed.
-If that doesn't work, type  X <return>  to quit.
-
- 
-Here is how much of TeX's memory you used:
- 12445 strings out of 495060
- 167449 string characters out of 3182054
- 401372 words of memory out of 3000000
- 15221 multiletter control sequences out of 15000+200000
- 13982 words of font info for 52 fonts, out of 3000000 for 9000
- 14 hyphenation exceptions out of 8191
- 37i,6n,38p,2978b,556s stack positions out of 5000i,500n,10000p,200000b,50000s
-Output written on Cecilia5_manuel.dvi (267 pages, 85848 bytes).
-=======
 l.116 \section{PrŽsentation}
                             
 You need to provide a definition with \DeclareInputText 
@@ -1467,4 +693,3 @@ Here is how much of TeX's memory you used:
  14 hyphenation exceptions out of 8191
  34i,8n,32p,2505b,388s stack positions out of 5000i,500n,10000p,200000b,50000s
 !  ==> Fatal error occurred, no output PDF file produced!
->>>>>>> upstream/5.0.7+svn391

-- 
cecilia packaging



More information about the pkg-multimedia-commits mailing list