diff -auNpr abiword-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp abiword-libre-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp --- abiword-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp 2009-07-20 16:22:04.000000000 -0300 +++ abiword-libre-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp 2011-07-02 15:37:16.397564815 -0300 @@ -1062,7 +1062,7 @@ void s_LaTeX_Listener::_openSpan(PT_Attr m_pie->write("\\texttt{"); m_NumCloseBrackets++; } - if (!strcmp("Arial", szValue) || + if (!strcmp("Liberation Sans", szValue) || !strcmp("Helvetic", szValue) || !strcmp("Luxi Sans",szValue)) { m_pie->write("\\textsf{"); diff -auNpr abiword-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp abiword-libre-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp --- abiword-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp 2008-04-20 11:44:51.000000000 -0300 +++ abiword-libre-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp 2011-07-02 15:37:12.791762814 -0300 @@ -59,7 +59,7 @@ void ODi_FontFaceDecls::startElement (co fontFamily = pFontFamily; if (pFontFamily && (pFontFamily[0] == '\'') && (pFontFamily[strlen(pFontFamily)-1] == '\'')) { - // e.g.: Turns a "'Times New Roman'" into a "Times New Roman". + // e.g.: Turns a "'Liberation Serif'" into a "Liberation Serif". // OpenOffice.org sometimes adds those extra "'" surrounding the // font family name if it's composed by more than one word. m_fontFamilies[pStyleName] = diff -auNpr abiword-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp abiword-libre-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp --- abiword-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp 2009-06-25 18:29:32.000000000 -0300 +++ abiword-libre-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp 2011-07-02 15:37:16.561646815 -0300 @@ -899,12 +899,12 @@ bool OO_StylesWriter::writeStyles(PD_Doc { "\n", "\n", - "\n", + "\n", "\n", "\n", "\n", "\n", - "\n", + "\n", "\n" }; diff -auNpr abiword-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp --- abiword-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp 2008-01-16 15:02:48.000000000 -0200 +++ abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp 2011-07-02 15:37:13.944338815 -0300 @@ -34,7 +34,7 @@ #include OXML_FontManager::OXML_FontManager() : - m_defaultFont("Times New Roman") + m_defaultFont("Liberation Serif") { m_major_rts.clear(); m_minor_rts.clear(); diff -auNpr abiword-2.8.6/plugins/openxml/common/xp/OXML_List.cpp abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_List.cpp --- abiword-2.8.6/plugins/openxml/common/xp/OXML_List.cpp 2009-07-02 12:20:55.000000000 -0300 +++ abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_List.cpp 2011-07-02 15:37:13.960346815 -0300 @@ -258,7 +258,7 @@ UT_Error OXML_List::serialize(IE_Exp_Ope txt = txt.replace(index+1, 1, 1, '1'+i); } - std::string fontFamily("Times New Roman"); + std::string fontFamily("Liberation Serif"); const gchar* listType = "bullet"; switch(type) { diff -auNpr abiword-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp abiword-libre-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp --- abiword-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp 2009-05-07 18:45:16.000000000 -0300 +++ abiword-libre-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp 2011-07-02 15:37:14.172452815 -0300 @@ -318,7 +318,7 @@ void Passepartout_Listener::_openBlock(P } else { - TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Times New Roman" ); + TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Liberation Serif" ); m_pie->write(TempStr.utf8_str()); } @@ -426,7 +426,7 @@ void Passepartout_Listener::_openFont(PT } else { - TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Times New Roman" ); + TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Liberation Serif" ); m_pie->write(TempStr.utf8_str()); } diff -auNpr abiword-2.8.6/plugins/t602/xp/ie_imp_T602.cpp abiword-libre-2.8.6/plugins/t602/xp/ie_imp_T602.cpp --- abiword-2.8.6/plugins/t602/xp/ie_imp_T602.cpp 2009-01-04 18:34:28.000000000 -0200 +++ abiword-libre-2.8.6/plugins/t602/xp/ie_imp_T602.cpp 2011-07-02 15:37:14.676704815 -0300 @@ -620,7 +620,7 @@ switch (c) case 0x01: m_sfont ^=1; if (m_sfont & 1) - { m_size=static_cast(0.8*m_basesize); m_family="Arial"; + { m_size=static_cast(0.8*m_basesize); m_family="Liberation Sans"; /* FIXME? -> .profile?*/ } else { m_size=m_basesize; m_family=m_basefamily; } diff -auNpr abiword-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp abiword-libre-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp --- abiword-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp 2009-09-04 09:40:10.000000000 -0300 +++ abiword-libre-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp 2011-07-02 15:36:53.578160816 -0300 @@ -182,7 +182,7 @@ GR_Font * GR_UnixCairoGraphics::getGUIFo GtkStyle *tempStyle = gtk_style_new(); const char *guiFontName = pango_font_description_get_family(tempStyle->font_desc); if (!guiFontName) - guiFontName = "'Times New Roman'"; + guiFontName = "'Liberation Serif'"; UT_UTF8String s = XAP_EncodingManager::get_instance()->getLanguageISOName(); diff -auNpr abiword-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp abiword-libre-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp --- abiword-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp 2010-04-14 18:13:41.000000000 -0300 +++ abiword-libre-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp 2011-07-02 15:36:53.918330816 -0300 @@ -756,8 +756,8 @@ bool GR_CairoGraphics::shape(GR_ShapingI /* * Pango does a royally bad job of the font substitution in - * pango_itemize(): it will happily return 'Times New Roman' as - * font when we have requested 'Arial', even though the latter is + * pango_itemize(): it will happily return 'Liberation Serif' as + * font when we have requested 'Liberation Sans', even though the latter is * present and has the necessary coverage. Consequently we have to * do the font substitution manually even on the first shapping. * @@ -2931,7 +2931,7 @@ GR_Font * GR_CairoGraphics::getDefaultFo case GR_Font::FF_Technical: case GR_Font::FF_BiDi: - pszFontFamily = "Arial"; + pszFontFamily = "Liberation Sans"; break; default: diff -auNpr abiword-2.8.6/src/af/util/xp/ut_misc.cpp abiword-libre-2.8.6/src/af/util/xp/ut_misc.cpp --- abiword-2.8.6/src/af/util/xp/ut_misc.cpp 2009-06-28 19:09:08.000000000 -0300 +++ abiword-libre-2.8.6/src/af/util/xp/ut_misc.cpp 2011-07-02 15:36:54.746744816 -0300 @@ -606,7 +606,7 @@ const gchar ** UT_setPropsToValue(const } /*! - splits the xml property string (font-size:24pt;font-face:Arial') into names and values + splits the xml property string (font-size:24pt;font-face:Liberation Sans') into names and values and stores them in an array the caller has to delete[] the array; the process is destructive to props diff -auNpr abiword-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib abiword-libre-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib --- abiword-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib 2005-08-02 02:31:06.000000000 -0300 +++ abiword-libre-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib 2011-07-02 15:36:51.257000816 -0300 @@ -10910,7 +10910,7 @@ 624 - Times New Roman + Liberation Serif _popUpItemAction: $class diff -auNpr abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp abiword-libre-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp --- abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp 2009-09-01 11:49:33.000000000 -0300 +++ abiword-libre-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp 2011-07-02 15:36:50.404574816 -0300 @@ -878,7 +878,7 @@ gint XAP_UnixDialog_FileOpenSaveAs::prev const gchar * file_name = gtk_file_chooser_get_uri (m_FC); - GR_Font * fnt = pGr->findFont("Times New Roman", + GR_Font * fnt = pGr->findFont("Liberation Serif", "normal", "", "normal", "", "12pt", pSS->getLanguageName()); diff -auNpr abiword-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp abiword-libre-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp --- abiword-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp 2009-07-08 05:17:51.000000000 -0300 +++ abiword-libre-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp 2011-07-02 15:36:50.788766816 -0300 @@ -258,7 +258,7 @@ void XAP_Win32Dialog_About::runModal(XAP lf.lfWeight = 0; HFONT hfontSmall = CreateFontIndirect(&lf); - strcpy(lf.lfFaceName, "Arial"); + strcpy(lf.lfFaceName, "Liberation Sans"); lf.lfHeight = 36; lf.lfWeight = FW_BOLD; HFONT hfontHeading = CreateFontIndirect(&lf); diff -auNpr abiword-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp --- abiword-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp 2009-05-30 11:03:24.000000000 -0300 +++ abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp 2011-07-02 15:36:52.893818816 -0300 @@ -569,7 +569,7 @@ void XAP_Preview_FontPreview::draw(void) std::string sWeight = getVal("font-weight"); if(sFamily.empty()) - sFamily = "Times New Roman"; + sFamily = "Liberation Serif"; if(sStyle.empty()) sStyle = "normal"; diff -auNpr abiword-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp --- abiword-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp 2007-01-16 20:17:27.000000000 -0300 +++ abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp 2011-07-02 15:36:52.681712816 -0300 @@ -124,7 +124,7 @@ void XAP_Dialog_Zoom::_createPreviewFrom UT_ASSERT(m_zoomPreview); m_zoomPreview->setWindowSize(width, height); - m_zoomPreview->setString("10-pt Times New Roman"); + m_zoomPreview->setString("10-pt Liberation Serif"); m_zoomPreview->setFont(XAP_Preview_Zoom::font_NORMAL); m_zoomPreview->setZoomPercent(m_zoomPercent); diff -auNpr abiword-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp abiword-libre-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp --- abiword-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp 2009-10-29 14:47:05.000000000 -0300 +++ abiword-libre-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp 2011-07-02 15:36:52.753748816 -0300 @@ -63,7 +63,7 @@ void XAP_Preview_Zoom::setFont(XAP_Previ { case XAP_Preview_Zoom::font_NORMAL: sprintf (fontString, "%dpt", (10 * m_zoomPercent / 100)); - found = m_gc->findFont("Times New Roman", + found = m_gc->findFont("Liberation Serif", "normal", "", "normal", "", fontString, NULL); diff -auNpr abiword-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp abiword-libre-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp --- abiword-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp 2010-06-13 11:02:39.000000000 -0300 +++ abiword-libre-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp 2011-07-02 15:37:06.980858815 -0300 @@ -9733,7 +9733,7 @@ void fl_BlockLayout::StartList( const gc { FL_ListType lType = getListTypeFromStyle(szListStyle); if(IS_NUMBERED_LIST_TYPE(lType)) - szFont = "Times New Roman"; + szFont = "Liberation Serif"; else szFont = "symbol"; UT_ASSERT(0); diff -auNpr abiword-2.8.6/src/text/fmt/xp/fp_Line.cpp abiword-libre-2.8.6/src/text/fmt/xp/fp_Line.cpp --- abiword-2.8.6/src/text/fmt/xp/fp_Line.cpp 2009-09-09 03:20:32.000000000 -0300 +++ abiword-libre-2.8.6/src/text/fmt/xp/fp_Line.cpp 2011-07-02 15:37:07.265000815 -0300 @@ -1273,7 +1273,7 @@ void fp_Line::_doClearScreenFromRunToEnd pRun = m_vecRuns.getNthItem(_getRunLogIndx(runIndex)); // Handle case where character extends behind the left side - // like italic Times New Roman f. Clear a litle bit before if + // like italic Liberation Serif f. Clear a litle bit before if // there is clear screen there UT_sint32 j = runIndex - 1; diff -auNpr abiword-2.8.6/src/text/fmt/xp/fp_TextRun.cpp abiword-libre-2.8.6/src/text/fmt/xp/fp_TextRun.cpp --- abiword-2.8.6/src/text/fmt/xp/fp_TextRun.cpp 2010-04-14 18:49:37.000000000 -0300 +++ abiword-libre-2.8.6/src/text/fmt/xp/fp_TextRun.cpp 2011-07-02 15:37:08.021378815 -0300 @@ -1434,7 +1434,7 @@ void fp_TextRun::_clearScreen(bool /* bF // // Handle case where character extend behind the left side - // like italic Times New Roman f + // like italic Liberation Serif f // fp_Line * thisLine = getLine(); fp_Run * pPrev = getPrevRun(); diff -auNpr abiword-2.8.6/src/text/fmt/xp/fv_View.cpp abiword-libre-2.8.6/src/text/fmt/xp/fv_View.cpp --- abiword-2.8.6/src/text/fmt/xp/fv_View.cpp 2010-06-13 11:02:39.000000000 -0300 +++ abiword-libre-2.8.6/src/text/fmt/xp/fv_View.cpp 2011-07-02 15:37:08.353544815 -0300 @@ -519,9 +519,9 @@ FV_View::FV_View(XAP_App * pApp, void* p s += pCountry; } - // do a fuzzy match for Times New Roman + // do a fuzzy match for Liberation Serif const char * pszFamily = - GR_Graphics::findNearestFont ("Times New Roman", + GR_Graphics::findNearestFont ("Liberation Serif", "normal", "normal", "normal", "normal", "12pt", s.utf8_str()); diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pp_Property.cpp abiword-libre-2.8.6/src/text/ptbl/xp/pp_Property.cpp --- abiword-2.8.6/src/text/ptbl/xp/pp_Property.cpp 2009-05-18 23:33:18.000000000 -0300 +++ abiword-libre-2.8.6/src/text/ptbl/xp/pp_Property.cpp 2011-07-02 15:37:09.053894814 -0300 @@ -99,7 +99,7 @@ static PP_Property _props[] = { "field-color", "dcdcdc", true, NULL, PP_LEVEL_FIELD}, { "field-font", "NULL", true, NULL, PP_LEVEL_FIELD}, - { "font-family", "Times New Roman", true, NULL, PP_LEVEL_CHAR}, + { "font-family", "Liberation Serif", true, NULL, PP_LEVEL_CHAR}, { "font-size", "12pt", true, NULL, PP_LEVEL_CHAR}, // MS word defaults to 10pt, but it just seems too small { "font-stretch", "normal", true, NULL, PP_LEVEL_CHAR}, { "font-style", "normal", true, NULL, PP_LEVEL_CHAR}, diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pp_Revision.cpp abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.cpp --- abiword-2.8.6/src/text/ptbl/xp/pp_Revision.cpp 2009-05-07 23:35:14.000000000 -0300 +++ abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.cpp 2011-07-02 15:37:08.881808814 -0300 @@ -350,7 +350,7 @@ void PP_RevisionAttr::_init(const gchar return; // the string we are parsing looks like - // "+1,-2,!3{font-family: Times New Roman}" + // "+1,-2,!3{font-family: Liberation Serif}" // first duplicate the string so we can play with it ... char * s = (char*) g_strdup(r); diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pp_Revision.h abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.h --- abiword-2.8.6/src/text/ptbl/xp/pp_Revision.h 2009-01-04 20:32:46.000000000 -0200 +++ abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.h 2011-07-02 15:37:09.530132814 -0300 @@ -101,7 +101,7 @@ class ABI_EXPORT PP_Revision: public PP_ where n is a numerical id of the revision and props is regular property string, for instance - font-family:Times New Roman + font-family:Liberation Serif revoval of property/attribute is indicated by setting to -/-, e.g., diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp abiword-libre-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp --- abiword-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp 2009-01-04 18:34:28.000000000 -0200 +++ abiword-libre-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp 2011-07-02 15:37:09.101918814 -0300 @@ -155,7 +155,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v s += pCountry; } - const char* pszFamily = XAP_App::findNearestFont("Times New Roman", + const char* pszFamily = XAP_App::findNearestFont("Liberation Serif", "normal", "", "normal", "", "12pt", s.utf8_str()); @@ -167,7 +167,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v "text-indent:0in; text-position:normal; line-height:1.0; " "color:000000; bgcolor:transparent; widows:2", pszFamily); - pszFamily = XAP_App::findNearestFont("Arial", "normal", "", + pszFamily = XAP_App::findNearestFont("Liberation Sans", "normal", "", "normal", "", "12pt", s.utf8_str()); // used to set the dom-dir of the style here, but we do not want to do that. The @@ -239,7 +239,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v UT_String_sprintf(stTmp, list_fmt, "Heart List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "Dingbats", "NULL"); _s("Heart List",false, "P", "", "Current Settings", stTmp.c_str()); - // pszFamily is the nearest font to Arial found in the system + // pszFamily is the nearest font to Liberation Sans found in the system UT_String_sprintf(stTmp, "tabstops:0.3in/L0; list-style:Numbered List; " "start-value:1; margin-left:0.0in; text-indent:0.0in; " "field-color:transparent; list-delim:%%L.; field-font:%s; " @@ -250,7 +250,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v _s("Numbered Heading 2",true,"P","Heading 2","Normal", stTmp.c_str()); _s("Numbered Heading 3",true,"P","Heading 3","Normal", stTmp.c_str()); - // pszFamily is the nearest font to Arial found in the system + // pszFamily is the nearest font to Liberation Sans found in the system UT_String_sprintf(stTmp, list_fmt, "Numbered List", "1",LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L.", "NULL", "."); diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp --- abiword-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp 2009-05-20 18:22:35.000000000 -0300 +++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp 2011-07-02 15:37:01.798268815 -0300 @@ -1170,7 +1170,7 @@ void AP_Lists_preview::setData(const gch // if(!pszFont || strcmp(pszFont,"NULL")== 0) { - m_pFont = m_gc->findFont("Times New Roman", + m_pFont = m_gc->findFont("Liberation Serif", "normal", "", "normal", "", "16pt", NULL); } diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp --- abiword-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp 2007-05-08 14:16:33.000000000 -0300 +++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp 2011-07-02 15:37:02.462600815 -0300 @@ -88,7 +88,7 @@ AP_Preview_PageNumbers::AP_Preview_PageN char fontString [10]; sprintf(fontString, "%dpt", 8); - GR_Font * found = m_gc->findFont("Times New Roman", "normal", + GR_Font * found = m_gc->findFont("Liberation Serif", "normal", "", "normal", "", fontString, NULL); diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp --- abiword-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp 2009-09-29 10:58:11.000000000 -0300 +++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp 2011-07-02 15:37:03.311024815 -0300 @@ -94,7 +94,7 @@ void AP_Preview_Annotation::setSizeFromA pG = pView->getGraphics(); UT_return_if_fail(pG); - GR_Font * pFont = pG->findFont("Times New Roman", "normal", + GR_Font * pFont = pG->findFont("Liberation Serif", "normal", "normal", "normal", "normal", "12pt", NULL); @@ -122,7 +122,7 @@ void AP_Preview_Annotation::draw(void) UT_RGBColor FGcolor(0,0,0); UT_RGBColor BGcolor(m_clrBackground); - m_pFont = m_gc->findFont("Times New Roman", "normal", + m_pFont = m_gc->findFont("Liberation Serif", "normal", "normal", "normal", "normal", "12pt", NULL); diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp --- abiword-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp 2009-03-09 17:01:46.000000000 -0200 +++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp 2011-07-02 15:37:03.527132815 -0300 @@ -539,7 +539,7 @@ void AP_Preview_Paragraph::draw(void) bool AP_Preview_Paragraph::_loadDrawFont(void) { // we draw at 7 points in this preview - GR_Font * font = m_gc->findFont("Times New Roman", + GR_Font * font = m_gc->findFont("Liberation Serif", "normal", "", "normal", "", "7pt", NULL); // might need to get the real lang diff -auNpr abiword-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp abiword-libre-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp --- abiword-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp 2009-09-29 17:00:48.000000000 -0300 +++ abiword-libre-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp 2011-07-02 15:37:03.939338815 -0300 @@ -2829,7 +2829,7 @@ void IE_Exp_RTF::_output_ListRTF(fl_Auto case DASHED_LIST: Param = 23; bulletsym = '-'; - fontName = "Times New Roman"; + fontName = "Liberation Serif"; break; case SQUARE_LIST: Param = 23; diff -auNpr abiword-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp --- abiword-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp 2009-09-23 02:22:43.000000000 -0300 +++ abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp 2011-07-02 15:37:03.883310815 -0300 @@ -621,10 +621,10 @@ s_fieldFontForListStyle (MSWordListIdTyp return "NULL"; case WLNF_UPPER_LETTER: // upper letter - return "Times New Roman"; + return "Liberation Serif"; case WLNF_LOWER_LETTER: // lower letter - return "Times New Roman"; + return "Liberation Serif"; case WLNF_BULLETS: // bullet list UT_DEBUGMSG(("Fieldfont set to symbol \n")); @@ -632,11 +632,11 @@ s_fieldFontForListStyle (MSWordListIdTyp case WLNF_EUROPEAN_ARABIC: case WLNF_ORDINAL: // ordinal - return "Times New Roman"; + return "Liberation Serif"; default: - UT_DEBUGMSG(("unknown list type %d field-font set to Times New Roman \n",id)); - return "Times New Roman"; + UT_DEBUGMSG(("unknown list type %d field-font set to Liberation Serif \n",id)); + return "Liberation Serif"; } } @@ -5243,7 +5243,7 @@ void IE_Imp_MsWord_97::_generateCharProp if(fname) s += fname; else - s += "Times New Roman"; + s += "Liberation Serif"; FREEP(fname); } diff -auNpr abiword-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp --- abiword-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp 2009-07-27 02:26:14.000000000 -0300 +++ abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp 2011-07-02 15:37:04.239488815 -0300 @@ -5958,11 +5958,11 @@ bool IE_Imp_RTF::buildCharacterProps(UT_ // {\f83\fnil\fcharset0\fprq0{\*\panose 00000000000000000000} ;} // note the empty slot after the panose entry // later it gets referenced: {\b\f83\fs24\cf1\cgrid0 Malte Cornils - // this turns those into "Times New Roman" for now, as a hack to keep from crashing + // this turns those into "Liberation Serif" for now, as a hack to keep from crashing if ( pFont->m_pFontName != NULL ) propBuffer += pFont->m_pFontName; else - propBuffer += "Times New Roman"; + propBuffer += "Liberation Serif"; } if (m_currentRTFState.m_charProps.m_hasColour) { @@ -8612,7 +8612,7 @@ bool IE_Imp_RTF::ReadFontTable() { // NB: Ignores whitespace until we've seen non-whitespace data. // This means we pick up the spaces in font names like - // "Times New Roman", but it also means that any font names + // "Liberation Serif", but it also means that any font names // that genuinely start with spaces will have them discarded. // This is hopefully not a problem. tokenType = NextToken(keyword, ¶meter,& paramUsed, @@ -8680,11 +8680,11 @@ bool IE_Imp_RTF::ReadFontTable() // It's possible that the font name will be empty. This might happend // because the font table didn't specify a name, or because the \ansicpgN // command was invalid, in which case the mbtowc convertion might fail. - // In these cases, substitute "Times New Roman". + // In these cases, substitute "Liberation Serif". if (!sFontNamesAndPanose[SFontTableState::MainFontName].length()) { - UT_DEBUGMSG(("RTF: Font Index %d: Substituting \"Times New Roman\" for missing font name.\n", fontIndex)); - sFontNamesAndPanose[SFontTableState::MainFontName] = "Times New Roman"; + UT_DEBUGMSG(("RTF: Font Index %d: Substituting \"Liberation Serif\" for missing font name.\n", fontIndex)); + sFontNamesAndPanose[SFontTableState::MainFontName] = "Liberation Serif"; } // Validate and post-process the Panose string. if (!PostProcessAndValidatePanose(sFontNamesAndPanose[SFontTableState::Panose])) diff -auNpr abiword-2.8.6/user/wp/readme.abw abiword-libre-2.8.6/user/wp/readme.abw --- abiword-2.8.6/user/wp/readme.abw 2009-07-23 16:50:13.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/readme.abw 2011-07-02 15:37:19.891310814 -0300 @@ -16,9 +16,9 @@ - - - + + +
diff -auNpr abiword-2.8.6/user/wp/templates/Business-Letter.awt abiword-libre-2.8.6/user/wp/templates/Business-Letter.awt --- abiword-2.8.6/user/wp/templates/Business-Letter.awt 2009-05-22 07:15:16.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/Business-Letter.awt 2011-07-02 15:37:19.995362813 -0300 @@ -19,14 +19,14 @@ - - - + + + - - - - + + + +
diff -auNpr abiword-2.8.6/user/wp/templates/Business-Report.awt abiword-libre-2.8.6/user/wp/templates/Business-Report.awt --- abiword-2.8.6/user/wp/templates/Business-Report.awt 2009-05-22 07:15:18.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/Business-Report.awt 2011-07-02 15:37:20.011370813 -0300 @@ -21,7 +21,7 @@

Title

-

Subtitle

+

Subtitle

Release 1.0

@@ -99,11 +99,11 @@

-

Heading 1

+

Heading 1

text

-

Heading 2

+

Heading 2

text

-

Heading 3

+

Heading 3

diff -auNpr abiword-2.8.6/user/wp/templates/Employee-Directory.awt abiword-libre-2.8.6/user/wp/templates/Employee-Directory.awt --- abiword-2.8.6/user/wp/templates/Employee-Directory.awt 2009-05-22 07:15:21.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/Employee-Directory.awt 2011-07-02 15:37:20.047388813 -0300 @@ -10,9 +10,9 @@
-

Company Name

-

Directory of Employees

-

+

Company Name

+

Directory of Employees

+

@@ -36,59 +36,59 @@

Normal Style (123) 555-1212

-

Department Name

-

The big boss upstairs (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

-

-

Department Name

-

The big boss upstairs (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

-

-

Department Name

-

The big boss upstairs (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

-

-

Department Name

-

The big boss upstairs (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

Last Name, First Name (123) 555-1212

-

-

-

General Numbers

-

Front Desk (123) 555-1212

-

Security (123) 555-1212

-

Building Management (123) 555-1212

-

Other General Numbers (123) 555-1212

+

Department Name

+

The big boss upstairs (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

+

+

Department Name

+

The big boss upstairs (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

+

+

Department Name

+

The big boss upstairs (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

+

+

Department Name

+

The big boss upstairs (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

Last Name, First Name (123) 555-1212

+

+

+

General Numbers

+

Front Desk (123) 555-1212

+

Security (123) 555-1212

+

Building Management (123) 555-1212

+

Other General Numbers (123) 555-1212

diff -auNpr abiword-2.8.6/user/wp/templates/Fax-Coversheet.awt abiword-libre-2.8.6/user/wp/templates/Fax-Coversheet.awt --- abiword-2.8.6/user/wp/templates/Fax-Coversheet.awt 2009-05-22 07:15:24.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/Fax-Coversheet.awt 2011-07-02 15:37:20.027378813 -0300 @@ -10,26 +10,26 @@
-

Company Name

-

Company Address Line 1

-

Company Address Line 2

-

Company Address Line 3

-

-

FAX

-

TO: From:

-

Fax: Pages:

-

Phone: Date:

+

Company Name

+

Company Address Line 1

+

Company Address Line 2

+

Company Address Line 3

+

+

FAX

+

TO: From:

+

Fax: Pages:

+

Phone: Date:

Re: CC:

-

 Urgent  For Review  Please Comment  Please Reply  Please Recycle

-

+

 Urgent  For Review  Please Comment  Please Reply  Please Recycle

+

-

Comments

+

Comments

-

This text should the replaced with your comments about the fax and any additional comment to the receiver.

+

This text should the replaced with your comments about the fax and any additional comment to the receiver.

diff -auNpr abiword-2.8.6/user/wp/templates/Friendly-Letter.awt abiword-libre-2.8.6/user/wp/templates/Friendly-Letter.awt --- abiword-2.8.6/user/wp/templates/Friendly-Letter.awt 2009-05-22 07:15:27.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/Friendly-Letter.awt 2011-07-02 15:37:20.023376813 -0300 @@ -16,12 +16,12 @@ - - - - - - + + + + + +
diff -auNpr abiword-2.8.6/user/wp/templates/Memo.awt abiword-libre-2.8.6/user/wp/templates/Memo.awt --- abiword-2.8.6/user/wp/templates/Memo.awt 2009-05-22 07:15:31.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/Memo.awt 2011-07-02 15:37:19.915322814 -0300 @@ -14,10 +14,10 @@ Fri Mar 12 21:07:56 2004 - - - - + + + + @@ -59,10 +59,10 @@

The box that this text is in uses AbiWord's table support to draw the border. You can either allow the border to fit to the size of the text as it is now, or press <ENTER> repeatedly at the end of your memo to expand the border to fill the rest of the page.

Don't forget to change the header and footer before printing! If you wish to save this memo for later and ensure that the date above is saved as today's (not automatically updating), select it and type the desired date text over it.

The styles used in this document for correct conversion, import, export, and HTML are:

-

Heading 1 for Company Name

-

Heading 2 for Slogan

-

Heading 3 for "Date:", "To:", etc.

-

Normal for body text

+

Heading 1 for Company Name

+

Heading 2 for Slogan

+

Heading 3 for "Date:", "To:", etc.

+

Normal for body text

diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt abiword-libre-2.8.6/user/wp/templates/normal.awt --- abiword-2.8.6/user/wp/templates/normal.awt 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt 2011-07-02 15:37:20.019374813 -0300 @@ -9,7 +9,7 @@ - + diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-am_ET abiword-libre-2.8.6/user/wp/templates/normal.awt-am_ET --- abiword-2.8.6/user/wp/templates/normal.awt-am_ET 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-am_ET 2011-07-02 15:37:20.015372813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ar abiword-libre-2.8.6/user/wp/templates/normal.awt-ar --- abiword-2.8.6/user/wp/templates/normal.awt-ar 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ar 2011-07-02 15:37:20.019374813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ar_EG abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_EG --- abiword-2.8.6/user/wp/templates/normal.awt-ar_EG 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_EG 2011-07-02 15:37:19.979354813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ar_SA abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_SA --- abiword-2.8.6/user/wp/templates/normal.awt-ar_SA 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_SA 2011-07-02 15:37:19.999364813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-bg_BG abiword-libre-2.8.6/user/wp/templates/normal.awt-bg_BG --- abiword-2.8.6/user/wp/templates/normal.awt-bg_BG 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-bg_BG 2011-07-02 15:37:19.975352813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ca_ES abiword-libre-2.8.6/user/wp/templates/normal.awt-ca_ES --- abiword-2.8.6/user/wp/templates/normal.awt-ca_ES 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ca_ES 2011-07-02 15:37:19.923326814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-cs_CZ abiword-libre-2.8.6/user/wp/templates/normal.awt-cs_CZ --- abiword-2.8.6/user/wp/templates/normal.awt-cs_CZ 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-cs_CZ 2011-07-02 15:37:20.003366813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-da_DK abiword-libre-2.8.6/user/wp/templates/normal.awt-da_DK --- abiword-2.8.6/user/wp/templates/normal.awt-da_DK 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-da_DK 2011-07-02 15:37:19.995362813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de abiword-libre-2.8.6/user/wp/templates/normal.awt-de --- abiword-2.8.6/user/wp/templates/normal.awt-de 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de 2011-07-02 15:37:20.007368813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de_AT abiword-libre-2.8.6/user/wp/templates/normal.awt-de_AT --- abiword-2.8.6/user/wp/templates/normal.awt-de_AT 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de_AT 2011-07-02 15:37:19.975352813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de_CH abiword-libre-2.8.6/user/wp/templates/normal.awt-de_CH --- abiword-2.8.6/user/wp/templates/normal.awt-de_CH 2008-04-09 21:48:42.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de_CH 2011-07-02 15:37:19.979354813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de_DE abiword-libre-2.8.6/user/wp/templates/normal.awt-de_DE --- abiword-2.8.6/user/wp/templates/normal.awt-de_DE 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de_DE 2011-07-02 15:37:20.035382813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-div_MV abiword-libre-2.8.6/user/wp/templates/normal.awt-div_MV --- abiword-2.8.6/user/wp/templates/normal.awt-div_MV 2007-01-14 12:52:46.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-div_MV 2011-07-02 15:37:20.071400813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-el_GR abiword-libre-2.8.6/user/wp/templates/normal.awt-el_GR --- abiword-2.8.6/user/wp/templates/normal.awt-el_GR 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-el_GR 2011-07-02 15:37:20.063396813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_AU abiword-libre-2.8.6/user/wp/templates/normal.awt-en_AU --- abiword-2.8.6/user/wp/templates/normal.awt-en_AU 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_AU 2011-07-02 15:37:19.903316814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_CA abiword-libre-2.8.6/user/wp/templates/normal.awt-en_CA --- abiword-2.8.6/user/wp/templates/normal.awt-en_CA 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_CA 2011-07-02 15:37:20.079404813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_GB abiword-libre-2.8.6/user/wp/templates/normal.awt-en_GB --- abiword-2.8.6/user/wp/templates/normal.awt-en_GB 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_GB 2011-07-02 15:37:19.911320814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_IE abiword-libre-2.8.6/user/wp/templates/normal.awt-en_IE --- abiword-2.8.6/user/wp/templates/normal.awt-en_IE 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_IE 2011-07-02 15:37:20.075402813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_NZ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_NZ --- abiword-2.8.6/user/wp/templates/normal.awt-en_NZ 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_NZ 2011-07-02 15:37:20.067398813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_ZA abiword-libre-2.8.6/user/wp/templates/normal.awt-en_ZA --- abiword-2.8.6/user/wp/templates/normal.awt-en_ZA 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_ZA 2011-07-02 15:37:20.079404813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es abiword-libre-2.8.6/user/wp/templates/normal.awt-es --- abiword-2.8.6/user/wp/templates/normal.awt-es 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es 2011-07-02 15:37:19.903316814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_AR abiword-libre-2.8.6/user/wp/templates/normal.awt-es_AR --- abiword-2.8.6/user/wp/templates/normal.awt-es_AR 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_AR 2011-07-02 15:37:20.039384813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_ES abiword-libre-2.8.6/user/wp/templates/normal.awt-es_ES --- abiword-2.8.6/user/wp/templates/normal.awt-es_ES 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_ES 2011-07-02 15:37:20.063396813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_IR abiword-libre-2.8.6/user/wp/templates/normal.awt-es_IR --- abiword-2.8.6/user/wp/templates/normal.awt-es_IR 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_IR 2011-07-02 15:37:20.011370813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_MX abiword-libre-2.8.6/user/wp/templates/normal.awt-es_MX --- abiword-2.8.6/user/wp/templates/normal.awt-es_MX 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_MX 2011-07-02 15:37:19.919324814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fa_IR abiword-libre-2.8.6/user/wp/templates/normal.awt-fa_IR --- abiword-2.8.6/user/wp/templates/normal.awt-fa_IR 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fa_IR 2011-07-02 15:37:20.003366813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fi_FI abiword-libre-2.8.6/user/wp/templates/normal.awt-fi_FI --- abiword-2.8.6/user/wp/templates/normal.awt-fi_FI 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fi_FI 2011-07-02 15:37:19.999364813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr abiword-libre-2.8.6/user/wp/templates/normal.awt-fr --- abiword-2.8.6/user/wp/templates/normal.awt-fr 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr 2011-07-02 15:37:20.019374813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_BE abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_BE --- abiword-2.8.6/user/wp/templates/normal.awt-fr_BE 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_BE 2011-07-02 15:37:20.075402813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_CA abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CA --- abiword-2.8.6/user/wp/templates/normal.awt-fr_CA 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CA 2011-07-02 15:37:19.907318814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_CH abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CH --- abiword-2.8.6/user/wp/templates/normal.awt-fr_CH 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CH 2011-07-02 15:37:19.899314814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_FR abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_FR --- abiword-2.8.6/user/wp/templates/normal.awt-fr_FR 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_FR 2011-07-02 15:37:19.983356813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-gl_ES abiword-libre-2.8.6/user/wp/templates/normal.awt-gl_ES --- abiword-2.8.6/user/wp/templates/normal.awt-gl_ES 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-gl_ES 2011-07-02 15:37:20.023376813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-he abiword-libre-2.8.6/user/wp/templates/normal.awt-he --- abiword-2.8.6/user/wp/templates/normal.awt-he 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-he 2011-07-02 15:37:19.995362813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-he_IL abiword-libre-2.8.6/user/wp/templates/normal.awt-he_IL --- abiword-2.8.6/user/wp/templates/normal.awt-he_IL 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-he_IL 2011-07-02 15:37:19.979354813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-hu_HU abiword-libre-2.8.6/user/wp/templates/normal.awt-hu_HU --- abiword-2.8.6/user/wp/templates/normal.awt-hu_HU 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-hu_HU 2011-07-02 15:37:19.979354813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-it_IT abiword-libre-2.8.6/user/wp/templates/normal.awt-it_IT --- abiword-2.8.6/user/wp/templates/normal.awt-it_IT 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-it_IT 2011-07-02 15:37:19.911320814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ja_JP abiword-libre-2.8.6/user/wp/templates/normal.awt-ja_JP --- abiword-2.8.6/user/wp/templates/normal.awt-ja_JP 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ja_JP 2011-07-02 15:37:20.027378813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-lt_LT abiword-libre-2.8.6/user/wp/templates/normal.awt-lt_LT --- abiword-2.8.6/user/wp/templates/normal.awt-lt_LT 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-lt_LT 2011-07-02 15:37:19.899314814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-nb_NO abiword-libre-2.8.6/user/wp/templates/normal.awt-nb_NO --- abiword-2.8.6/user/wp/templates/normal.awt-nb_NO 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-nb_NO 2011-07-02 15:37:19.999364813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-nl_NL abiword-libre-2.8.6/user/wp/templates/normal.awt-nl_NL --- abiword-2.8.6/user/wp/templates/normal.awt-nl_NL 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-nl_NL 2011-07-02 15:37:19.911320814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-nn_NO abiword-libre-2.8.6/user/wp/templates/normal.awt-nn_NO --- abiword-2.8.6/user/wp/templates/normal.awt-nn_NO 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-nn_NO 2011-07-02 15:37:20.031380813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-pl_PL abiword-libre-2.8.6/user/wp/templates/normal.awt-pl_PL --- abiword-2.8.6/user/wp/templates/normal.awt-pl_PL 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-pl_PL 2011-07-02 15:37:20.011370813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ps abiword-libre-2.8.6/user/wp/templates/normal.awt-ps --- abiword-2.8.6/user/wp/templates/normal.awt-ps 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ps 2011-07-02 15:37:20.035382813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-pt_BR abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_BR --- abiword-2.8.6/user/wp/templates/normal.awt-pt_BR 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_BR 2011-07-02 15:37:19.915322814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-pt_PT abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_PT --- abiword-2.8.6/user/wp/templates/normal.awt-pt_PT 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_PT 2011-07-02 15:37:20.035382813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ru abiword-libre-2.8.6/user/wp/templates/normal.awt-ru --- abiword-2.8.6/user/wp/templates/normal.awt-ru 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ru 2011-07-02 15:37:19.907318814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ru_RU abiword-libre-2.8.6/user/wp/templates/normal.awt-ru_RU --- abiword-2.8.6/user/wp/templates/normal.awt-ru_RU 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ru_RU 2011-07-02 15:37:19.919324814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sk_SK abiword-libre-2.8.6/user/wp/templates/normal.awt-sk_SK --- abiword-2.8.6/user/wp/templates/normal.awt-sk_SK 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sk_SK 2011-07-02 15:37:20.075402813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sl abiword-libre-2.8.6/user/wp/templates/normal.awt-sl --- abiword-2.8.6/user/wp/templates/normal.awt-sl 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sl 2011-07-02 15:37:20.031380813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sv abiword-libre-2.8.6/user/wp/templates/normal.awt-sv --- abiword-2.8.6/user/wp/templates/normal.awt-sv 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sv 2011-07-02 15:37:20.015372813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sv_SE abiword-libre-2.8.6/user/wp/templates/normal.awt-sv_SE --- abiword-2.8.6/user/wp/templates/normal.awt-sv_SE 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sv_SE 2011-07-02 15:37:20.067398813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-syr abiword-libre-2.8.6/user/wp/templates/normal.awt-syr --- abiword-2.8.6/user/wp/templates/normal.awt-syr 2007-01-14 12:52:46.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-syr 2011-07-02 15:37:20.079404813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-tr abiword-libre-2.8.6/user/wp/templates/normal.awt-tr --- abiword-2.8.6/user/wp/templates/normal.awt-tr 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-tr 2011-07-02 15:37:19.903316814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-tr_TR abiword-libre-2.8.6/user/wp/templates/normal.awt-tr_TR --- abiword-2.8.6/user/wp/templates/normal.awt-tr_TR 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-tr_TR 2011-07-02 15:37:19.911320814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-uk_UA abiword-libre-2.8.6/user/wp/templates/normal.awt-uk_UA --- abiword-2.8.6/user/wp/templates/normal.awt-uk_UA 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-uk_UA 2011-07-02 15:37:20.003366813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ur_PK abiword-libre-2.8.6/user/wp/templates/normal.awt-ur_PK --- abiword-2.8.6/user/wp/templates/normal.awt-ur_PK 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ur_PK 2011-07-02 15:37:20.067398813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-yi abiword-libre-2.8.6/user/wp/templates/normal.awt-yi --- abiword-2.8.6/user/wp/templates/normal.awt-yi 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-yi 2011-07-02 15:37:19.919324814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-zh_CN abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_CN --- abiword-2.8.6/user/wp/templates/normal.awt-zh_CN 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_CN 2011-07-02 15:37:20.015372813 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-zh_TW abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_TW --- abiword-2.8.6/user/wp/templates/normal.awt-zh_TW 2007-01-20 13:20:58.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_TW 2011-07-02 15:37:19.907318814 -0300 @@ -9,7 +9,7 @@ - +
diff -auNpr abiword-2.8.6/user/wp/templates/Press-Release.awt abiword-libre-2.8.6/user/wp/templates/Press-Release.awt --- abiword-2.8.6/user/wp/templates/Press-Release.awt 2009-05-22 07:15:33.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/Press-Release.awt 2011-07-02 15:37:20.071400813 -0300 @@ -16,19 +16,19 @@ - - - - + + + + - + - + @@ -36,19 +36,19 @@ - - - + + + - - - + + + - + @@ -77,7 +77,7 @@

-

FOR IMMEDIATE RELEASE

+

FOR IMMEDIATE RELEASE

diff -auNpr abiword-2.8.6/user/wp/templates/Resume.awt abiword-libre-2.8.6/user/wp/templates/Resume.awt --- abiword-2.8.6/user/wp/templates/Resume.awt 2009-05-22 07:15:36.000000000 -0300 +++ abiword-libre-2.8.6/user/wp/templates/Resume.awt 2011-07-02 15:37:20.031380813 -0300 @@ -14,11 +14,11 @@ Fri Mar 12 22:08:25 2004 - - - - - + + + + +