[xml/sgml-commit] [SCM] linuxdoc-tools package for Debian. branch, master, updated. debian/0.9.51-16-g264d63e

[Agustin Martin Domingo]

The following commit has been merged in the master branch:
commit 81f05d80f546361604ee5a0ba1ed33597216843c
Author: Agustin Martin Domingo <agmartin at debian.org>
Date:   Wed Jun 11 21:40:50 2008 +0200

    Changes to use more texinfo elements. Some cleanup
    
    * Use @quotation
    * Use @emph, @strong and @sc
    * Use @uref
    * Added nidx and ncdx, just to be ignored in the info backend

diff --git a/lib/dist/linuxdoc-tools/info/mapping b/lib/dist/linuxdoc-tools/info/mapping
index 6b7e7f9..bfbb843 100644
--- a/lib/dist/linuxdoc-tools/info/mapping
+++ b/lib/dist/linuxdoc-tools/info/mapping
@@ -1,7 +1,6 @@
-
 % qwertz to texinfo replacement file
 
-<qwertz>	+     
+<qwertz>	+
 </qwertz>	+
 
 <article>	+ "\\input texinfo\n"	+
@@ -11,7 +10,7 @@
 </dina4>
 
 % Manual Pages are expected to be formatted using nroff (or groff), unless
-% they are included  as sections of other qwertz documents.  
+% they are included  as sections of other qwertz documents.
 
 <manpage>
 </manpage>
@@ -21,15 +20,15 @@
 </titlepag>	+
 
 <title>		+	"@title "
-</title>	
+</title>
 
 <subtitle>	+	"@subtitle "
-</subtitle>	
+</subtitle>
 
 <author>	+	"@author "
 </author>
 
-<name>		
+<name>
 </name>
 
 <and>			" and "
@@ -43,7 +42,7 @@
 </inst>
 
 <date>		+	"@subtitle "
-</date>		
+</date>
 
 <newline>		"@*"
 </newline>
@@ -52,7 +51,7 @@
 </label>	+
 
 <header>	+	"@c %% "
-</header>	
+</header>
 
 <lhead>			"{"
 </lhead>		"}"
@@ -63,7 +62,7 @@
 <comment>	+	"@example"		+
 </comment>	+	"@end example"		+
 
-<abstract>	+	"\n\n"	
+<abstract>	+	"\n\n"
 </abstract>	 	""	+
 
 <appendix>	+	"\n at appendix "
@@ -94,22 +93,24 @@
 </sect4>	+       "@ENDSUB"		+
 
 <heading>		""
-</heading>		"\n\n" 
+</heading>		"\n\n"
 
-<p>		
+<p>
 </p>			"\n\n"
 
+% ------------ List environments -----------------
+
 <itemize>	+	"@itemize @bullet"	+
-</itemize>	+	"@end itemize"	+
+</itemize>	+	"@end itemize"		+
 
-<enum>		+	"@enumerate"	+
+<enum>		+	"@enumerate"		+
 </enum>		+	"@end enumerate"	+
 
-<list>		+	"\\begin{list}{}{}\n"     +
-</list>		+	"\\end{list}"		+
+<list>		+	"@itemize"     		+
+</list>		+	"@end itemize"		+
 
-<descrip>	+	"@table @code"	+
-</descrip>	+	"@end table"	+
+<descrip>	+	"@table @code"		+
+</descrip>	+	"@end table"		+
 
 <item>		+	"@item\n"
 </item>
@@ -117,23 +118,27 @@
 <tag>		+	"@item "
 </tag>			"\n"
 
+% ------------
+
 <cite>			"\\cite{[ID]"
 </cite>			"}"
 
 <ncite>			"\\cite\[[NOTE]\]{[ID]"
 </ncite>		"}"
 
-% <idx>	                "\\idx{"
-% </idx>                  "}"
-% 
-% <cdx>			"\\cdx{"
-% </cdx>			"}"
+% -- index commands are ignored for non LaTeX backends --
+
+<idx>
+</idx>
 
-<idx>			
-</idx>			
+<cdx>
+</cdx>
 
-<cdx>				
-</cdx>			
+<nidx>
+</nidx>
+
+<ncdx>
+</ncdx>
 
 % The idea here is to automatically insert soft hyphens after every slash in
 % the filename, so long filenames will break naturally.  The url{} macro is
@@ -141,20 +146,23 @@
 <file>			"\\url{"
 </file>			"}"
 
-<footnote>		"\\footnote{"
+<footnote>		"@footnote{"
 </footnote>		"}"
 
 <sq>			"``"
 </sq>			"''"
 
-<lq>		+	"\\begin{quotation}\n"	+
-</lq>		+	"\n\\end{quotation}\n\n"	+
+<lq>		+       "@quotation"    	+
+</lq>	        +       "@end quotation" 	+
+
+<em>		 	"@emph{"
+</em>			"}"
 
-<em>		 	"`"
-</em>			"'"
+<bf>			"@strong{"
+</bf>			"}"
 
-<bf>			"`"
-</bf>			"'"
+<sc>			"@sc{"
+</sc>			"}"
 
 <it>			"`"
 </it>			"'"
@@ -175,16 +183,16 @@
 <cparam>		"\\cparam{"
 </cparam>		"}"
 
-<ref>		+	"@REF [ID]"	+
+<ref>		+	"@REF [ID]"		+
 </ref>
 
 <pageref>		"@REF [ID]"
 </pageref>
 
-<x>	
+<x>
 </x>
 
-<mc>			
+<mc>
 </mc>
 
 <biblio>
@@ -225,19 +233,19 @@
 <thtag>			"\["
 </thtag>		"\]"			+
 
-% mathematics 
+% mathematics
 
 <f>			"$"
 </f>			"$"
 
-<dm>		+	"\\\["	
+<dm>		+	"\\\["
 </dm>			"\\\]"  +
 
 <eq>		+	"\\begin{equation}"	+
 </eq>		+	"\\end{equation}\n"	+
 
 <fr>			"\\frac"
-</fr>		
+</fr>
 
 <nu>			"{"
 </nu>			"}"
@@ -245,7 +253,7 @@
 <de>			"{"
 </de>			"}"
 
-<lim>			
+<lim>
 </lim>
 
 <op>
@@ -267,7 +275,7 @@
 </in>
 
 <sum>			"\\sum"
-</sum>		
+</sum>
 
 <root>			"\\sqrt\[[n]\]{"
 </root>			"}"
@@ -315,11 +323,11 @@
 % </figure>	+	"\\end{figure}\n"		+
 
 % <eps>		+   	"\\centerline{\\epsffile{[FILE].ps}}"  +
-% </eps>                	
-            	
+% </eps>
+
 
 % <ph>		+	"\\vspace{[VSPACE]}\n\\par"	+
-% </ph>	
+% </ph>
 
 % <caption>	+	"\\caption{"
 % </caption>		"}" 	+
@@ -342,7 +350,7 @@
 % </rowsep>
 
 <rowsep>		" @*\n"	+
-</rowsep>		
+</rowsep>
 
 % <colsep>		"& "
 % </colsep>
@@ -356,10 +364,10 @@
 % <hline>		+	"\\hline"	+
 % </hline>
 
-<url>                  "[NAME] ([URL])"
+<url>                  "@uref{[URL],[NAME]}"
 </url>
 
-<htmlurl>              "[NAME]"
+<htmlurl>              "@uref{[NAME]}"
 </htmlurl>
 
 % end of texinfo replacement file

-- 
linuxdoc-tools package for Debian.