X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.h;h=c05af76d54b70525635be5d6e8db8ef9bb0404d6;hb=e5a46922e916a06ad1b958d5895cc3cfb4f13d2c;hp=036a8efbca8b1ac0e6b62fc31cb466cfb0c89091;hpb=3d10165536ede2f20d690cd99990f440618525ac;p=lyx.git

diff --git a/src/bufferparams.h b/src/bufferparams.h
index 036a8efbca..c05af76d54 100644
--- a/src/bufferparams.h
+++ b/src/bufferparams.h
@@ -178,12 +178,18 @@ public:
 	BranchList const & branchlist() const;
 	/**
 	 * The input encoding for LaTeX. This can be one of
-	 * - auto: find out the input encoding from the used languages
-	 * - default: Don't load the inputenc package and hope that it will
-	 *   work (unlikely)
+	 * - \c auto: find out the input encoding from the used languages
+	 * - \c default: ditto
 	 * - any encoding supported by the inputenc package
 	 * The encoding of the LyX file is always utf8 and has nothing to
 	 * do with this setting.
+	 * The difference between \c auto and \c default is that \c auto also
+	 * causes loading of the inputenc package, while \c default does not.
+	 * \c default will not work unless the user takes additional measures
+	 * (such as using special environments like the CJK environment from
+	 * CJK.sty).
+	 * \c default can be seen as an unspecified 8bit encoding, since LyX
+	 * does not interpret it in any way apart from display on screen.
 	 */
 	std::string inputenc;
 	/// The main encoding used by this buffer for LaTeX output.
@@ -265,7 +271,7 @@ public:
 	///
 	std::string const babelCall(std::string const & lang_opts) const;
 	/// set up the document fonts
-	std::string const loadFonts(LaTeXFeatures & features, std::string const & rm,
+	std::string const loadFonts(std::string const & rm,
 				     std::string const & sf, std::string const & tt,
 				     bool const & sc, bool const & osf,
 				     int const & sfscale, int const & ttscale) const;