*** empty log message ***

[m17n/m17n-lib.git] / src / fontset.c

diff --git a/src/fontset.c b/src/fontset.c
index fee964b..917cb44 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the m17n library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    02111-1307, USA.  */
 
 /***en
@@ -749,10 +749,8 @@ mfont__lookup_fontset (MRealizedFontset *realized, MGlyph *g, int *num,
       MFont request = realized->request;
 
       if (script != Mlatin)
-       /* These are not appropriate for non-Latin scripts.  */
-       request.property[MFONT_FOUNDRY]
-         = request.property[MFONT_FAMILY]
-         = request.property[MFONT_REGISTRY] = 0;
+       /* This is not appropriate for non-Latin scripts.  */
+       request.property[MFONT_REGISTRY] = 0;
 
       per_script = mplist_get (realized->per_script, script);
       if (! per_script)
@@ -775,7 +773,7 @@ mfont__lookup_fontset (MRealizedFontset *realized, MGlyph *g, int *num,
                                      g, num, size)))
        return rfont;
 
-      if (per_lang)
+      if (per_lang && *num > 1)
        *num = 1;
       if (language == Mt)
        {
@@ -795,7 +793,7 @@ mfont__lookup_fontset (MRealizedFontset *realized, MGlyph *g, int *num,
                                          g, num, size)))
            return rfont;
 
-         if (per_lang)
+         if (per_lang && *num > 1)
            *num = 1;
          /* Then try the above (3) */
          MPLIST_DO (plist, per_script)